Fix mirror.list location and nginx config

.env

@@ -0,0 +1 @@
+default_settings.env

Dockerfile

@@ -2,14 +2,15 @@
 
 FROM debian:buster-slim
 
-RUN apt update
-RUN apt install gcc make perl wget rsync --no-install-recommends -y
+RUN apt-get update && apt-get dist-upgrade -yq
+RUN apt-get install gcc make perl wget rsync --no-install-recommends -y
+RUN apt-get autoclean -yq && apt-get autoremove -yq
 
 WORKDIR /apt-mirror
 COPY ./apt-mirror /apt-mirror
 COPY ./.perltidyrc /apt-mirror
 COPY ./Makefile /apt-mirror
-COPY ./mirror.list /apt-mirror
+COPY ./mirror.list /etc/apt
 COPY ./postmirror.sh /apt-mirror
 
 RUN make

default_settings.env

@@ -0,0 +1,2 @@
+UID=1000
+GID=1000

docker-compose.yml

@@ -4,9 +4,12 @@ services:
 
     mirror:
         build: .
+        user: ${UID}:${GID}
         command: bash -c "apt-mirror && bash /apt-mirror/postmirror.sh"
         volumes:
             - "./mirror:/var/spool/apt-mirror"
+            - "./mirror.list:/etc/apt/mirror.list"
+            - "./postmirror.sh:/apt-mirror/postmirror.sh"
 
     server:
         build:
@@ -17,4 +20,4 @@ services:
         volumes:
             - "./mirror/mirror:/mirror:ro"
         ports:
-            - "8080:80"
+            - "80:80"

mirror.list

@@ -5,7 +5,7 @@ set var_path          $base_path/var
 set postmirror_script $var_path/postmirror.sh
 set defaultarch       amd64
 set run_postmirror    0
-set nthreads          6
+set nthreads          8
 set limit_rate        100m
 set _tilde            0
 # Use --unlink with wget (for use with hardlinked directories)
@@ -15,16 +15,8 @@ set http_proxy        127.0.0.1:3128
 set proxy_user        user
 set proxy_password    password
 
-deb http://archive.ubuntu.com/ubuntu bionic main restricted universe multiverse
-deb http://archive.ubuntu.com/ubuntu bionic-security main restricted universe multiverse
-deb http://archive.ubuntu.com/ubuntu bionic-updates main restricted universe multiverse
-deb http://archive.ubuntu.com/ubuntu bionic-backports main restricted universe multiverse
-clean http://archive.ubuntu.com/ubuntu
-
-# ==
-# Example of other repos
-# ==
-
-# deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main
-# deb https://download.docker.com/linux/ubuntu bionic stable
-# deb https://apt.kubernetes.io kubernetes-bionic main
+deb http://us.archive.ubuntu.com/ubuntu jammy main restricted universe multiverse
+deb http://us.archive.ubuntu.com/ubuntu jammy-security main restricted universe multiverse
+deb http://us.archive.ubuntu.com/ubuntu jammy-updates main restricted universe multiverse
+deb http://us.archive.ubuntu.com/ubuntu jammy-backports main restricted universe multiverse
+clean http://us.archive.ubuntu.com/ubuntu

nginx.conf

@@ -2,6 +2,13 @@ server {
     listen *:80;
     server_name _;
 
-    root /mirror;
-    autoindex on;
-}
+    location / {
+      root /mirror;
+      autoindex on;
+    }
+
+    location /ubuntu {
+      root /mirror/us.archive.ubuntu.com;
+      autoindex on;
+    }
+}