Updated to rails 7.1 and ruby 3.1.4

deploy/deploy-test.sh

@@ -11,9 +11,10 @@ export PASSENGER_POOL_SIZE=$(expr $PASSENGER_POOL_FACTOR '*' 1)
 docker-compose -f ${project_dir}/deploy/docker-compose-test.yml kill
 docker-compose -f ${project_dir}/deploy/docker-compose-test.yml build
 docker-compose -f ${project_dir}/deploy/docker-compose-test.yml up -d
+sleep 30s
 # echo Make sure your local mysql database has a wrestlingtourney db
-docker exec -i deploy_app_1 rake db:create
-docker exec -i deploy_app_1 rake db:migrate
+docker-compose -f ${project_dir}/deploy/docker-compose-test.yml exec -T app rake db:create
+docker-compose -f ${project_dir}/deploy/docker-compose-test.yml exec -T app rake db:migrate
 
 echo Resetting the db with seed data
-docker exec -i deploy_app_1 bash -c "DISABLE_DATABASE_ENVIRONMENT_CHECK=1 rake db:reset"
+docker-compose -f ${project_dir}/deploy/docker-compose-test.yml exec -T app bash -c "DISABLE_DATABASE_ENVIRONMENT_CHECK=1 rake db:reset"

deploy/docker-compose-test.yml

@@ -51,6 +51,12 @@ services:
     restart: always
     networks:
       database:
+    healthcheck:
+      test: mysqladmin ping -h 127.0.0.1 -u root --password=$$MYSQL_PASSWORD
+      start_period: 5s
+      interval: 5s
+      timeout: 5s
+      retries: 10
 
   worker:
     image: wrestlingdev

deploy/rails-dev-Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.0.4
+FROM ruby:3.1.4
 
 RUN apt-get -qq update \
   && apt-get -qq install -y \

deploy/rails-prod-Dockerfile

@@ -1,8 +1,8 @@
-FROM ruby:3.0.4-slim
+FROM ruby:3.1.4-slim
 
 #HEALTHCHECK --start-period=60s CMD curl http://127.0.0.1/
 
-ENV TINI_VERSION v0.18.0
+ENV TINI_VERSION v0.19.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini