update apt-cacher

tasks/main.yml

@@ -18,7 +18,6 @@
     state: directory
   with_items:
     - smartdns
-    - apt-cacher-ng-docker
     - sni
 - name: smartdns
   template:
@@ -35,14 +34,12 @@
     checksum: yes
     archive: no
   notify: restart_sni
-- name: apt cacher Dockerfile
-  template:
-    src: ./apt-cacher-ng-docker/Dockerfile.j2
-    dest: '{{utility_root}}/apt-cacher-ng-docker/Dockerfile'
-  register: dockerfile_res
+- name: apt cacher Dockerfile clean
+  file:
+    path: '{{utility_root}}/apt-cacher-ng-docker'
+    state: absent
 - name: docker-compose up -d
   docker_compose:
     project_src: '{{utility_root}}'
     remove_orphans: true
     pull: true
-    build: '{{dockerfile_res.changed}}'

templates/apt-cacher-ng-docker/Dockerfile.j2

-FROM debian:buster-slim
-
-{% if apt_mirror != 'deb.debian.org' %}
-RUN sed -i 's/deb.debian.org/{{apt_mirror}}/g;s/security.debian.org/{{apt_mirror}}/g' /etc/apt/sources.list
-{% endif %}
-
-RUN apt update && apt install -y apt-cacher-ng && rm -rf /var/lib/apt/lists/*
-
-RUN sed -i 's/# ForeGround: 0/ForeGround: 1/' /etc/apt-cacher-ng/acng.conf && \
-    sed -i 's/Remap-debrep: .*/Remap-debrep: \/debian ; http:\/\/{{apt_mirror}}\/debian/' /etc/apt-cacher-ng/acng.conf && \
-    sed -i 's/Remap-uburep: .*/Remap-uburep: \/ubuntu ; http:\/\/{{apt_mirror}}\/ubuntu/' /etc/apt-cacher-ng/acng.conf && \
-    sed -i 's/Remap-secdeb: .*/Remap-debdeb: \/debian-security ; http:\/\/{{apt_mirror}}\/debian-security/' /etc/apt-cacher-ng/acng.conf
-
-RUN ln -s /dev/stdout /var/log/apt-cacher-ng/apt-cacher.log && ln -s /dev/stderr /var/log/apt-cacher-ng.err
-
-EXPOSE 3142/tcp
-
-CMD [ "/usr/sbin/apt-cacher-ng", "-c", "/etc/apt-cacher-ng" ]

templates/docker-compose.yml.j2

@@ -51,18 +51,20 @@ services:
 
   apt-cacher-ng:
     restart: always
-    build: apt-cacher-ng-docker
+    image: git-registry.mycard.moe/nanahira/apt-cacher-ng-docker:latest
     dns: {{ smartdns_china_dns[0] }}
     ports:
 {% if apt_cacher_address %}
 {% for address in apt_cacher_address %}
-      - '{{address}}:80:3142'
+      - '{{address}}:80:80'
 {% endfor %}
 {% else %}
-      - '80:3142'
+      - '80:80'
 {% endif %}
     volumes:
       - {{apt_cacher_path}}:/var/cache/apt-cacher-ng
+    environment:
+      UPSTREAM_MIRROR: {{apt_mirror}}
 
   sni:
     restart: always