Merge pull request #135 from rails/revert-134-disable_innodb_snapshot…

…_isolation Revert "Disable `innodb_snapshot_isolation` for MariaDB"
rails · Dec 11, 2024 · fbcfe20 · fbcfe20
2 parents d3feeae + 5a69454
commit fbcfe20
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -149,9 +149,6 @@ 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/mariadb-conf.d/mariadb.cnf b/mariadb-conf.d/mariadb.cnf
diff --git 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:latest" }
+          env: { MYSQL_IMAGE: "mariadb:lts" }
 
         rake "activerecord", task: "mysql2:test",
           service: "mysqldb",
@@ -119,7 +119,7 @@
           rake "activerecord", task: "trilogy:test",
             service: "mariadb",
             label: "[mariadb]",
-            env: { MYSQL_IMAGE: "mariadb:latest" }
+            env: { MYSQL_IMAGE: "mariadb:lts" }
 
           rake "activerecord", task: "trilogy:test",
             service: "mysqldb",