docker/docker-compose.yml aktualisiert

docker/docker-compose.yml

@@ -1,18 +1,37 @@
 services:
-  dnf-mirror:
+  syncer:
-    build: .
+    build:
-    container_name: dnf-mirror
+      context: .
+      dockerfile: docker/syncer/Dockerfile
+    image: rpm-mirror-syncer:latest
+    container_name: rpm-mirror-syncer
     restart: unless-stopped
+    env_file:
+      - .env
     volumes:
-      - repo-data:/data/repo
+      # sync-cache also holds the mirror's private GPG signing key and its
-    secrets:
+      # revocation certificate (WORK_DIR/gnupg) - intentionally NOT mounted
-      - gpg_private_key
+      # into the nginx container, only repo-data (public files) is.
-    ports:
+      - repo-data:/srv/repo
-      - "8081:80"
+      - sync-cache:/var/cache/rpm-mirror-sync
+      # Local sources.yaml, only used when SOURCES_GIT_REPO is empty (see
+      # .env). Remove/comment this out if you fetch the list from git.
+      #- ${LOCAL_SOURCES_YAML:-./sources.example.yaml}:/config/sources.yaml:ro
 
-secrets:
+  nginx:
-  gpg_private_key:
+    image: nginx:alpine
-    file: ./secrets/company-signing-key.private.asc
+    container_name: rpm-mirror-nginx
+    restart: unless-stopped
+    depends_on:
+      - syncer
+    env_file:
+      - .env
+    ports:
+      - "${NGINX_PORT:-8080}:80"
+    volumes:
+      - repo-data:/usr/share/nginx/html/repo:ro
+      - ./docker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro
 
 volumes:
   repo-data:
+  sync-cache: