Updated images to be compatible with Apple chip.

.ahoy.yml

@@ -68,7 +68,7 @@ commands:
 
   pull:
     usage: Pull latest docker images.
-    cmd: if [ ! -z "$(docker image ls -q)" ]; then docker image ls --format \"{{.Repository}}:{{.Tag}}\" | grep amazeeio/ | grep -v none | xargs -n1 docker pull -q | cat; fi
+    cmd: if [ ! -z "$(docker image ls -q)" ]; then docker image ls --format \"{{.Repository}}:{{.Tag}}\" | grep uselagoon/ | grep -v none | xargs -n1 docker pull -q | cat; fi
 
   cli:
     usage: Start a shell or run a command inside the CLI service container.

.docker/Dockerfile.cli

@@ -2,9 +2,9 @@
 #
 # All CLI operations performed in this container.
 #
-# @see https://hub.docker.com/r/amazeeio/php/tags?page=1&name=cli-drupal
+# @see https://hub.docker.com/r/uselagoon/php/tags?page=1&name=cli-drupal
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php/cli-drupal
-FROM amazeeio/php:7.4-cli-drupal-21.7.0
+FROM uselagoon/php-7.4-cli-drupal:21.11.0
 
 # Set default values for environment variables. Any values provided in
 # docker-compose.yml or .env file will override these values during build stage.

.docker/Dockerfile.mariadb

@@ -1,14 +1,14 @@
 # MariaDB container.
 #
-# @see https://hub.docker.com/r/amazeeio/mariadb-drupal/tags?page=1
+# @see https://hub.docker.com/r/uselagoon/mariadb-drupal/tags?page=1
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/mariadb-drupal
 #
 # Use drevops/drevops-mariadb-drupal-data as a starting Docker image for your
 # Database-in-Docker-image database.
 # @see https://github.com/drevops/mariadb-drupal-data
 ARG IMAGE
 
-FROM ${IMAGE:-amazeeio/mariadb-drupal:21.7.0}
+FROM ${IMAGE:-uselagoon/mariadb-drupal:21.11.0}
 
 USER root
 COPY ./.docker/config/mariadb/my.cnf /etc/my.cnf.d/server.cnf

.docker/Dockerfile.nginx-drupal

@@ -4,9 +4,9 @@
 ARG CLI_IMAGE
 FROM ${CLI_IMAGE:-cli} as cli
 
-# @see https://hub.docker.com/r/amazeeio/nginx-drupal/tags?page=1
+# @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 amazeeio/nginx-drupal:21.7.0
+FROM uselagoon/nginx-drupal:21.11.0
 
 ENV WEBROOT=docroot
 

.docker/Dockerfile.php

@@ -5,8 +5,8 @@
 ARG CLI_IMAGE
 FROM ${CLI_IMAGE:-cli} as cli
 
-# @see https://hub.docker.com/r/amazeeio/php/tags?page=1&name=fpm
+# @see https://hub.docker.com/r/uselagoon/php/tags?page=1&name=fpm
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php/fpm
-FROM amazeeio/php:7.4-fpm-21.7.0
+FROM uselagoon/php-7.4-fpm:21.11.0
 
 COPY --from=cli /app /app

.docker/Dockerfile.solr

@@ -2,9 +2,9 @@
 ARG CLI_IMAGE
 FROM ${CLI_IMAGE} as cli
 
-# @see https://hub.docker.com/r/amazeeio/solr/tags?page=1&name=drupal
+# @see https://hub.docker.com/r/uselagoon/solr/tags?page=1&name=drupal
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/solr-drupal
-FROM amazeeio/solr:6.6-drupal-21.7.0
+FROM uselagoon/solr-7.7-drupal:21.11.0
 
 # Uncomment below after installing search_api_solr Drupal module (it must exist
 # in the codebase).

docker-compose.yml

@@ -173,7 +173,7 @@ services:
       context: .
       dockerfile: .docker/Dockerfile.mariadb
       args:
-        IMAGE: "${DATABASE_IMAGE:-amazeeio/mariadb-drupal:21.7.0}"
+        IMAGE: "${DATABASE_IMAGE:-uselagoon/mariadb-drupal:21.11.0}"
     environment:
       <<: *default-environment
     ports:
@@ -189,7 +189,7 @@ services:
   # Redis container.
   # Used for caching.
   redis:
-    image: amazeeio/redis:6-21.7.0
+    image: uselagoon/redis-6:21.11.0
     # https://lagoon.readthedocs.io/en/latest/using_lagoon/service_types/#service-types
     labels:
       lagoon.type: redis

scripts/drevops/drupal-install-site.sh

@@ -190,7 +190,7 @@ fi
 # "drupal-install-site-" prefix and ".sh" extension.
 if [ -d "${APP}/scripts/custom" ]; then
   for file in "${APP}"/scripts/custom/drupal-install-site-*.sh; do
-    if [ -r "${file}" ]; then
+    if [ -f "${file}" ]; then
       . "${file}"
     fi
   done