Migration to newer dockge/compose stack

2024-09-26 15:59:37 +02:00
parent 1d52e2ac75
commit dfe252e945
104 changed files with 752 additions and 666 deletions
--- a/authentication/compose.yaml
+++ b/authentication/compose.yaml
@@ -0,0 +1,67 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json
+
+services:
+  authelia:
+    extends:
+      file: ../compose.base.yaml
+      service: exposed-service
+    container_name: authelia
+    image: authelia/authelia
+    command:
+      - authelia
+      - --config=/etc/authelia/configuration.yml
+      - --config=/etc/authelia/access.yml
+      - --config=/etc/authelia/authentication.yml
+    user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
+    environment:
+      AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET_FILE: /run/secrets/jwt_secret
+      AUTHELIA_STORAGE_ENCRYPTION_KEY_FILE: /run/secrets/storage_key
+      AUTHELIA_NOTIFIER_SMTP_ADDRESS: smtp://smtp-server
+      AUTHELIA_NOTIFIER_SMTP_DISABLE_REQUIRE_TLS: true
+      AUTHELIA_NOTIFIER_SMTP_SENDER: Authelia <authelia@${NASCOMPOSE_DOMAIN?}>
+      X_AUTHELIA_CONFIG_FILTERS: template
+      TEMPLATE_NASCOMPOSE_DOMAIN: ${NASCOMPOSE_DOMAIN?}
+    networks:
+      - smtp-server
+      - default
+    volumes:
+      - ./volumes/authelia_config/:/config/
+      - ./configs/authelia_configuration.yml:/etc/authelia/configuration.yml:ro
+      - ./configs/authelia_access.yml:/etc/authelia/access.yml:ro
+      - ./configs/authelia_authentication.yml:/etc/authelia/authentication.yml:ro
+      - ./secrets/authelia_jwt_secret:/run/secrets/jwt_secret:ro
+      - ./secrets/authelia_storage_key:/run/secrets/storage_key:ro
+      - ./secrets/authelia_oidcsecret:/run/secrets/oidcsecret:ro
+      - ./secrets/authelia_oidc.key:/run/secrets/oidc.key:ro
+  authelia-redis:
+    extends:
+      file: ../compose.base.yaml
+      service: base-service
+    container_name: authelia-redis
+    image: redis
+    #user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
+
+  lldap:
+    extends:
+      file: ../compose.base.yaml
+      service: exposed-service
+    container_name: lldap
+    image: lldap/lldap:latest-alpine-rootless
+    user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
+    environment:
+      LLDAP_JWT_SECRET_FILE: /run/secrets/jwt_secret
+      LLDAP_KEY_SEED_FILE: /run/secrets/key_seed
+    networks:
+      - default
+    volumes:
+      - ./volumes/lldap_data:/data
+      - ./secrets/lldap_jwt_secret:/run/secrets/jwt_secret:ro
+      - ./secrets/lldap_key_seed:/run/secrets/key_seed:ro
+    labels:
+      traefik.http.routers.lldap.middlewares: authelia@file
+      traefik.http.services.lldap.loadbalancer.server.port: 17170
+networks:
+  reverse-proxy:
+    external: true
+  smtp-server:
+    external: true
--- a/authentication/docker-compose.yml
+++ b/authentication/docker-compose.yml
@@ -1,65 +0,0 @@
-version: "3.8"
-
-services:
-  authelia:
-    hostname: authelia
-    image: authelia/authelia
-    command:
-      - --config=/etc/authelia/configuration.yml
-      - --config=/etc/authelia/access.yml
-      - --config=/etc/authelia/authentication.yml
-    environment:
-      PUID: ${NASCOMPOSE_UID?}
-      PGID: ${NASCOMPOSE_GID?}
-      AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET_FILE: /run/secrets/jwt_secret
-      AUTHELIA_STORAGE_ENCRYPTION_KEY_FILE: /run/secrets/storage_key
-      AUTHELIA_NOTIFIER_SMTP_ADDRESS: ${NASCOMPOSE_AUTHELIA_SMTP_ADDRESS?}
-      AUTHELIA_NOTIFIER_SMTP_USERNAME: ${NASCOMPOSE_AUTHELIA_SMTP_USERNAME?}
-      AUTHELIA_NOTIFIER_SMTP_PASSWORD_FILE: /run/secrets/smtp_password
-      AUTHELIA_NOTIFIER_SMTP_SENDER: authelia@${NASCOMPOSE_DOMAIN?}
-      X_AUTHELIA_CONFIG_FILTERS: template
-      TEMPLATE_NASCOMPOSE_DOMAIN: ${NASCOMPOSE_DOMAIN?}
-    networks:
-      - reverse-proxy
-      - default
-    volumes:
-      - ${NASCOMPOSE_SERVICES?}/authentication/volumes/authelia_config/:/config/
-      # Configuration
-      - ${NASCOMPOSE_SERVICES?}/authentication/configs/authelia_configuration.yml:/etc/authelia/configuration.yml:ro
-      - ${NASCOMPOSE_SERVICES?}/authentication/configs/authelia_access.yml:/etc/authelia/access.yml:ro
-      - ${NASCOMPOSE_SERVICES?}/authentication/configs/authelia_authentication.yml:/etc/authelia/authentication.yml:ro
-      # Secrets
-      - ${NASCOMPOSE_SERVICES?}/authentication/secrets/authelia_jwt_secret:/run/secrets/jwt_secret:ro
-      - ${NASCOMPOSE_SERVICES?}/authentication/secrets/authelia_storage_key:/run/secrets/storage_key:ro
-      - ${NASCOMPOSE_SERVICES?}/authentication/secrets/authelia_smtp_password:/run/secrets/smtp_password:ro
-      - ${NASCOMPOSE_SERVICES?}/authentication/secrets/authelia_oidcsecret:/run/secrets/oidcsecret:ro
-      - ${NASCOMPOSE_SERVICES?}/authentication/secrets/authelia_oidc.key:/run/secrets/oidc.key:ro
-    restart: unless-stopped
-    labels:
-      traefik.enable: true
-  authelia-redis:
-    hostname: authelia-redis
-    image: redis
-    restart: unless-stopped
-  lldap:
-    image: lldap/lldap
-    environment:
-      UID: ${NASCOMPOSE_UID?}
-      GID: ${NASCOMPOSE_GID?}
-      LLDAP_JWT_SECRET_FILE: /run/secrets/jwt_secret
-      LLDAP_KEY_SEED_FILE: /run/secrets/key_seed
-    networks:
-      - reverse-proxy
-      - default
-    volumes:
-      - ${NASCOMPOSE_SERVICES?}/authentication/volumes/lldap_data:/data
-      # Secrets
-      - ${NASCOMPOSE_SERVICES?}/authentication/secrets/lldap_jwt_secret:/run/secrets/jwt_secret:ro
-      - ${NASCOMPOSE_SERVICES?}/authentication/secrets/lldap_key_seed:/run/secrets/key_seed:ro
-    labels:
-      traefik.enable: true
-      traefik.http.routers.lldap.middlewares: authelia@file
-      traefik.http.services.lldap.loadbalancer.server.port: 17170
-networks:
-  reverse-proxy:
-    external: true
--- a/authentication/secrets/.gitkeep
+++ b/authentication/secrets/.gitkeep
--- a/authentication/volumes/authelia_config/.gitkeep
+++ b/authentication/volumes/authelia_config/.gitkeep
--- a/authentication/volumes/lldap_data/.gitkeep
+++ b/authentication/volumes/lldap_data/.gitkeep