From 33a59ee7fafd786207b57fdc1e8605bb87643afd Mon Sep 17 00:00:00 2001 From: zzak Date: Wed, 16 Apr 2025 14:02:21 +0900 Subject: [PATCH] Try mariadb:latest --- docker-compose.yml | 3 +++ lib/buildkite/config/docker_build.rb | 1 + lib/buildkite/config/rake_command.rb | 1 + mariadb-conf.d/mariadb.cnf | 2 ++ pipelines/docs-preview/initial.yml | 1 + pipelines/rails-ci-nightly/initial.yml | 1 + pipelines/rails-ci/initial.yml | 1 + pipelines/rails-ci/pipeline.rb | 4 ++-- test/buildkite_config/test_docker_build.rb | 1 + test/buildkite_config/test_rake_command.rb | 2 ++ 10 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 mariadb-conf.d/mariadb.cnf diff --git a/docker-compose.yml b/docker-compose.yml index 43e9c0e9..fae09764 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -149,6 +149,9 @@ services: test: healthcheck.sh --su-mysql --connect --innodb_initialized interval: 1s retries: 60 + volumes: + - "./mysql-initdb.d:/docker-entrypoint-initdb.d" + - "./mariadb-conf.d/mariadb.cnf:/etc/mysql/conf.d/mariadb.cnf" postgres: image: "${POSTGRES_IMAGE-postgres:alpine}" diff --git a/lib/buildkite/config/docker_build.rb b/lib/buildkite/config/docker_build.rb index b43f6301..69b9724f 100644 --- a/lib/buildkite/config/docker_build.rb +++ b/lib/buildkite/config/docker_build.rb @@ -60,6 +60,7 @@ def builder(ruby) .buildkite/docker-compose.yml .buildkite/Dockerfile .buildkite/Dockerfile.beanstalkd + .buildkite/mariadb-conf.d .buildkite/mysql-initdb.d .buildkite/runner ], diff --git a/lib/buildkite/config/rake_command.rb b/lib/buildkite/config/rake_command.rb index 7c78a9f8..25e204e6 100644 --- a/lib/buildkite/config/rake_command.rb +++ b/lib/buildkite/config/rake_command.rb @@ -43,6 +43,7 @@ def install_plugins(service = "default", env = nil, dir = ".") .buildkite/docker-compose.yml .buildkite/Dockerfile .buildkite/Dockerfile.beanstalkd + .buildkite/mariadb-conf.d .buildkite/mysql-initdb.d .buildkite/runner ], diff --git a/mariadb-conf.d/mariadb.cnf b/mariadb-conf.d/mariadb.cnf new file mode 100644 index 00000000..72259c7b --- /dev/null +++ b/mariadb-conf.d/mariadb.cnf @@ -0,0 +1,2 @@ +[mariadb] +loose_innodb_snapshot_isolation = off diff --git a/pipelines/docs-preview/initial.yml b/pipelines/docs-preview/initial.yml index fc7b702c..2482fca6 100644 --- a/pipelines/docs-preview/initial.yml +++ b/pipelines/docs-preview/initial.yml @@ -40,6 +40,7 @@ steps: - .buildkite/docker-compose.yml - .buildkite/Dockerfile - .buildkite/Dockerfile.beanstalkd + - .buildkite/mariadb-conf.d - .buildkite/mysql-initdb.d - .buildkite/runner compressed: ".buildkite.tgz" diff --git a/pipelines/rails-ci-nightly/initial.yml b/pipelines/rails-ci-nightly/initial.yml index 4e585930..7974c5c5 100644 --- a/pipelines/rails-ci-nightly/initial.yml +++ b/pipelines/rails-ci-nightly/initial.yml @@ -39,6 +39,7 @@ steps: - .buildkite/docker-compose.yml - .buildkite/Dockerfile - .buildkite/Dockerfile.beanstalkd + - .buildkite/mariadb-conf.d - .buildkite/mysql-initdb.d - .buildkite/runner compressed: ".buildkite.tgz" diff --git a/pipelines/rails-ci/initial.yml b/pipelines/rails-ci/initial.yml index 299245db..3264747c 100644 --- a/pipelines/rails-ci/initial.yml +++ b/pipelines/rails-ci/initial.yml @@ -50,6 +50,7 @@ steps: - .buildkite/docker-compose.yml - .buildkite/Dockerfile - .buildkite/Dockerfile.beanstalkd + - .buildkite/mariadb-conf.d - .buildkite/mysql-initdb.d - .buildkite/runner compressed: ".buildkite.tgz" diff --git a/pipelines/rails-ci/pipeline.rb b/pipelines/rails-ci/pipeline.rb index f740dcbb..69f5685b 100644 --- a/pipelines/rails-ci/pipeline.rb +++ b/pipelines/rails-ci/pipeline.rb @@ -90,7 +90,7 @@ rake "activerecord", task: "mysql2:test", service: "mariadb", label: "[mariadb]", - env: { MYSQL_IMAGE: "mariadb:lts" } + env: { MYSQL_IMAGE: "mariadb:latest" } rake "activerecord", task: "mysql2:test", service: "mysqldb", @@ -119,7 +119,7 @@ rake "activerecord", task: "trilogy:test", service: "mariadb", label: "[mariadb]", - env: { MYSQL_IMAGE: "mariadb:lts" } + env: { MYSQL_IMAGE: "mariadb:latest" } rake "activerecord", task: "trilogy:test", service: "mysqldb", diff --git a/test/buildkite_config/test_docker_build.rb b/test/buildkite_config/test_docker_build.rb index e97dde3c..1efdda42 100644 --- a/test/buildkite_config/test_docker_build.rb +++ b/test/buildkite_config/test_docker_build.rb @@ -45,6 +45,7 @@ def test_builder_artifacts .buildkite/docker-compose.yml .buildkite/Dockerfile .buildkite/Dockerfile.beanstalkd + .buildkite/mariadb-conf.d .buildkite/mysql-initdb.d .buildkite/runner ], download["download"] diff --git a/test/buildkite_config/test_rake_command.rb b/test/buildkite_config/test_rake_command.rb index 77924533..c6ff76dc 100644 --- a/test/buildkite_config/test_rake_command.rb +++ b/test/buildkite_config/test_rake_command.rb @@ -185,6 +185,7 @@ def test_artifacts .buildkite/docker-compose.yml .buildkite/Dockerfile .buildkite/Dockerfile.beanstalkd + .buildkite/mariadb-conf.d .buildkite/mysql-initdb.d .buildkite/runner ], download["download"] @@ -444,6 +445,7 @@ def test_bundle_command .buildkite/docker-compose.yml .buildkite/Dockerfile .buildkite/Dockerfile.beanstalkd + .buildkite/mariadb-conf.d .buildkite/mysql-initdb.d .buildkite/runner ], artifacts["artifacts#v1.0"]["download"]