combined authelia and charon

authelia/compose.yml

@@ -1,30 +0,0 @@
-secrets:
-  JWT_SECRET:
-    file: './data/authelia/secrets/JWT_SECRET'
-  SESSION_SECRET:
-    file: './data/authelia/secrets/SESSION_SECRET'
-  STORAGE_PASSWORD:
-    file: './data/authelia/secrets/STORAGE_PASSWORD'
-  STORAGE_ENCRYPTION_KEY:
-    file: './data/authelia/secrets/STORAGE_ENCRYPTION_KEY'
-
-services:
-  authelia:
-    container_name: 'authelia'
-    image: 'docker.io/authelia/authelia:latest'
-    restart: 'unless-stopped'
-    networks:
-      - reverse-proxy
-    secrets: ['JWT_SECRET', 'SESSION_SECRET', 'STORAGE_PASSWORD', 'STORAGE_ENCRYPTION_KEY']
-    environment:
-      AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET_FILE: '/run/secrets/JWT_SECRET'
-      AUTHELIA_SESSION_SECRET_FILE: '/run/secrets/SESSION_SECRET'
-      AUTHELIA_STORAGE_POSTGRES_PASSWORD_FILE: '/run/secrets/STORAGE_PASSWORD'
-      AUTHELIA_STORAGE_ENCRYPTION_KEY_FILE: '/run/secrets/STORAGE_ENCRYPTION_KEY'
-    volumes:
-      - './data/authelia/config:/config'
-
-networks:
-  reverse-proxy:
-    name: reverse-proxy
-    external: true

compose.yml

@@ -1,4 +1,29 @@
 services:
+  authelia:
+    image: 'authelia/authelia'
+    container_name: 'authelia'
+    volumes:
+      - './authelia:/config'
+    networks:
+      - authelia
+    restart: 'unless-stopped'
+    healthcheck:
+      ## In production the healthcheck section should be commented.
+      disable: true
+    environment:
+      TZ: 'America/Chicago'
+
+  redis:
+    image: 'redis:alpine'
+    container_name: 'redis'
+    volumes:
+      - './redis:/data'
+    networks:
+      - authelia
+    restart: 'unless-stopped'
+    environment:
+      TZ: 'America/Chicago'
+
   charon:
     image: wikid82/charon:latest
     container_name: charon
@@ -9,6 +34,7 @@ services:
       - "443:443/udp"
       - "8080:8080"
     networks:
+      - authelia
       - reverse-proxy
     volumes:
       - ./charon-data:/app/data
@@ -25,6 +51,8 @@ services:
       start_period: 40s
 
 networks:
+  authelia:
+    name: authelia
   reverse-proxy:
     name: reverse-proxy
-    external: true
+    external: true