🐳 [#521] Improve docker compose files

maykinmedia · Dec 5, 2024 · e52f431 · e52f431
1 parent 1fe55fc
commit e52f431
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/backend/docker-services/keycloak/docker-compose.yaml b/backend/docker-services/keycloak/docker-compose.yaml
@@ -16,10 +16,9 @@ services:
     networks:
       - keycloak-dev
 
-  keycloak:
+  keycloak.local:
     depends_on:
       - keycloak-db
-    container_name: keycloak_dev
     command: start-dev --import-realm
     environment:
       KEYCLOAK_ADMIN: admin
@@ -39,4 +38,5 @@ services:
       - keycloak-dev
 
 networks:
-  keycloak-dev:
+  keycloak-dev:
+    name: keycloak-dev
diff --git a/backend/docker-services/openzaak/docker-compose.yaml b/backend/docker-services/openzaak/docker-compose.yaml
@@ -12,7 +12,7 @@ services:
     image: redis:7
     command: ["redis-server", "--appendonly", "yes"]
     networks:
-      - oab-dev
+      - openzaak-dev
 
   openzaak-db:
     image: postgis/postgis:${PG_VERSION:-14-master}
@@ -22,7 +22,7 @@ services:
       - ./docker-init-open-zaak-db/:/docker-entrypoint-initdb.d
       - open-zaak-db:/var/lib/postgresql/data
     networks:
-      - oab-dev
+      - openzaak-dev
 
   openzaak-web.local:
     image: openzaak/open-zaak:${OPENZAAK_VERSION:-1.13.0}
@@ -57,7 +57,7 @@ services:
       - openzaak-db
       - openzaak-redis
     networks:
-      - oab-dev
+      - openzaak-dev
 
   celery:
     image: openzaak/open-zaak:${OPENZAAK_VERSION:-1.13.0}
@@ -68,13 +68,13 @@ services:
       - openzaak-db
       - openzaak-redis
     networks:
-      - oab-dev
+      - openzaak-dev
 
 volumes:
   open-zaak-db:
   media:
   private-media:
 
 networks:
-  oab-dev:
-    name: oab-dev
+  openzaak-dev:
+    name: openzaak-dev
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -58,12 +58,15 @@ services:
     networks:
       - open-archiefbeheer-dev
 
+  # TODO: the configuration does not result in properly working OIDC
+  # The backchannel needs a hostname resolvable in the docker network but the 
+  # frontchannel needs a hostname resolvable on the host.
   web-init:
     build: .
     environment: *web_env
     command: /setup_configuration.sh
     volumes:
-      - ./backend/docker-services/setup-configuration:/app/setup_configuration
+      - ./backend/src/openarchiefbeheer/config/setup-configuration/fixtures:/app/setup_configuration
     depends_on:
       - db
       - redis