sync installer stuff

.drone.yml

@@ -12,7 +12,7 @@ steps:
     password:
       from_secret: docker_password
     tags:
+      - ${DRONE_BRANCH//\//-}-${DRONE_COMMIT_SHA:0:8}
       - ${DRONE_COMMIT_SHA}
       - ${DRONE_BRANCH/\//-}
-
+      - latest
-

README.markdown

@@ -41,21 +41,30 @@ The mirror stores all the data in a docker volume at path
 ```
 docker rm -f local-ubuntu-mirror
 docker run -d --name local-ubuntu-mirror \
-	-v /storage/mirrors/ubuntu:/var/mirror/ubuntu \
+    -v /storage/mirrors/ubuntu:/var/mirror/ubuntu \
     --env MIRROR_UPDATE_INTERVAL_SECONDS=3600 \
     --env UBUNTU_MIRROR_ARCHITECTURES=amd64 \
     --env UBUNTU_MIRROR_UPSTREAM=us.archive.ubuntu.com \
     --env UBUNTU_MIRROR_PROJECTS=focal,focal-updates,focal-security,focal-backports \
-	-p 8080:80 \
+    -p 8080:80 \
-	--restart unless-stopped \
+    --restart unless-stopped \
-	sneak/ubuntumirror:latest
+    sneak/ubuntumirror@sha256:7de7cc8245106bb574029a2dedca5aa218af08d802b989cdc7857fb57f876a02
 ```
 
 # Example CapRover Definition File
 
 ```
- {
+{
   "schemaVersion": 2,
-  "imageName": "sneak/ubuntumirror:latest"
+  "imageName": "sneak/ubuntumirror@sha256:7de7cc8245106bb574029a2dedca5aa218af08d802b989cdc7857fb57f876a02"
 }
 ```
+
+# Author
+
+sneak <[sneak@sneak.berlin](mailto:sneak@sneak.berlin)>
+
+# License
+
+This software is released into the public domain.
+

mirror.run

@@ -9,5 +9,5 @@ rm -rf /var/mirror/ubuntu/.temp
 while sleep 1 ; do
     cd /opt/mirror && make
 
-    sleep ${MIRROR_INTERVAL_SECONDS}
+    sleep ${MIRROR_UPDATE_INTERVAL_SECONDS}
 done

mirror/syncubuntu.sh

@@ -16,17 +16,26 @@ if [[  "$UBUNTU_ENABLE_SOURCE_MIRRORING" != "false" ]]; then
     SOURCEOPT="--source"
 fi
 
-debmirror \
+DONE=0
-	-a ${UBUNTU_MIRROR_ARCHITECTURES} \
-	-s ${UBUNTU_MIRROR_CATEGORIES} \
-	-h ${UBUNTU_MIRROR_UPSTREAM} \
-	-d ${UBUNTU_MIRROR_PROJECTS} \
-	$SOURCEOPT \
-    --ignore-small-errors \
-	-r /ubuntu \
-    --getcontents \
-	--progress \
-	--method=http \
-	$DST/ubuntu
 
-chmod -R a+rX $DST
+while [[ $DONE -eq 0 ]]; do
+    debmirror \
+        -a ${UBUNTU_MIRROR_ARCHITECTURES} \
+        -s ${UBUNTU_MIRROR_CATEGORIES} \
+        -h ${UBUNTU_MIRROR_UPSTREAM} \
+        -d ${UBUNTU_MIRROR_PROJECTS} \
+        $SOURCEOPT \
+        --di-dist=dists \
+        --di-arch=arches \
+        --ignore-small-errors \
+        -r /ubuntu \
+        --getcontents \
+        --progress \
+        --method=http \
+        $DST/ubuntu
+    if [[ $? -eq 0 ]]; then
+        DONE=1
+    fi
+    chmod -R a+rX $DST
+    sleep 1
+done

nginx.conf

@@ -3,11 +3,14 @@ worker_processes auto;
 
 pid         /var/run/nginx.pid;
 
+error_log /dev/stdout info;
+
 events {
     worker_connections  1024;
 }
 
 http {
+    access_log /dev/stdout;
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 

sources.list

@@ -1,7 +1,4 @@
-# this can't be {us.,}archive.ubuntu.org because on the box
+deb mirror://mirrors.ubuntu.com/mirrors.txt bionic main universe restricted multiverse
-# with dnsmasq changing that host to itself, rebuilding this fails
+deb mirror://mirrors.ubuntu.com/mirrors.txt bionic-updates main universe restricted multiverse
-# unless the container is running already
+deb mirror://mirrors.ubuntu.com/mirrors.txt bionic-security main universe restricted multiverse
-deb http://mirrors.sonic.net/ubuntu bionic main universe
+deb mirror://mirrors.ubuntu.com/mirrors.txt bionic-backports main universe restricted multiverse
-deb http://mirrors.sonic.net/ubuntu bionic-updates main universe
-deb http://mirrors.sonic.net/ubuntu bionic-backports main universe
-deb http://mirrors.sonic.net/ubuntu bionic-security main universe