Check docker compose ps for dead containers

Author: fbacall

docker-compose-prod.yml

@@ -41,8 +41,10 @@ services:
       POSTGRES_USER: ${DB_USER}
       POSTGRES_PASSWORD: ${DB_PASSWORD}
     healthcheck:
-      test: pg_isready -U postgres -h 127.0.0.1
-      interval: 5s
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"]
+      interval: 1s
+      timeout: 5s
+      retries: 10
     volumes:
       - db-data:/var/lib/postgresql/data
   solr:

docker-compose.yml

@@ -26,20 +26,24 @@ services:
     logging:
       driver: none
     image: postgres:14.2
+    restart: unless-stopped
     env_file: .env
     environment:
       PGDATA: /var/lib/postgresql/data
       POSTGRES_DB: ${DB_NAME}
       POSTGRES_USER: ${DB_USER}
       POSTGRES_PASSWORD: ${DB_PASSWORD}
     healthcheck:
-      test: pg_isready -U postgres -h 127.0.0.1
-      interval: 5s
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"]
+      interval: 1s
+      timeout: 5s
+      retries: 10
     volumes:
       - db-data:/var/lib/postgresql/data
   solr:
     container_name: ${PREFIX}-solr
     image: solr:8
+    restart: unless-stopped
     volumes:
       - solr-data:/var/solr
       - ./solr:/opt/solr/server/solr/configsets/development
@@ -52,6 +56,7 @@ services:
   redis:
     container_name: ${PREFIX}-redis
     image: redis:6
+    restart: unless-stopped
     healthcheck:
       test: redis-cli ping
       interval: 1s
@@ -62,6 +67,7 @@ services:
   sidekiq:
     container_name: ${PREFIX}-sidekiq
     image: ${PREFIX}-app
+    restart: unless-stopped
     depends_on:
       - app
       - db

scripts/check_deployment.rb

@@ -1,13 +1,23 @@
 output = `curl --verbose --silent http://localhost:3000/ 2>&1`
+
 if $?.success? && output.include?('Browse the catalogue')
-  exit 0
-else
-  puts "::group::Docker logs"
-  puts `docker compose --file docker-compose-prod.yml logs`
-  puts "::endgroup::"
-  puts "::group::curl output"
-  puts output
-  puts "::endgroup::"
-  exit 1
+  docker_ps = `docker compose ps -a --format json`
+  if $?.success?
+    j = JSON.parse(docker_ps)
+    unless j.any? { |c| c['ExitCode'] == 1 }
+      exit 0
+    end
+  end
 end
 
+puts "::group::Docker ps"
+puts `docker compose ps -a`
+puts "::endgroup::"
+puts "::group::Docker logs"
+puts `docker compose --file docker-compose-prod.yml logs`
+puts "::endgroup::"
+puts "::group::curl output"
+puts output
+puts "::endgroup::"
+
+exit 1