Update 'Dockerfile'

.drone.yml

@@ -0,0 +1,17 @@
+kind: pipeline
+name: default
+
+steps:
+- name: docker
+  image: plugins/docker
+  settings:
+    repo: sneak/ubuntumirror
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    tags:
+      - ${DRONE_COMMIT_SHA}
+      - ${DRONE_BRANCH/\//-}
+
+

Dockerfile

@@ -2,6 +2,14 @@ FROM phusion/baseimage:0.11
 
 VOLUME /var/mirror
 
+ENV MIRROR_ARCHITECTURES amd64
+ENV SOURCE_MIRROR
+ENV MIRROR_CATEGORIES main,universe,restricted,multiverse
+ENV UBUNTU_MIRROR_SOURCE archive.ubuntu.com
+ENV UBUNTU_MIRROR_PROJECTS bionic,bionic-updates,bionic-security,bionic-backports,focal,focal-updates,focal-security,focal-backports
+
+ENV THIS_MIRROR_URL http://172.17.0.1/ubuntu/
+
 ADD ./sources.list /etc/apt/sources.list
 RUN echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
 # phusion baseimage says i'm not supposed to do this
@@ -24,4 +32,5 @@ RUN \
     gpg --import /usr/share/keyrings/ubuntu-archive-keyring.gpg && \
     cp $GNUPGHOME/pubring.kbx $GNUPGHOME/trustedkeys.kbx
 
+
 EXPOSE 80

docker-compose.yml

@@ -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

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 \

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 \