bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

redo the healthchecks in test.yml

Browse Source
This commit is contained in:
Andreas Stephanides
2023-01-01 11:56:01 +01:00
parent 851c10c274
commit 1a3f87ef9e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docker-compose.test.yml
View File

@@ -16,7 +16,7 @@ services:
#- mysql-volume:/var/lib/mysql #- mysql-volume:/var/lib/mysql
- /srv/initdb/mysql:/docker-entrypoint-initdb.d/ - /srv/initdb/mysql:/docker-entrypoint-initdb.d/
healthcheck: healthcheck:
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] test: "mysqladmin ping -h localhost && echo 'show tables;' | mysql 'fet2020db' >/dev/null "
timeout: 20s timeout: 20s
retries: 20 retries: 20
etherpadsql: etherpadsql:
@@ -25,14 +25,14 @@ services:
networks: networks:
- testfet - testfet
environment: environment:
MYSQL_DATABASE: etherpaddb:10.7 MYSQL_DATABASE: etherpaddb
MYSQL_USER: user MYSQL_USER: user
MYSQL_PASSWORD: "hgu" MYSQL_PASSWORD: "hgu"
MYSQL_COLLATION: utf8_general_ci MYSQL_COLLATION: utf8_general_ci
MYSQL_CHARSET: utf8 MYSQL_CHARSET: utf8
MYSQL_ALLOW_EMPTY_PASSWORD: "yes" MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
healthcheck: healthcheck:
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] test: "mysqladmin ping -h localhost && echo 'show tables;' | mysql --port 3306 --protocol tcp 'etherpaddb' > /dev/null"
timeout: 20s timeout: 20s
retries: 20 retries: 20
volumes: volumes:
@@ -61,9 +61,9 @@ services:
restart: unless-stopped restart: unless-stopped
# - ./deployment/mysql.cnf:/etc/mysql/conf.d # - ./deployment/mysql.cnf:/etc/mysql/conf.d
healthcheck: healthcheck:
test: ["etherpad-healthcheck"] test: "curl --fail localhost:9001 >/dev/null "
timeout: 30s timeout: 10s
interval: 30s interval: 15s
retries: 30 retries: 30
fet2020: fet2020:
image: docker.fet.at/fet2020django image: docker.fet.at/fet2020django