Healthchecks for sidekiq + misc fixes

.github/workflows/test.yml

@@ -47,8 +47,6 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-      - name: Audit gems
-        run: bundle exec bundle-audit check --update
       - name: Configure and initialize database
         run: |
           cp test/config/test_tess.yml config/tess.yml
@@ -66,3 +64,5 @@ jobs:
         run: bundle exec rails test
       - name: Run system tests
         run: bundle exec rails test:system
+      - name: Audit gems
+        run: bundle exec bundle-audit check --update

Gemfile.lock

@@ -171,7 +171,7 @@ GEM
       json_schema (~> 0.14, >= 0.14.3)
       openapi_parser (~> 1.0)
       rack (>= 1.5)
-    concurrent-ruby (1.3.6)
+    concurrent-ruby (1.3.7)
     connection_pool (3.0.2)
     countries (5.6.0)
       unaccent (~> 0.3)
@@ -211,7 +211,7 @@ GEM
     eventbrite_sdk (3.6.0)
       rest-client (~> 2.0)
     execjs (2.8.1)
-    faraday (2.14.2)
+    faraday (2.14.3)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger

docker-compose-prod.yml

@@ -41,7 +41,7 @@ services:
       POSTGRES_USER: ${DB_USER}
       POSTGRES_PASSWORD: ${DB_PASSWORD}
     healthcheck:
-      test: pg_isready -U postgres -h 127.0.0.1
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USER}"]
       interval: 5s
     volumes:
       - db-data:/var/lib/postgresql/data
@@ -71,6 +71,8 @@ services:
     container_name: ${PREFIX}-sidekiq
     image: ${PREFIX}-app
     restart: always
+    healthcheck:
+      test: bundle exec sidekiqmon | grep $(hostname)
     depends_on:
       - app
       - db

docker-compose.yml

@@ -26,20 +26,22 @@ 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
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USER}"]
       interval: 5s
     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 +54,7 @@ services:
   redis:
     container_name: ${PREFIX}-redis
     image: redis:7
+    restart: unless-stopped
     healthcheck:
       test: redis-cli ping
       interval: 1s
@@ -62,6 +65,9 @@ services:
   sidekiq:
     container_name: ${PREFIX}-sidekiq
     image: ${PREFIX}-app
+    restart: unless-stopped
+    healthcheck:
+      test: bundle exec sidekiqmon | grep $(hostname)
     depends_on:
       - app
       - db