Merge branch 'hotfix/1.17.2'

drevops · Oct 13, 2023 · dcd75a1 · dcd75a1
2 parents bb3c8f6 + ec9cbbb
commit dcd75a1
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/.docker/cli.dockerfile b/.docker/cli.dockerfile
@@ -4,7 +4,7 @@
 #
 # @see https://hub.docker.com/r/uselagoon/php-8.1-cli-drupal/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
-FROM uselagoon/php-8.1-cli-drupal:23.9.0
+FROM uselagoon/php-8.1-cli-drupal:23.10.0
 
 # Add missing variables.
 # @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.

diff --git a/.docker/mariadb.dockerfile b/.docker/mariadb.dockerfile
@@ -8,7 +8,7 @@
 # @see https://github.com/drevops/mariadb-drupal-data
 #
 # The ARG value will be updated with a value passed from docker-compose.yml
-ARG IMAGE=uselagoon/mariadb-drupal:23.9.0
+ARG IMAGE=uselagoon/mariadb-drupal:23.10.0
 
 # hadolint ignore=DL3006
 FROM ${IMAGE}

diff --git a/.docker/nginx-drupal.dockerfile b/.docker/nginx-drupal.dockerfile
@@ -7,7 +7,7 @@ FROM ${CLI_IMAGE:-cli} as cli
 
 # @see https://hub.docker.com/r/uselagoon/nginx-drupal/tags?page=1
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/nginx-drupal
-FROM uselagoon/nginx-drupal:23.9.0
+FROM uselagoon/nginx-drupal:23.10.0
 
 # Webroot is used for Nginx docroot configuration.
 ARG WEBROOT=web

diff --git a/.docker/php.dockerfile b/.docker/php.dockerfile
@@ -8,7 +8,7 @@ FROM ${CLI_IMAGE:-cli} as cli
 
 # @see https://hub.docker.com/r/uselagoon/php-7.4-fpm/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-fpm
-FROM uselagoon/php-8.1-fpm:23.9.0
+FROM uselagoon/php-8.1-fpm:23.10.0
 
 RUN apk add --no-cache tzdata=2023c-r1
 

diff --git a/.docker/solr.dockerfile b/.docker/solr.dockerfile
@@ -5,7 +5,7 @@ FROM ${CLI_IMAGE} as cli
 
 # @see https://hub.docker.com/r/uselagoon/solr/tags?page=1&name=drupal
 # @see https://github.com/uselagoon/lagoon-images/blob/main/images/solr-drupal/7.Dockerfile
-FROM uselagoon/solr-7-drupal:23.9.0
+FROM uselagoon/solr-7-drupal:23.10.0
 
 # Based off search_api_solr/solr-conf-templates/7.x as a sane default.
 # @see https://git.drupalcode.org/project/search_api_solr/-/tree/4.x/solr-conf-templates/7.x

diff --git a/.drevops/tests/bats/fixtures/docker-compose.env.json b/.drevops/tests/bats/fixtures/docker-compose.env.json
@@ -160,7 +160,7 @@
         "mariadb": {
             "build": {
                 "args": {
-                    "IMAGE": "uselagoon/mariadb-drupal:23.9.0"
+                    "IMAGE": "uselagoon/mariadb-drupal:23.10.0"
                 },
                 "context": "FIXTURE_CUR_DIR",
                 "dockerfile": ".docker/mariadb.dockerfile"
@@ -320,7 +320,7 @@
         "redis": {
             "command": null,
             "entrypoint": null,
-            "image": "uselagoon/redis-6:23.9.0",
+            "image": "uselagoon/redis-6:23.10.0",
             "labels": {
                 "lagoon.type": "redis"
             },

diff --git a/.drevops/tests/bats/fixtures/docker-compose.env_mod.json b/.drevops/tests/bats/fixtures/docker-compose.env_mod.json
@@ -320,7 +320,7 @@
         "redis": {
             "command": null,
             "entrypoint": null,
-            "image": "uselagoon/redis-6:23.9.0",
+            "image": "uselagoon/redis-6:23.10.0",
             "labels": {
                 "lagoon.type": "redis"
             },

diff --git a/.drevops/tests/bats/fixtures/docker-compose.noenv.json b/.drevops/tests/bats/fixtures/docker-compose.noenv.json
@@ -160,7 +160,7 @@
         "mariadb": {
             "build": {
                 "args": {
-                    "IMAGE": "uselagoon/mariadb-drupal:23.9.0"
+                    "IMAGE": "uselagoon/mariadb-drupal:23.10.0"
                 },
                 "context": "FIXTURE_CUR_DIR",
                 "dockerfile": ".docker/mariadb.dockerfile"
@@ -320,7 +320,7 @@
         "redis": {
             "command": null,
             "entrypoint": null,
-            "image": "uselagoon/redis-6:23.9.0",
+            "image": "uselagoon/redis-6:23.10.0",
             "labels": {
                 "lagoon.type": "redis"
             },

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -151,7 +151,7 @@ services:
       context: .
       dockerfile: .docker/mariadb.dockerfile
       args:
-        IMAGE: "${DREVOPS_DB_DOCKER_IMAGE:-uselagoon/mariadb-drupal:23.9.0}" # Use custom database image (if defined) or fallback to standard database image.
+        IMAGE: "${DREVOPS_DB_DOCKER_IMAGE:-uselagoon/mariadb-drupal:23.10.0}" # Use custom database image (if defined) or fallback to standard database image.
     <<: *default-user
     environment:
       <<: *default-environment
@@ -164,7 +164,7 @@ services:
 
   #;< REDIS
   redis:
-    image: uselagoon/redis-6:23.9.0
+    image: uselagoon/redis-6:23.10.0
     #;< LAGOON
     labels:
       lagoon.type: redis # Change to 'none' if dedicated Redis service is used. See https://docs.lagoon.sh/using-lagoon-advanced/service-types/