diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a47794abb..e59a41b14 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -69,7 +69,7 @@ jobs: steps: - run: | docker create --name cockroach -p 26257:26257 \ - cockroachdb/cockroach:v20.2.5 start-single-node --insecure + cockroachdb/cockroach:latest-v23.2 start-single-node --insecure docker start cockroach name: Start CockroachDB - uses: ory/ci/checkout@master diff --git a/internal/x/dbx/dsn_cockroach.go b/internal/x/dbx/dsn_cockroach.go index 098efd900..eb85deb3c 100644 --- a/internal/x/dbx/dsn_cockroach.go +++ b/internal/x/dbx/dsn_cockroach.go @@ -12,7 +12,7 @@ import ( ) func RunCockroach(t testing.TB, testDB string) string { - url := dockertest.RunTestCockroachDB(t) + url := dockertest.RunTestCockroachDBWithVersion(t, "latest-v24.2") if err := createDB(t, url, testDB); err != nil { t.Fatal(err) } diff --git a/internal/x/dbx/dsn_mysql.go b/internal/x/dbx/dsn_mysql.go index 6ab8e4879..99e41bce0 100644 --- a/internal/x/dbx/dsn_mysql.go +++ b/internal/x/dbx/dsn_mysql.go @@ -13,7 +13,7 @@ import ( ) func RunMySQL(t testing.TB, testDB string) string { - url := dockertest.RunTestMySQL(t) + url := dockertest.RunTestMySQLWithVersion(t, "8.0") time.Sleep(1 * time.Second) if err := createDB(t, url, testDB); err != nil { t.Fatal(err) diff --git a/internal/x/dbx/dsn_postgres.go b/internal/x/dbx/dsn_postgres.go index e4a1df529..70560095b 100644 --- a/internal/x/dbx/dsn_postgres.go +++ b/internal/x/dbx/dsn_postgres.go @@ -12,7 +12,7 @@ import ( ) func RunPostgres(t testing.TB, testDB string) string { - url := dockertest.RunTestPostgreSQL(t) + url := dockertest.RunTestPostgreSQLWithVersion(t, "16") if err := createDB(t, url, testDB); err != nil { t.Fatal(err) } diff --git a/scripts/test-resetdb.sh b/scripts/test-resetdb.sh index 6c03c7f39..8cd99808d 100755 --- a/scripts/test-resetdb.sh +++ b/scripts/test-resetdb.sh @@ -6,9 +6,9 @@ docker rm -f test_keto_postgres || true docker rm -f test_keto_mysql || true docker rm -f test_keto_cockroach || true -postgres_port="$(docker port "$(docker run --name test_keto_postgres -e "POSTGRES_PASSWORD=secret" -e "POSTGRES_DB=postgres" -p 0.0.0.0:0:5432 -d postgres:11.8)" 5432 | sed 's/.*:\([0-9]*\)/\1/')" +postgres_port="$(docker port "$(docker run --name test_keto_postgres -e "POSTGRES_PASSWORD=secret" -e "POSTGRES_DB=postgres" -p 0.0.0.0:0:5432 -d postgres:16)" 5432 | sed 's/.*:\([0-9]*\)/\1/')" mysql_port="$(docker port "$(docker run --name test_keto_mysql -e "MYSQL_ROOT_PASSWORD=secret" -p 0.0.0.0:0:3306 -d mysql:8.0)" 3306 | sed 's/.*:\([0-9]*\)/\1/')" -cockroach_port="$(docker port "$(docker run --name test_keto_cockroach -p 0.0.0.0:0:26257 -d cockroachdb/cockroach:v20.2.4 start-single-node --insecure)" 26257 | sed 's/.*:\([0-9]*\)/\1/')" +cockroach_port="$(docker port "$(docker run --name test_keto_cockroach -p 0.0.0.0:0:26257 -d cockroachdb/cockroach:latest-v23.2 start-single-node --insecure)" 26257 | sed 's/.*:\([0-9]*\)/\1/')" TEST_DATABASE_POSTGRESQL=$(printf "postgres://postgres:secret@localhost:%s/postgres?sslmode=disable" "$postgres_port") TEST_DATABASE_MYSQL=$(printf "mysql://root:secret@(localhost:%s)/mysql?parseTime=true&multiStatements=true" "$mysql_port")