Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
1 change: 1 addition & 0 deletions lib/buildkite/config/docker_build.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
],
Expand Down
1 change: 1 addition & 0 deletions lib/buildkite/config/rake_command.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
],
Expand Down
2 changes: 2 additions & 0 deletions mariadb-conf.d/mariadb.cnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[mariadb]
loose_innodb_snapshot_isolation = off
1 change: 1 addition & 0 deletions pipelines/docs-preview/initial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions pipelines/rails-ci-nightly/initial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions pipelines/rails-ci/initial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pipelines/rails-ci/pipeline.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions test/buildkite_config/test_docker_build.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 2 additions & 0 deletions test/buildkite_config/test_rake_command.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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"]
Expand Down