From fe411559eaaa71bc7c26f4265d243f6a65c6ace4 Mon Sep 17 00:00:00 2001
From: decentral1se <hi@decentral1.se>
Date: Sun, 13 Jun 2021 12:20:32 +0200
Subject: [PATCH] Use redis, env vars and healthcheck

---
 compose.yml | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index 67db3fc..808eb46 100644
--- a/compose.yml
+++ b/compose.yml
@@ -6,23 +6,32 @@ services:
     image: "decentral1se/keycloak-collective-portal:latest"
     environment:
       - APP_SECRET_KEY_FILE=/run/secrets/app_secret_key
+      - APP_THEME
+      - INVITE_TIME_LIMIT
       - KEYCLOAK_CLIENT_ID
       - KEYCLOAK_CLIENT_SECRET_FILE=/run/secrets/keycloak_client_secret
       - KEYCLOAK_DOMAIN
       - KEYCLOAK_REALM
+      - REDIS_DB=0
+      - REDIS_HOST=cache
+      - REDIS_PORT=6379
     secrets:
       - app_secret_key
       - keycloak_client_secret
     networks:
       - proxy
+      - internal
     configs:
       - source: entrypoint_sh
         target: /usr/local/bin/entrypoint.sh
         mode: 0555
     entrypoint: /usr/local/bin/entrypoint.sh
+    healthcheck:
+      test: curl --fail 0.0.0.0:8000/healthz || exit 1
     deploy:
       update_config:
         failure_action: rollback
+        order: start-first
       labels:
         - "traefik.enable=true"
         - "traefik.http.services.kcp.loadbalancer.server.port=8000"
@@ -34,11 +43,22 @@ services:
       --host 0.0.0.0
       --forwarded-allow-ips="*"
       --proxy-headers
-      keycloak_collective_portal:app
+      keycloak_collective_portal.main:app
+
+  cache:
+    image: redis:6.2-alpine
+    networks:
+      - internal
+    healthcheck:
+      test: redis-cli ping
+    volumes:
+      - redis:/data
 
 networks:
   proxy:
     external: true
+  internal:
+    internal: true
 
 configs:
   entrypoint_sh:
@@ -53,3 +73,6 @@ secrets:
   keycloak_client_secret:
     external: true
     name: ${STACK_NAME}_keycloak_client_secret_${SECRET_KEYCLOAK_CLIENT_SECRET}
+
+volumes:
+  redis: