diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 58e6c8f..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: '2.0' - -services: - mirror: - hostname: mirror - image: sneak/ubuntumirror - build: . - network_mode: bridge - volumes: - - "/mnt/scratch/mirror:/var/mirror" - ports: - - "172.17.0.1:80:80" - environment: - - UBUNTU_MIRROR_SOURCE=de.archive.ubuntu.com - - MIRROR_CATEGORIES=main,universe,restricted diff --git a/mirror/syncubuntu.sh b/mirror/syncubuntu.sh index 792d94c..6364c4f 100755 --- a/mirror/syncubuntu.sh +++ b/mirror/syncubuntu.sh @@ -14,9 +14,9 @@ export GNUPGHOME="/etc/debmirror/ubuntu" debmirror \ -a ${MIRROR_ARCHITECTURES:-amd64} \ --no-source \ - -s ${MIRROR_CATEGORIES:-main,universe} \ + -s ${MIRROR_CATEGORIES:-main,universe,multiverse,restricted} \ -h ${UBUNTU_MIRROR_SOURCE:-archive.ubuntu.com} \ - -d ${UBUNTU_MIRROR_PROJECTS:-bionic,bionic-updates,bionic-security,bionic-backports} \ + -d ${UBUNTU_MIRROR_PROJECTS:-focal,focal-updates,focal-security,focal-backports} \ --ignore-small-errors \ -r /ubuntu \ --getcontents \ diff --git a/start-local-mirror.sh b/start-local-mirror.sh index 385ee00..24d493b 100644 --- a/start-local-mirror.sh +++ b/start-local-mirror.sh @@ -3,11 +3,11 @@ docker rm -f local-ubuntu-mirror docker run -d --name local-ubuntu-mirror \ -v /storage/mirrors/ubuntu/ubuntu:/var/mirror/ubuntu \ - --env UBUNTU_MIRROR_SOURCE=us.archive.ubuntu.com \ + --env UBUNTU_MIRROR_SOURCE=archive.ubuntu.com \ --env MIRROR_INTERVAL_SECONDS=10800 \ --env MIRROR_CATEGORIES=main,universe,restricted,multiverse \ --env MIRROR_ARCHITECTURES=amd64 \ - --env UBUNTU_MIRROR_PROJECTS=bionic,bionic-updates,bionic-security,bionic-backports \ + --env UBUNTU_MIRROR_PROJECTS=bionic,bionic-updates,bionic-security,bionic-backports,focal,focal-updates,focal-security,focal-backports \ --dns 8.8.8.8 \ --dns 8.8.4.4 \ -p 172.17.0.1:80:80 \