Merge branch 'master' of sneak/docker-ubuntumirror into prod

Update 'mirror/syncubuntu.sh'
Update 'Dockerfile'
2020-03-01 09:00:58 +00:00 · 2020-03-01 08:59:57 +00:00 · 2020-03-01 08:59:35 +00:00
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -8,6 +8,7 @@ ENV UBUNTU_MIRROR_ARCHITECTURES amd64
 ENV UBUNTU_ENABLE_SOURCE_MIRRORING false
 ENV UBUNTU_MIRROR_CATEGORIES main,universe,restricted,multiverse,main/debian-installer
 ENV UBUNTU_MIRROR_UPSTREAM archive.ubuntu.com
+ENV UBUNTU_MIRROR_UPSTREAM_PATH /ubuntu
 ENV UBUNTU_MIRROR_PROJECTS bionic,bionic-updates,bionic-security,bionic-backports,focal,focal-updates,focal-security,focal-backports

 # The following is the URL populated in /mirrors.txt as used by mirror://
--- a/mirror/syncubuntu.sh
+++ b/mirror/syncubuntu.sh
@ -32,7 +32,7 @@ while [[ $DONE -eq 0 ]]; do
        --di-dist="$DIDIST" \
        --di-arch=arches \
        --ignore-small-errors \
-        -r /ubuntu \
+        -r "$UBUNTU_MIRROR_UPSTREAM_PATH" \
        --getcontents \
        --progress \
        --method=http \
Author	SHA1	Message	Date
Jeffrey Paul	3b7d6a38e9	Merge branch 'master' of sneak/docker-ubuntumirror into prod continuous-integration/drone/push Build is passing Details	2020-03-01 09:00:58 +00:00
Jeffrey Paul	6f8da3c8e4	Update 'mirror/syncubuntu.sh' continuous-integration/drone/pr Build is failing Details continuous-integration/drone/push Build is passing Details	2020-03-01 08:59:57 +00:00
Jeffrey Paul	caece7197d	Update 'Dockerfile' continuous-integration/drone/push Build is passing Details	2020-03-01 08:59:35 +00:00