From 945ad89ff68edc86b55d520d6ee3d2c245731cfa Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Mon, 16 Oct 2023 20:39:07 +1100
Subject: [PATCH] Updated Docker containers.

---
 .docker/Dockerfile.cli           | 2 +-
 .docker/Dockerfile.cli.onlytheme | 2 +-
 .docker/Dockerfile.cli.sibling   | 2 +-
 .docker/Dockerfile.mariadb       | 2 +-
 .docker/Dockerfile.nginx-drupal  | 2 +-
 .docker/Dockerfile.php           | 2 +-
 docker-compose.yml               | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.docker/Dockerfile.cli b/.docker/Dockerfile.cli
index 956767d79..70267c964 100644
--- a/.docker/Dockerfile.cli
+++ b/.docker/Dockerfile.cli
@@ -9,7 +9,7 @@
 #
 # @see https://hub.docker.com/r/uselagoon/php-7.4-cli-drupal/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
-FROM uselagoon/php-8.1-cli-drupal:23.3.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/Dockerfile.cli.onlytheme b/.docker/Dockerfile.cli.onlytheme
index 8b3a9dd14..64617049f 100644
--- a/.docker/Dockerfile.cli.onlytheme
+++ b/.docker/Dockerfile.cli.onlytheme
@@ -8,7 +8,7 @@
 #
 # @see https://hub.docker.com/r/uselagoon/php-7.4-cli-drupal/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
-FROM uselagoon/php-8.1-cli-drupal:23.3.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/Dockerfile.cli.sibling b/.docker/Dockerfile.cli.sibling
index dd7f9e3ef..5bb6ca623 100644
--- a/.docker/Dockerfile.cli.sibling
+++ b/.docker/Dockerfile.cli.sibling
@@ -9,7 +9,7 @@
 #
 # @see https://hub.docker.com/r/uselagoon/php-7.4-cli-drupal/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
-FROM uselagoon/php-8.1-cli-drupal:23.3.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/Dockerfile.mariadb b/.docker/Dockerfile.mariadb
index 5795a3653..b0fdb54a3 100644
--- a/.docker/Dockerfile.mariadb
+++ b/.docker/Dockerfile.mariadb
@@ -8,7 +8,7 @@
 # @see https://github.com/drevops/mariadb-drupal-data
 ARG IMAGE
 
-FROM ${IMAGE:-uselagoon/mariadb-drupal:23.3.0}
+FROM ${IMAGE:-uselagoon/mariadb-drupal:23.10.0}
 
 USER root
 COPY ./.docker/config/mariadb/my.cnf /etc/my.cnf.d/server.cnf
diff --git a/.docker/Dockerfile.nginx-drupal b/.docker/Dockerfile.nginx-drupal
index 096719c02..9db86e9aa 100644
--- a/.docker/Dockerfile.nginx-drupal
+++ b/.docker/Dockerfile.nginx-drupal
@@ -6,7 +6,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.3.0
+FROM uselagoon/nginx-drupal:23.10.0
 
 COPY ./.docker/config/nginx/. /etc/nginx/conf.d/
 RUN fix-permissions /etc/nginx
diff --git a/.docker/Dockerfile.php b/.docker/Dockerfile.php
index 8bdb8cf84..867ea7113 100644
--- a/.docker/Dockerfile.php
+++ b/.docker/Dockerfile.php
@@ -7,6 +7,6 @@
 
 # @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.3.0
+FROM uselagoon/php-8.1-fpm:23.10.0
 
 COPY --from=cli /app /app
diff --git a/docker-compose.yml b/docker-compose.yml
index e5b7c3cc2..329b5fc0e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -127,7 +127,7 @@ services:
       context: .
       dockerfile: .docker/Dockerfile.mariadb
       args:
-        IMAGE: "${DREVOPS_DB_DOCKER_IMAGE:-uselagoon/mariadb-drupal:23.3.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.
     environment:
       <<: *default-environment
     ports:
@@ -149,7 +149,7 @@ services:
 
   # Helper container to wait for services to become available.
   wait_dependencies:
-    image: dadarek/wait-for-dependencies
+    image: drevops/docker-wait-for-dependencies:23.10.0
     depends_on:
       - cli
       - mariadb