Switched to MySQL DB image.

.docker/config/database/my.cnf

@@ -0,0 +1 @@
+# Custom configuration for database clients.

.docker/database.dockerfile

@@ -1,20 +1,20 @@
 # Database container.
 #
-# @see https://hub.docker.com/r/uselagoon/mariadb-10.11-drupal/tags
-# @see https://github.com/uselagoon/lagoon-images/tree/main/images/mariadb-drupal
-#
-# Use drevops/mariadb-drupal-data as a starting container image for your
-# database-in-image database.
-# @see https://github.com/drevops/mariadb-drupal-data
+# @see https://hub.docker.com/r/uselagoon/mysql-8.4/tags
+# @see https://github.com/uselagoon/lagoon-images/tree/main/images/mysql
 #
 # The ARG value will be updated with a value passed from docker-compose.yml
-ARG IMAGE=uselagoon/mariadb-10.11-drupal:25.1.0
+ARG IMAGE=uselagoon/mysql-8.4:25.1.0
 
 # hadolint ignore=DL3006
 FROM ${IMAGE}
 
 USER root
-COPY ./.docker/config/mariadb/my.cnf /etc/my.cnf.d/server.cnf
+COPY ./.docker/config/database/my.cnf /etc/my.cnf.d/server.cnf
 RUN fix-permissions /etc/my.cnf.d/
 
+ENV MYSQL_DATABASE=drupal \
+    MYSQL_USER=drupal \
+    MYSQL_PASSWORD=drupal
+
 USER mysql

.vortex/tests/bats/_helper.bash

@@ -316,7 +316,7 @@ assert_files_present_vortex() {
   assert_file_exists ".docker/php.dockerfile"
   assert_file_exists ".docker/solr.dockerfile"
   assert_file_exists ".docker/scripts/.gitkeep"
-  assert_file_exists ".docker/config/mariadb/my.cnf"
+  assert_file_exists ".docker/config/database/my.cnf"
 
   assert_file_exists ".docker/config/solr/config-set/accents_en.txt"
   assert_file_exists ".docker/config/solr/config-set/accents_und.txt"

.vortex/tests/bats/fixtures/docker-compose.env.json

@@ -166,7 +166,7 @@
         "database": {
             "build": {
                 "args": {
-                    "IMAGE": "uselagoon/mariadb-10.11-drupal:VERSION"
+                    "IMAGE": "uselagoon/mysql-8.4:VERSION"
                 },
                 "context": "FIXTURE_CUR_DIR",
                 "dockerfile": ".docker/database.dockerfile"

.vortex/tests/bats/fixtures/docker-compose.env_local.json

@@ -166,7 +166,7 @@
         "database": {
             "build": {
                 "args": {
-                    "IMAGE": "uselagoon/mariadb-10.11-drupal:VERSION"
+                    "IMAGE": "uselagoon/mysql-8.4:VERSION"
                 },
                 "context": "FIXTURE_CUR_DIR",
                 "dockerfile": ".docker/database.dockerfile"

.vortex/tests/bats/fixtures/docker-compose.noenv.json

@@ -166,7 +166,7 @@
         "database": {
             "build": {
                 "args": {
-                    "IMAGE": "uselagoon/mariadb-10.11-drupal:VERSION"
+                    "IMAGE": "uselagoon/mysql-8.4:VERSION"
                 },
                 "context": "FIXTURE_CUR_DIR",
                 "dockerfile": ".docker/database.dockerfile"

docker-compose.yml

@@ -155,12 +155,12 @@ services:
       context: .
       dockerfile: .docker/database.dockerfile
       args:
-        IMAGE: "${VORTEX_DB_IMAGE:-uselagoon/mariadb-10.11-drupal:25.1.0}" # Use custom database image (if defined) or fallback to standard database image.
+        IMAGE: "${VORTEX_DB_IMAGE:-uselagoon/mysql-8.4:25.1.0}" # Use custom database image (if defined) or fallback to standard database image.
     <<: *default-user
     environment:
       <<: *default-environment
     ports:
-      - "3306" # MariaDB port in container. Find port on host with `ahoy info` or `docker compose port database 3306`.
+      - "3306" # Database port in a container. Find port on host with `ahoy info` or `docker compose port database 3306`.
     #;< LAGOON
     labels:
       lagoon.type: mariadb # See https://docs.lagoon.sh/using-lagoon-advanced/service-types/
@@ -187,7 +187,7 @@ services:
     depends_on:
       - cli
     ports:
-      - "8983" # Solr port in container. Find port on host with `ahoy info` or `docker compose port solr 8983`.
+      - "8983" # Solr port in a container. Find port on host with `ahoy info` or `docker compose port solr 8983`.
     volumes:
       - solr:/var/solr
     #;< LAGOON