From d9854e1a4e392eadb38ee6fc3b5ba91fea07a989 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Fri, 2 Aug 2024 10:23:34 +0300 Subject: [PATCH 1/5] Fix tests --- script/cibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/cibuild b/script/cibuild index a68de2ad..73d5ea08 100755 --- a/script/cibuild +++ b/script/cibuild @@ -4,7 +4,7 @@ set -e export RUBY_VERSION=$1 -docker_compose="docker-compose --file test-envs/docker-compose-$2.yml" +docker_compose="docker compose --file test-envs/docker-compose-$2.yml" function cleanup() { $docker_compose down From e81919888e91b790c1388f561ec41ee2a53a5ab6 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Fri, 2 Aug 2024 10:36:08 +0300 Subject: [PATCH 2/5] Remove the version specificators --- test-envs/docker-compose-mysql.yml | 1 - test-envs/docker-compose-postgres.yml | 1 - test-envs/docker-compose-sqlite.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/test-envs/docker-compose-mysql.yml b/test-envs/docker-compose-mysql.yml index 002f5b9e..b6edacf0 100644 --- a/test-envs/docker-compose-mysql.yml +++ b/test-envs/docker-compose-mysql.yml @@ -1,4 +1,3 @@ -version: '3' services: db: image: mysql:5.7 diff --git a/test-envs/docker-compose-postgres.yml b/test-envs/docker-compose-postgres.yml index 52ba2945..1e7e7a7d 100644 --- a/test-envs/docker-compose-postgres.yml +++ b/test-envs/docker-compose-postgres.yml @@ -1,4 +1,3 @@ -version: '3' services: db: image: postgres:13 diff --git a/test-envs/docker-compose-sqlite.yml b/test-envs/docker-compose-sqlite.yml index 7a04620c..18db5e68 100644 --- a/test-envs/docker-compose-sqlite.yml +++ b/test-envs/docker-compose-sqlite.yml @@ -1,4 +1,3 @@ -version: '3' services: web: build: From e70a56951171ca04d059cd8f7601d1d3680a7308 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Thu, 15 Aug 2024 13:16:14 +0300 Subject: [PATCH 3/5] Add debug output for the DB poll --- script/poll-for-db | 1 + 1 file changed, 1 insertion(+) diff --git a/script/poll-for-db b/script/poll-for-db index 4be07922..69b41fae 100755 --- a/script/poll-for-db +++ b/script/poll-for-db @@ -7,6 +7,7 @@ if [ "$DATABASE_TYPE" == "mysql" ]; then [ -f /etc/app-env ] || exec "$appdir/script/docker-environment" $0 $@ for i in {1..60}; do + echo "... Checking for connection" nc -z -w5 db 3306 && exit sleep 1 done From 24c4634a7b405fd9dc2c7629eb6863a59ca01a0d Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 23 Oct 2024 01:52:02 +0300 Subject: [PATCH 4/5] Use correct var for detecting MySQL --- script/cibuild | 2 +- script/poll-for-db | 2 +- test-envs/docker-compose-mysql.yml | 2 +- test-envs/docker-compose-postgres.yml | 2 +- test-envs/docker-compose-sqlite.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/script/cibuild b/script/cibuild index 73d5ea08..4a35a3b4 100755 --- a/script/cibuild +++ b/script/cibuild @@ -22,7 +22,7 @@ export DATABASE_NAME=tracks_test $docker_compose build $docker_compose up -d -script/poll-for-db +script/poll-for-db $2 # Leaving this in since it will be needed for Rails 5 $docker_compose run web bin/rails db:environment:set RAILS_ENV=test || true diff --git a/script/poll-for-db b/script/poll-for-db index 69b41fae..2e8383ca 100755 --- a/script/poll-for-db +++ b/script/poll-for-db @@ -2,7 +2,7 @@ echo "==> Polling DB…" -if [ "$DATABASE_TYPE" == "mysql" ]; then +if [ "$1" == "mysql" ]; then appdir=$(cd $(dirname "$0")/.. && pwd) [ -f /etc/app-env ] || exec "$appdir/script/docker-environment" $0 $@ diff --git a/test-envs/docker-compose-mysql.yml b/test-envs/docker-compose-mysql.yml index b6edacf0..a16effe7 100644 --- a/test-envs/docker-compose-mysql.yml +++ b/test-envs/docker-compose-mysql.yml @@ -11,7 +11,7 @@ services: args: RUBY_VERSION: ${RUBY_VERSION} environment: - # These are set in script/ci-build, so we need to pass-thru them. + # These are set in script/cibuild, so we need to pass-thru them. RAILS_ENV: $RAILS_ENV DATABASE_NAME: $DATABASE_NAME DATABASE_USERNAME: root diff --git a/test-envs/docker-compose-postgres.yml b/test-envs/docker-compose-postgres.yml index 1e7e7a7d..ddd54f88 100644 --- a/test-envs/docker-compose-postgres.yml +++ b/test-envs/docker-compose-postgres.yml @@ -11,7 +11,7 @@ services: args: RUBY_VERSION: ${RUBY_VERSION} environment: - # These are set in script/ci-build, so we need to pass-thru them. + # These are set in script/cibuild, so we need to pass-thru them. RAILS_ENV: $RAILS_ENV DATABASE_NAME: $DATABASE_NAME DATABASE_USERNAME: postgres diff --git a/test-envs/docker-compose-sqlite.yml b/test-envs/docker-compose-sqlite.yml index 18db5e68..e0ae6af3 100644 --- a/test-envs/docker-compose-sqlite.yml +++ b/test-envs/docker-compose-sqlite.yml @@ -6,7 +6,7 @@ services: args: RUBY_VERSION: ${RUBY_VERSION} environment: - # These are set in script/ci-build, so we need to pass-thru them. + # These are set in script/cibuild, so we need to pass-thru them. RAILS_ENV: $RAILS_ENV DATABASE_NAME: "/app/db/db.sqlite" DATABASE_TYPE: sqlite3 From e4f3fd0737bc6559fb2a41e2004db9a424b2cefd Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 23 Oct 2024 02:01:42 +0300 Subject: [PATCH 5/5] Use docker compose command --- script/docker-environment | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/docker-environment b/script/docker-environment index 1d51c8b1..634ec93e 100755 --- a/script/docker-environment +++ b/script/docker-environment @@ -2,7 +2,7 @@ set -e -docker_compose="docker-compose --file docker-compose.yml" +docker_compose="docker compose --file docker-compose.yml" # Find our app dir appdir=$(cd $(dirname "$0")/.. && pwd)