Skip to content

fix(docker): make Compose health checks reflect service state #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxlastglance merged 1 commit into from
Oct 12, 2026
Merged

fix(docker): make Compose health checks reflect service state #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ services:
volumes:
- ./config/metrics.cnf:/.my.cnf
healthcheck:
test: -h
test: bash -c 'exec 3<>/dev/tcp/127.0.0.1/9104 && printf "GET /metrics HTTP/1.0\r\n\r\n" >&3 && grep -q "^mysql_up 1" <&3'
<<: *healthcheck-params
depends_on:
dbrepo-metadata-db:
Expand Down Expand Up @@ -91,7 +91,7 @@ services:
volumes:
- ./config/metrics.cnf:/.my.cnf
healthcheck:
test: -h
test: bash -c 'exec 3<>/dev/tcp/127.0.0.1/9104 && printf "GET /metrics HTTP/1.0\r\n\r\n" >&3 && grep -q "^mysql_up 1" <&3'
<<: *healthcheck-params
depends_on:
dbrepo-data-db:
Expand All @@ -112,7 +112,7 @@ services:
POSTGRESQL_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
PGPASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
healthcheck:
test: "psql -U ${AUTH_DB_USERNAME:-keycloak} -h 127.0.0.1 -p 5432 -d ${AUTH_DB_NAME:-keycloak} -c 'select version();'"
test: "pg_isready -U ${AUTH_DB_USERNAME:-keycloak} -h 127.0.0.1 -p 5432 -d ${AUTH_DB_NAME:-keycloak}"
<<: *healthcheck-params
logging:
driver: json-file
Expand All @@ -129,7 +129,7 @@ services:
POSTGRESQL_USERNAME: "${DASHBOARD_DB_USERNAME:-grafana}"
POSTGRESQL_PASSWORD: "${DASHBOARD_DB_PASSWORD:-dbrepo}"
healthcheck:
test: "psql -U ${DASHBOARD_DB_USERNAME:-grafana} -h 127.0.0.1 -p 5432 -d ${DASHBOARD_DB_NAME:-grafana} -c 'select version();'"
test: "pg_isready -U ${DASHBOARD_DB_USERNAME:-grafana} -h 127.0.0.1 -p 5432 -d ${DASHBOARD_DB_NAME:-grafana}"
<<: *healthcheck-params
logging:
driver: json-file
Expand Down Expand Up @@ -422,7 +422,7 @@ services:
dbrepo-ui:
condition: service_healthy
healthcheck:
test: curl -sSL 127.0.0.1:8080/health | grep 'UP' | exit
test: curl -fsS 127.0.0.1:8080/health | grep -q 'UP'
<<: *healthcheck-params
logging:
driver: json-file
Expand Down
8 changes: 4 additions & 4 deletions .live/config/includes.chroot_after_packages/etc/skel/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ services:
volumes:
- ./config/metrics.cnf:/.my.cnf
healthcheck:
test: -h
test: bash -c 'exec 3<>/dev/tcp/127.0.0.1/9104 && printf "GET /metrics HTTP/1.0\r\n\r\n" >&3 && grep -q "^mysql_up 1" <&3'
<<: *healthcheck-params
depends_on:
dbrepo-metadata-db:
Expand Down Expand Up @@ -91,7 +91,7 @@ services:
volumes:
- ./config/metrics.cnf:/.my.cnf
healthcheck:
test: -h
test: bash -c 'exec 3<>/dev/tcp/127.0.0.1/9104 && printf "GET /metrics HTTP/1.0\r\n\r\n" >&3 && grep -q "^mysql_up 1" <&3'
<<: *healthcheck-params
depends_on:
dbrepo-data-db:
Expand All @@ -112,7 +112,7 @@ services:
POSTGRESQL_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
PGPASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
healthcheck:
test: "psql -U ${AUTH_DB_USERNAME:-keycloak} -h 127.0.0.1 -p 5432 -d ${AUTH_DB_NAME:-keycloak} -c 'select version();'"
test: "pg_isready -U ${AUTH_DB_USERNAME:-keycloak} -h 127.0.0.1 -p 5432 -d ${AUTH_DB_NAME:-keycloak}"
<<: *healthcheck-params
logging:
driver: json-file
Expand All @@ -129,7 +129,7 @@ services:
POSTGRESQL_USERNAME: "${DASHBOARD_DB_USERNAME:-grafana}"
POSTGRESQL_PASSWORD: "${DASHBOARD_DB_PASSWORD:-dbrepo}"
healthcheck:
test: "psql -U ${DASHBOARD_DB_USERNAME:-grafana} -h 127.0.0.1 -p 5432 -d ${DASHBOARD_DB_NAME:-grafana} -c 'select version();'"
test: "pg_isready -U ${DASHBOARD_DB_USERNAME:-grafana} -h 127.0.0.1 -p 5432 -d ${DASHBOARD_DB_NAME:-grafana}"
<<: *healthcheck-params
logging:
driver: json-file
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ services:
POSTGRESQL_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
PGPASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
healthcheck:
test: "psql -U ${AUTH_DB_USERNAME:-keycloak} -h 127.0.0.1 -p 5432 -d ${AUTH_DB_NAME:-keycloak} -c 'select version();'"
test: "pg_isready -U ${AUTH_DB_USERNAME:-keycloak} -h 127.0.0.1 -p 5432 -d ${AUTH_DB_NAME:-keycloak}"
<<: *healthcheck-params
logging:
driver: json-file
Expand All @@ -91,7 +91,7 @@ services:
POSTGRESQL_USERNAME: "${DASHBOARD_DB_USERNAME:-grafana}"
POSTGRESQL_PASSWORD: "${DASHBOARD_DB_PASSWORD:-dbrepo}"
healthcheck:
test: "psql -U ${DASHBOARD_DB_USERNAME:-grafana} -h 127.0.0.1 -p 5432 -d ${DASHBOARD_DB_NAME:-grafana} -c 'select version();'"
test: "pg_isready -U ${DASHBOARD_DB_USERNAME:-grafana} -h 127.0.0.1 -p 5432 -d ${DASHBOARD_DB_NAME:-grafana}"
<<: *healthcheck-params
logging:
driver: json-file
Expand Down Expand Up @@ -402,7 +402,7 @@ services:
dbrepo-ui:
condition: service_healthy
healthcheck:
test: curl -sSL 127.0.0.1:8080/health | grep 'UP' | exit
test: curl -fsS 127.0.0.1:8080/health | grep -q 'UP'
<<: *healthcheck-params
logging:
driver: json-file
Expand Down
Loading