Skip to content

Commit d3ea51a

Browse files
author
jens
committed
chore: reactivate health checks
1 parent 20f40d7 commit d3ea51a

File tree

1 file changed

+51
-52
lines changed

1 file changed

+51
-52
lines changed

docker/compose.yaml

Lines changed: 51 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ services:
1515
- ./data/cms-db:/opt/couchdb/data
1616
ports:
1717
- "${CSAF_COUCHDB_PORT}:5984"
18-
#healthcheck:
19-
# test: ["CMD-SHELL", "curl http://127.0.0.1:5984/_up || exit 1"]
20-
# interval: 10s
21-
# timeout: 10s
22-
# retries: 10
18+
healthcheck:
19+
test: ["CMD-SHELL", "curl http://127.0.0.1:5984/_up || exit 1"]
20+
interval: 10s
21+
timeout: 10s
22+
retries: 10
2323
networks:
2424
default:
2525
aliases:
@@ -28,7 +28,7 @@ services:
2828
keycloak-db:
2929
image: postgres:17-alpine
3030
hostname: keycloak-db.csaf.internal
31-
#container_name: keycloak-db
31+
container_name: keycloak-db
3232
volumes:
3333
- ./data/keycloak-db:/var/lib/postgresql/data
3434
env_file: .env
@@ -39,11 +39,11 @@ services:
3939
restart: on-failure
4040
ports:
4141
- "${CSAF_KEYCLOAK_DATABASE_PORT}:5432"
42-
#healthcheck:
43-
# test: ["CMD-SHELL", "pg_isready -U $${CSAF_KEYCLOAK_DATABASE_USER}"]
44-
# interval: 10s
45-
# timeout: 10s
46-
# retries: 10
42+
healthcheck:
43+
test: ["CMD-SHELL", "pg_isready -U $${CSAF_KEYCLOAK_DATABASE_USER}"]
44+
interval: 10s
45+
timeout: 10s
46+
retries: 10
4747
networks:
4848
default:
4949
aliases:
@@ -74,25 +74,24 @@ services:
7474
#KC_HOSTNAME: ${CSAF_KEYCLOAK_CLIENT_HOSTNAME_URL}
7575
volumes:
7676
- ./config/keycloak:/opt/keycloak/data/import
77-
#healthcheck:
78-
# start_period: 120s
79-
# test:
80-
# ["CMD-SHELL", "timeout 1 bash -c 'cat < /dev/null > /dev/tcp/localhost/8080'", ]
81-
# interval: 10s
82-
# timeout: 10s
83-
# retries: 10
84-
#depends_on:
85-
# keycloak-db:
86-
# condition: service_healthy
87-
# restart: true
77+
healthcheck:
78+
start_period: 120s
79+
test:
80+
["CMD-SHELL", "timeout 1 bash -c 'cat < /dev/null > /dev/tcp/localhost/8080'", ]
81+
interval: 10s
82+
timeout: 10s
83+
retries: 10
84+
depends_on:
85+
keycloak-db:
86+
condition: service_healthy
87+
restart: true
8888
restart: on-failure
8989
ports:
9090
- "${CSAF_KEYCLOAK_PORT}:8080"
9191
command:
92-
- start-dev
93-
# - --verbose
94-
# - --import-realm
95-
#command: ["start-dev"] # https://www.keycloak.org/server/configuration#_starting_keycloak_in_production_mode
92+
- start-dev # https://www.keycloak.org/server/configuration#_starting_keycloak_in_production_mode
93+
- --verbose
94+
- --import-realm
9695
networks:
9796
default:
9897
aliases:
@@ -113,14 +112,14 @@ services:
113112
ISDUBA_KEYCLOAK_REALM: ${CSAF_KEYCLOAK_HOSTNAME_URL}
114113
volumes:
115114
- ./config/keycloak/init.sh:/opt/keycloak/init.sh
116-
#depends_on:
117-
# keycloak:
118-
# condition: service_healthy
115+
depends_on:
116+
keycloak:
117+
condition: service_healthy
119118

120119
oauth2-proxy:
121120
image: bitnami/oauth2-proxy:7.4.0
122121
hostname: oauth2.csaf.internal
123-
#container_name: oauth2-proxy
122+
container_name: oauth2-proxy
124123
command: [""]
125124
env_file: .env
126125
environment:
@@ -170,9 +169,9 @@ services:
170169
extra_hosts:
171170
- "host.docker.internal:host-gateway"
172171
restart: on-failure
173-
#depends_on:
174-
# keycloak:
175-
# condition: service_healthy
172+
depends_on:
173+
keycloak:
174+
condition: service_healthy
176175
networks:
177176
default:
178177
aliases:
@@ -185,11 +184,11 @@ services:
185184
env_file: .env
186185
ports:
187186
- "$CSAF_VALIDATOR_PORT:8082"
188-
# healthcheck:
189-
# test: ["CMD-SHELL", "wget -O /dev/null http://127.0.0.1:8082/api/v1/tests || exit 1"]
190-
# interval: 10s
191-
# timeout: 10s
192-
# retries: 10
187+
healthcheck:
188+
test: ["CMD-SHELL", "wget -O /dev/null http://127.0.0.1:8082/api/v1/tests || exit 1"]
189+
interval: 10s
190+
timeout: 10s
191+
retries: 10
193192
networks:
194193
default:
195194
aliases:
@@ -221,17 +220,17 @@ services:
221220
- "80:80"
222221
volumes:
223222
- "./config/reverseproxy/nginx.conf:/etc/nginx/nginx.conf:ro"
224-
# healthcheck:
225-
# test: ["CMD-SHELL", "wget -O /dev/null http://127.0.0.1 || exit 1"]
226-
# interval: 10s
227-
# timeout: 10s
228-
# retries: 10
229-
# depends_on:
230-
# secvisogram:
231-
# condition: service_healthy
232-
# keycloak:
233-
# condition: service_healthy
234-
# oauth2-proxy:
235-
# condition: service_started
236-
# validator:
237-
# condition: service_healthy
223+
healthcheck:
224+
test: ["CMD-SHELL", "wget -O /dev/null http://127.0.0.1 || exit 1"]
225+
interval: 10s
226+
timeout: 10s
227+
retries: 10
228+
depends_on:
229+
secvisogram:
230+
condition: service_healthy
231+
keycloak:
232+
condition: service_healthy
233+
oauth2-proxy:
234+
condition: service_started
235+
validator:
236+
condition: service_healthy

0 commit comments

Comments
 (0)