Skip to content

Commit e52f431

Browse files
committed
🐳 [#521] Improve docker compose files
1 parent 1fe55fc commit e52f431

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

backend/docker-services/keycloak/docker-compose.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ services:
1616
networks:
1717
- keycloak-dev
1818

19-
keycloak:
19+
keycloak.local:
2020
depends_on:
2121
- keycloak-db
22-
container_name: keycloak_dev
2322
command: start-dev --import-realm
2423
environment:
2524
KEYCLOAK_ADMIN: admin
@@ -39,4 +38,5 @@ services:
3938
- keycloak-dev
4039

4140
networks:
42-
keycloak-dev:
41+
keycloak-dev:
42+
name: keycloak-dev

backend/docker-services/openzaak/docker-compose.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
image: redis:7
1313
command: ["redis-server", "--appendonly", "yes"]
1414
networks:
15-
- oab-dev
15+
- openzaak-dev
1616

1717
openzaak-db:
1818
image: postgis/postgis:${PG_VERSION:-14-master}
@@ -22,7 +22,7 @@ services:
2222
- ./docker-init-open-zaak-db/:/docker-entrypoint-initdb.d
2323
- open-zaak-db:/var/lib/postgresql/data
2424
networks:
25-
- oab-dev
25+
- openzaak-dev
2626

2727
openzaak-web.local:
2828
image: openzaak/open-zaak:${OPENZAAK_VERSION:-1.13.0}
@@ -57,7 +57,7 @@ services:
5757
- openzaak-db
5858
- openzaak-redis
5959
networks:
60-
- oab-dev
60+
- openzaak-dev
6161

6262
celery:
6363
image: openzaak/open-zaak:${OPENZAAK_VERSION:-1.13.0}
@@ -68,13 +68,13 @@ services:
6868
- openzaak-db
6969
- openzaak-redis
7070
networks:
71-
- oab-dev
71+
- openzaak-dev
7272

7373
volumes:
7474
open-zaak-db:
7575
media:
7676
private-media:
7777

7878
networks:
79-
oab-dev:
80-
name: oab-dev
79+
openzaak-dev:
80+
name: openzaak-dev

docker-compose.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,15 @@ services:
5858
networks:
5959
- open-archiefbeheer-dev
6060

61+
# TODO: the configuration does not result in properly working OIDC
62+
# The backchannel needs a hostname resolvable in the docker network but the
63+
# frontchannel needs a hostname resolvable on the host.
6164
web-init:
6265
build: .
6366
environment: *web_env
6467
command: /setup_configuration.sh
6568
volumes:
66-
- ./backend/docker-services/setup-configuration:/app/setup_configuration
69+
- ./backend/src/openarchiefbeheer/config/setup-configuration/fixtures:/app/setup_configuration
6770
depends_on:
6871
- db
6972
- redis

0 commit comments

Comments
 (0)