chore: More aggressive health check

r-dbi · Feb 3, 2024 · 3d278e3 · 3d278e3
1 parent b46147a
commit 3d278e3
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 30 deletions.
diff --git a/compose_files/docker-compose.maria.yml b/compose_files/docker-compose.maria.yml
@@ -40,11 +40,11 @@ services:
       - maria-db:/var/lib/mysql
     healthcheck:
       test: [ "CMD", "healthcheck.sh", "--su-mysql", "--connect", "--innodb_initialized" ]
-      start_period: 5s
-      start_interval: 10s
-      interval: 10s
+      start_period: 4s
+      start_interval: 1s
+      interval: 0.2s
       timeout: 5s
-      retries: 3
+      retries: 100
     ports:
       - "3306:3306"
     networks:

diff --git a/compose_files/docker-compose.mssql.yml b/compose_files/docker-compose.mssql.yml
@@ -37,10 +37,11 @@ services:
     healthcheck:
       # test: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P "YourStrong!Passw0rd" -Q "SELECT 1" -b -o /dev/null
       test: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P "YourStrong!Passw0rd" -Q "IF NOT EXISTS (SELECT * FROM sys.databases WHERE name = 'test') BEGIN CREATE DATABASE test; END ELSE BEGIN SELECT 1; END;" -b -o /dev/null
-      interval: 10s
-      timeout: 3s
-      retries: 10
-      start_period: 10s
+      start_period: 4s
+      start_interval: 1s
+      interval: 0.2s
+      timeout: 5s
+      retries: 100
     volumes:
       - mssql-db:/var/opt/mssql
     ports:

diff --git a/compose_files/docker-compose.mysql.yml b/compose_files/docker-compose.mysql.yml
@@ -34,10 +34,11 @@ services:
       MYSQL_PASSWORD: "YourStrong!Passw0rd"
     healthcheck:
       test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-pYourStrong!Passw0rd"]
-      interval: 20s
-      timeout: 10s
-      retries: 3
-      start_period: 5s
+      start_period: 4s
+      start_interval: 1s
+      interval: 0.2s
+      timeout: 5s
+      retries: 100
     ports:
       - "3307:3306"
     networks:

diff --git a/compose_files/docker-compose.oracle.yml b/compose_files/docker-compose.oracle.yml
@@ -39,10 +39,11 @@ services:
       - oracle-network
     healthcheck:
       test: ["CMD-SHELL", "cat /sql/init.sql | sqlplus -S SYS/Oradoc_db1 AS SYSDBA"]
-      interval: 30s
-      timeout: 3s
-      retries: 2
-      start_period: 30s
+      start_period: 4s
+      start_interval: 1s
+      interval: 0.2s
+      timeout: 5s
+      retries: 100
     volumes:
       - oracle-db:/opt/oracle/oradata
       - ./init.sql:/sql/init.sql
diff --git a/compose_files/docker-compose.postgres.yml b/compose_files/docker-compose.postgres.yml
@@ -38,9 +38,11 @@ services:
       POSTGRES_PASSWORD: "YourStrong!Passw0rd"
     healthcheck:
       test: ["CMD-SHELL", "pg_isready"]
-      interval: 10s
+      start_period: 4s
+      start_interval: 1s
+      interval: 0.2s
       timeout: 5s
-      retries: 5
+      retries: 100
     volumes:
       - postgres-db:/var/lib/postgresql/data
     ports:

diff --git a/compose_files/docker-compose.sqlite.yml b/compose_files/docker-compose.sqlite.yml
@@ -20,15 +20,3 @@ services:
       # simple test
       - ./test/test-sqlite.R:/root/workspace/.Rprofile
     entrypoint: ["R"]
-
-  # sqlite:
-  #   container_name: sqlite
-  #   #https://github.com/KEINOS/Dockerfile_of_SQLite3 - built weekly
-  #   image: keinos/sqlite3:latest
-  #   volumes:
-  #     - ./data:/data
-  #   working_dir: /data
-  #   command: sqlite3
-  #   stdin_open: true
-  #   tty: true
-