From 50333888f4a37f3053384134ba61183cbb5c1fb5 Mon Sep 17 00:00:00 2001
From: Alan Dixon <alan.g.dixon@gmail.com>
Date: Sat, 21 Jun 2025 15:41:52 +0000
Subject: [PATCH 1/9] add restic to admin image

---
 build/drupal/10.3/php8.2/apache-bullseye/Simuliidae | 2 +-
 build/drupal/10.3/php8.3/apache-bullseye/Simuliidae | 2 +-
 build/drupal/10.4/php8.3/apache-bullseye/Simuliidae | 2 +-
 build/drupal/11.0/php8.3/apache-bookworm/Simuliidae | 2 +-
 build/drupal/11.1/php8.3/apache-bookworm/Simuliidae | 2 +-
 build/drupal/7/php7.4/apache-bullseye/Simuliidae    | 2 +-
 build/drupal/7/php8.1/apache-bullseye/Simuliidae    | 2 +-
 build/drupal/7/php8.2/apache-bullseye/Simuliidae    | 2 +-
 build/drupal/Simuliidae.template                    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/drupal/10.3/php8.2/apache-bullseye/Simuliidae b/build/drupal/10.3/php8.2/apache-bullseye/Simuliidae
index e5e7c95..37cfc4b 100644
--- a/build/drupal/10.3/php8.2/apache-bullseye/Simuliidae
+++ b/build/drupal/10.3/php8.2/apache-bullseye/Simuliidae
@@ -59,7 +59,7 @@ CMD ["apache2-foreground"]
 # We'll first build admin-minimal that we'll use later as a base for admin-build
 FROM vhttp-base as admin-minimal
 RUN apt-get update \
-  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server \
+  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
   sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/g' /etc/ssh/sshd_config && \
   sed -i 's/#LogLevel INFO/LogLevel DEBUG/g' /etc/ssh/sshd_config
diff --git a/build/drupal/10.3/php8.3/apache-bullseye/Simuliidae b/build/drupal/10.3/php8.3/apache-bullseye/Simuliidae
index e5e7c95..37cfc4b 100644
--- a/build/drupal/10.3/php8.3/apache-bullseye/Simuliidae
+++ b/build/drupal/10.3/php8.3/apache-bullseye/Simuliidae
@@ -59,7 +59,7 @@ CMD ["apache2-foreground"]
 # We'll first build admin-minimal that we'll use later as a base for admin-build
 FROM vhttp-base as admin-minimal
 RUN apt-get update \
-  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server \
+  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
   sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/g' /etc/ssh/sshd_config && \
   sed -i 's/#LogLevel INFO/LogLevel DEBUG/g' /etc/ssh/sshd_config
diff --git a/build/drupal/10.4/php8.3/apache-bullseye/Simuliidae b/build/drupal/10.4/php8.3/apache-bullseye/Simuliidae
index bc141c2..76bdfc5 100644
--- a/build/drupal/10.4/php8.3/apache-bullseye/Simuliidae
+++ b/build/drupal/10.4/php8.3/apache-bullseye/Simuliidae
@@ -59,7 +59,7 @@ CMD ["apache2-foreground"]
 # We'll first build admin-minimal that we'll use later as a base for admin-build
 FROM vhttp-base as admin-minimal
 RUN apt-get update \
-  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server \
+  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
   sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/g' /etc/ssh/sshd_config && \
   sed -i 's/#LogLevel INFO/LogLevel DEBUG/g' /etc/ssh/sshd_config
diff --git a/build/drupal/11.0/php8.3/apache-bookworm/Simuliidae b/build/drupal/11.0/php8.3/apache-bookworm/Simuliidae
index 19ca401..ec5d7aa 100644
--- a/build/drupal/11.0/php8.3/apache-bookworm/Simuliidae
+++ b/build/drupal/11.0/php8.3/apache-bookworm/Simuliidae
@@ -59,7 +59,7 @@ CMD ["apache2-foreground"]
 # We'll first build admin-minimal that we'll use later as a base for admin-build
 FROM vhttp-base as admin-minimal
 RUN apt-get update \
-  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server \
+  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
   sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/g' /etc/ssh/sshd_config && \
   sed -i 's/#LogLevel INFO/LogLevel DEBUG/g' /etc/ssh/sshd_config
diff --git a/build/drupal/11.1/php8.3/apache-bookworm/Simuliidae b/build/drupal/11.1/php8.3/apache-bookworm/Simuliidae
index 029e97c..337563a 100644
--- a/build/drupal/11.1/php8.3/apache-bookworm/Simuliidae
+++ b/build/drupal/11.1/php8.3/apache-bookworm/Simuliidae
@@ -59,7 +59,7 @@ CMD ["apache2-foreground"]
 # We'll first build admin-minimal that we'll use later as a base for admin-build
 FROM vhttp-base as admin-minimal
 RUN apt-get update \
-  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server \
+  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
   sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/g' /etc/ssh/sshd_config && \
   sed -i 's/#LogLevel INFO/LogLevel DEBUG/g' /etc/ssh/sshd_config
diff --git a/build/drupal/7/php7.4/apache-bullseye/Simuliidae b/build/drupal/7/php7.4/apache-bullseye/Simuliidae
index 843506b..7cc838f 100644
--- a/build/drupal/7/php7.4/apache-bullseye/Simuliidae
+++ b/build/drupal/7/php7.4/apache-bullseye/Simuliidae
@@ -53,7 +53,7 @@ CMD ["apache2-foreground"]
 # We'll first build admin-minimal that we'll use later as a base for admin-build
 FROM vhttp-base as admin-minimal
 RUN apt-get update \
-  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server \
+  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
   sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/g' /etc/ssh/sshd_config && \
   sed -i 's/#LogLevel INFO/LogLevel DEBUG/g' /etc/ssh/sshd_config
diff --git a/build/drupal/7/php8.1/apache-bullseye/Simuliidae b/build/drupal/7/php8.1/apache-bullseye/Simuliidae
index 3045459..019ca0e 100644
--- a/build/drupal/7/php8.1/apache-bullseye/Simuliidae
+++ b/build/drupal/7/php8.1/apache-bullseye/Simuliidae
@@ -53,7 +53,7 @@ CMD ["apache2-foreground"]
 # We'll first build admin-minimal that we'll use later as a base for admin-build
 FROM vhttp-base as admin-minimal
 RUN apt-get update \
-  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server \
+  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
   sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/g' /etc/ssh/sshd_config && \
   sed -i 's/#LogLevel INFO/LogLevel DEBUG/g' /etc/ssh/sshd_config
diff --git a/build/drupal/7/php8.2/apache-bullseye/Simuliidae b/build/drupal/7/php8.2/apache-bullseye/Simuliidae
index 3045459..019ca0e 100644
--- a/build/drupal/7/php8.2/apache-bullseye/Simuliidae
+++ b/build/drupal/7/php8.2/apache-bullseye/Simuliidae
@@ -53,7 +53,7 @@ CMD ["apache2-foreground"]
 # We'll first build admin-minimal that we'll use later as a base for admin-build
 FROM vhttp-base as admin-minimal
 RUN apt-get update \
-  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server \
+  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
   sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/g' /etc/ssh/sshd_config && \
   sed -i 's/#LogLevel INFO/LogLevel DEBUG/g' /etc/ssh/sshd_config
diff --git a/build/drupal/Simuliidae.template b/build/drupal/Simuliidae.template
index 5818965..5ac05d8 100644
--- a/build/drupal/Simuliidae.template
+++ b/build/drupal/Simuliidae.template
@@ -58,7 +58,7 @@ CMD ["apache2-foreground"]
 # We'll first build admin-minimal that we'll use later as a base for admin-build
 FROM vhttp-base as admin-minimal
 RUN apt-get update \
-  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server \
+  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
   sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/g' /etc/ssh/sshd_config && \
   sed -i 's/#LogLevel INFO/LogLevel DEBUG/g' /etc/ssh/sshd_config

From bd22cf1c4a4472f5223bb6b6433d214f6c386a65 Mon Sep 17 00:00:00 2001
From: Alan Dixon <alan.g.dixon@gmail.com>
Date: Sat, 21 Jun 2025 15:44:29 +0000
Subject: [PATCH 2/9] resolve FromAsCasing issue

---
 .../10.3/php8.2/apache-bullseye/Simuliidae     | 18 +++++++++---------
 .../10.3/php8.3/apache-bullseye/Simuliidae     | 18 +++++++++---------
 .../10.4/php8.3/apache-bullseye/Simuliidae     | 18 +++++++++---------
 .../11.0/php8.3/apache-bookworm/Simuliidae     | 18 +++++++++---------
 .../11.1/php8.3/apache-bookworm/Simuliidae     | 18 +++++++++---------
 .../drupal/7/php7.4/apache-bullseye/Simuliidae | 18 +++++++++---------
 .../drupal/7/php8.1/apache-bullseye/Simuliidae | 18 +++++++++---------
 .../drupal/7/php8.2/apache-bullseye/Simuliidae | 18 +++++++++---------
 build/drupal/Simuliidae.template               | 18 +++++++++---------
 9 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/build/drupal/10.3/php8.2/apache-bullseye/Simuliidae b/build/drupal/10.3/php8.2/apache-bullseye/Simuliidae
index 37cfc4b..bdb8e47 100644
--- a/build/drupal/10.3/php8.2/apache-bullseye/Simuliidae
+++ b/build/drupal/10.3/php8.2/apache-bullseye/Simuliidae
@@ -14,7 +14,7 @@ ARG REPOSITORY_FROM=
 # Requires the VARIANT_TAG argument, which may be either the base or non-base version [??]
 ARG VARIANT_TAG=
 # Step 1. build the basic web service, a slightly extended version of the corresonding drupal modified base image.
-FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} as vhttp-base
+FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} AS vhttp-base
 # We create a drupal user to own all the code, using Dries birth year as the uid
 RUN useradd -u 1978 -g www-data -ms /bin/bash drupal
 # change the document root as per https://hub.docker.com/_/php/
@@ -57,7 +57,7 @@ CMD ["apache2-foreground"]
 # Step 2: build a basic admin service, adding some bits to the vhttp-base
 # Admin runs sshd as it's CMD by default, but can be used to, e.g. do automated setup.
 # We'll first build admin-minimal that we'll use later as a base for admin-build
-FROM vhttp-base as admin-minimal
+FROM vhttp-base AS admin-minimal
 RUN apt-get update \
   && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
@@ -87,7 +87,7 @@ CMD ["/entrypoint-sshd.sh"]
 # setup.sh runs the drupal and civicrm setup scripts and handles some ownership/permissions
 COPY setup.sh /setup.sh
 RUN chmod 775 /setup.sh
-FROM admin-minimal as admin-base
+FROM admin-minimal AS admin-base
 # add composer, uses (default) version 2
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 # add additional dependencies for installing civicrm with D9 + composer
@@ -99,7 +99,7 @@ RUN apt-get update && apt-get install -y ca-certificates curl gnupg && \
   apt-get purge -y && apt-get clean
 RUN npm install -g bower
 # Step 3: from the admin-base, add the CMS code, and then copy it over to the vhttp-base as the vhttp-cms
-FROM admin-base as admin-build-cms
+FROM admin-base AS admin-build-cms
 # https://www.drupal.org/node/3060/release
 ENV DRUPAL_VERSION 10.3.14
 USER drupal:www-data
@@ -112,7 +112,7 @@ RUN echo "Building with Drupal version $DRUPAL_VERSION"
 RUN composer require --no-update drupal/core:${DRUPAL_VERSION} --update-with-all-dependencies
 RUN composer update 
 #	chown -R drupal:www-data web/sites web/modules web/themes; 
-FROM admin-build-cms as admin-build-crm
+FROM admin-build-cms AS admin-build-crm
 ENV CIVICRM_VERSION 6.0.2
 RUN set -eux; \
   composer config extra.enable-patching true; \
@@ -126,11 +126,11 @@ RUN \
   composer config --no-plugins allow-plugins.civicrm/composer-downloads-plugin true; \
   composer config --no-plugins allow-plugins.civicrm/composer-compile-plugin true; \
   composer update;
-FROM vhttp-base as vhttp-cms
+FROM vhttp-base AS vhttp-cms
 COPY --from=admin-build-cms /var/www/drupal .
-FROM vhttp-base as vhttp-crm
+FROM vhttp-base AS vhttp-crm
 COPY --from=admin-build-crm /var/www/drupal .
-FROM admin-minimal as admin-cms
+FROM admin-minimal AS admin-cms
 COPY --from=admin-build-cms /var/www/drupal .
-FROM admin-minimal as admin-crm
+FROM admin-minimal AS admin-crm
 COPY --from=admin-build-crm /var/www/drupal .
diff --git a/build/drupal/10.3/php8.3/apache-bullseye/Simuliidae b/build/drupal/10.3/php8.3/apache-bullseye/Simuliidae
index 37cfc4b..bdb8e47 100644
--- a/build/drupal/10.3/php8.3/apache-bullseye/Simuliidae
+++ b/build/drupal/10.3/php8.3/apache-bullseye/Simuliidae
@@ -14,7 +14,7 @@ ARG REPOSITORY_FROM=
 # Requires the VARIANT_TAG argument, which may be either the base or non-base version [??]
 ARG VARIANT_TAG=
 # Step 1. build the basic web service, a slightly extended version of the corresonding drupal modified base image.
-FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} as vhttp-base
+FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} AS vhttp-base
 # We create a drupal user to own all the code, using Dries birth year as the uid
 RUN useradd -u 1978 -g www-data -ms /bin/bash drupal
 # change the document root as per https://hub.docker.com/_/php/
@@ -57,7 +57,7 @@ CMD ["apache2-foreground"]
 # Step 2: build a basic admin service, adding some bits to the vhttp-base
 # Admin runs sshd as it's CMD by default, but can be used to, e.g. do automated setup.
 # We'll first build admin-minimal that we'll use later as a base for admin-build
-FROM vhttp-base as admin-minimal
+FROM vhttp-base AS admin-minimal
 RUN apt-get update \
   && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
@@ -87,7 +87,7 @@ CMD ["/entrypoint-sshd.sh"]
 # setup.sh runs the drupal and civicrm setup scripts and handles some ownership/permissions
 COPY setup.sh /setup.sh
 RUN chmod 775 /setup.sh
-FROM admin-minimal as admin-base
+FROM admin-minimal AS admin-base
 # add composer, uses (default) version 2
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 # add additional dependencies for installing civicrm with D9 + composer
@@ -99,7 +99,7 @@ RUN apt-get update && apt-get install -y ca-certificates curl gnupg && \
   apt-get purge -y && apt-get clean
 RUN npm install -g bower
 # Step 3: from the admin-base, add the CMS code, and then copy it over to the vhttp-base as the vhttp-cms
-FROM admin-base as admin-build-cms
+FROM admin-base AS admin-build-cms
 # https://www.drupal.org/node/3060/release
 ENV DRUPAL_VERSION 10.3.14
 USER drupal:www-data
@@ -112,7 +112,7 @@ RUN echo "Building with Drupal version $DRUPAL_VERSION"
 RUN composer require --no-update drupal/core:${DRUPAL_VERSION} --update-with-all-dependencies
 RUN composer update 
 #	chown -R drupal:www-data web/sites web/modules web/themes; 
-FROM admin-build-cms as admin-build-crm
+FROM admin-build-cms AS admin-build-crm
 ENV CIVICRM_VERSION 6.0.2
 RUN set -eux; \
   composer config extra.enable-patching true; \
@@ -126,11 +126,11 @@ RUN \
   composer config --no-plugins allow-plugins.civicrm/composer-downloads-plugin true; \
   composer config --no-plugins allow-plugins.civicrm/composer-compile-plugin true; \
   composer update;
-FROM vhttp-base as vhttp-cms
+FROM vhttp-base AS vhttp-cms
 COPY --from=admin-build-cms /var/www/drupal .
-FROM vhttp-base as vhttp-crm
+FROM vhttp-base AS vhttp-crm
 COPY --from=admin-build-crm /var/www/drupal .
-FROM admin-minimal as admin-cms
+FROM admin-minimal AS admin-cms
 COPY --from=admin-build-cms /var/www/drupal .
-FROM admin-minimal as admin-crm
+FROM admin-minimal AS admin-crm
 COPY --from=admin-build-crm /var/www/drupal .
diff --git a/build/drupal/10.4/php8.3/apache-bullseye/Simuliidae b/build/drupal/10.4/php8.3/apache-bullseye/Simuliidae
index 76bdfc5..8b4c982 100644
--- a/build/drupal/10.4/php8.3/apache-bullseye/Simuliidae
+++ b/build/drupal/10.4/php8.3/apache-bullseye/Simuliidae
@@ -14,7 +14,7 @@ ARG REPOSITORY_FROM=
 # Requires the VARIANT_TAG argument, which may be either the base or non-base version [??]
 ARG VARIANT_TAG=
 # Step 1. build the basic web service, a slightly extended version of the corresonding drupal modified base image.
-FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} as vhttp-base
+FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} AS vhttp-base
 # We create a drupal user to own all the code, using Dries birth year as the uid
 RUN useradd -u 1978 -g www-data -ms /bin/bash drupal
 # change the document root as per https://hub.docker.com/_/php/
@@ -57,7 +57,7 @@ CMD ["apache2-foreground"]
 # Step 2: build a basic admin service, adding some bits to the vhttp-base
 # Admin runs sshd as it's CMD by default, but can be used to, e.g. do automated setup.
 # We'll first build admin-minimal that we'll use later as a base for admin-build
-FROM vhttp-base as admin-minimal
+FROM vhttp-base AS admin-minimal
 RUN apt-get update \
   && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
@@ -87,7 +87,7 @@ CMD ["/entrypoint-sshd.sh"]
 # setup.sh runs the drupal and civicrm setup scripts and handles some ownership/permissions
 COPY setup.sh /setup.sh
 RUN chmod 775 /setup.sh
-FROM admin-minimal as admin-base
+FROM admin-minimal AS admin-base
 # add composer, uses (default) version 2
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 # add additional dependencies for installing civicrm with D9 + composer
@@ -99,7 +99,7 @@ RUN apt-get update && apt-get install -y ca-certificates curl gnupg && \
   apt-get purge -y && apt-get clean
 RUN npm install -g bower
 # Step 3: from the admin-base, add the CMS code, and then copy it over to the vhttp-base as the vhttp-cms
-FROM admin-base as admin-build-cms
+FROM admin-base AS admin-build-cms
 # https://www.drupal.org/node/3060/release
 ENV DRUPAL_VERSION 10.4.5
 USER drupal:www-data
@@ -112,7 +112,7 @@ RUN echo "Building with Drupal version $DRUPAL_VERSION"
 RUN composer require --no-update drupal/core:${DRUPAL_VERSION} --update-with-all-dependencies
 RUN composer update 
 #	chown -R drupal:www-data web/sites web/modules web/themes; 
-FROM admin-build-cms as admin-build-crm
+FROM admin-build-cms AS admin-build-crm
 ENV CIVICRM_VERSION 6.0.2
 RUN set -eux; \
   composer config extra.enable-patching true; \
@@ -126,11 +126,11 @@ RUN \
   composer config --no-plugins allow-plugins.civicrm/composer-downloads-plugin true; \
   composer config --no-plugins allow-plugins.civicrm/composer-compile-plugin true; \
   composer update;
-FROM vhttp-base as vhttp-cms
+FROM vhttp-base AS vhttp-cms
 COPY --from=admin-build-cms /var/www/drupal .
-FROM vhttp-base as vhttp-crm
+FROM vhttp-base AS vhttp-crm
 COPY --from=admin-build-crm /var/www/drupal .
-FROM admin-minimal as admin-cms
+FROM admin-minimal AS admin-cms
 COPY --from=admin-build-cms /var/www/drupal .
-FROM admin-minimal as admin-crm
+FROM admin-minimal AS admin-crm
 COPY --from=admin-build-crm /var/www/drupal .
diff --git a/build/drupal/11.0/php8.3/apache-bookworm/Simuliidae b/build/drupal/11.0/php8.3/apache-bookworm/Simuliidae
index ec5d7aa..85fe9ce 100644
--- a/build/drupal/11.0/php8.3/apache-bookworm/Simuliidae
+++ b/build/drupal/11.0/php8.3/apache-bookworm/Simuliidae
@@ -14,7 +14,7 @@ ARG REPOSITORY_FROM=
 # Requires the VARIANT_TAG argument, which may be either the base or non-base version [??]
 ARG VARIANT_TAG=
 # Step 1. build the basic web service, a slightly extended version of the corresonding drupal modified base image.
-FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} as vhttp-base
+FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} AS vhttp-base
 # We create a drupal user to own all the code, using Dries birth year as the uid
 RUN useradd -u 1978 -g www-data -ms /bin/bash drupal
 # change the document root as per https://hub.docker.com/_/php/
@@ -57,7 +57,7 @@ CMD ["apache2-foreground"]
 # Step 2: build a basic admin service, adding some bits to the vhttp-base
 # Admin runs sshd as it's CMD by default, but can be used to, e.g. do automated setup.
 # We'll first build admin-minimal that we'll use later as a base for admin-build
-FROM vhttp-base as admin-minimal
+FROM vhttp-base AS admin-minimal
 RUN apt-get update \
   && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
@@ -87,7 +87,7 @@ CMD ["/entrypoint-sshd.sh"]
 # setup.sh runs the drupal and civicrm setup scripts and handles some ownership/permissions
 COPY setup.sh /setup.sh
 RUN chmod 775 /setup.sh
-FROM admin-minimal as admin-base
+FROM admin-minimal AS admin-base
 # add composer, uses (default) version 2
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 # add additional dependencies for installing civicrm with D9 + composer
@@ -99,7 +99,7 @@ RUN apt-get update && apt-get install -y ca-certificates curl gnupg && \
   apt-get purge -y && apt-get clean
 RUN npm install -g bower
 # Step 3: from the admin-base, add the CMS code, and then copy it over to the vhttp-base as the vhttp-cms
-FROM admin-base as admin-build-cms
+FROM admin-base AS admin-build-cms
 # https://www.drupal.org/node/3060/release
 ENV DRUPAL_VERSION 11.0.13
 USER drupal:www-data
@@ -112,7 +112,7 @@ RUN echo "Building with Drupal version $DRUPAL_VERSION"
 RUN composer require --no-update drupal/core:${DRUPAL_VERSION} --update-with-all-dependencies
 RUN composer update 
 #	chown -R drupal:www-data web/sites web/modules web/themes; 
-FROM admin-build-cms as admin-build-crm
+FROM admin-build-cms AS admin-build-crm
 ENV CIVICRM_VERSION 6.0.2
 RUN set -eux; \
   composer config extra.enable-patching true; \
@@ -126,11 +126,11 @@ RUN \
   composer config --no-plugins allow-plugins.civicrm/composer-downloads-plugin true; \
   composer config --no-plugins allow-plugins.civicrm/composer-compile-plugin true; \
   composer update;
-FROM vhttp-base as vhttp-cms
+FROM vhttp-base AS vhttp-cms
 COPY --from=admin-build-cms /var/www/drupal .
-FROM vhttp-base as vhttp-crm
+FROM vhttp-base AS vhttp-crm
 COPY --from=admin-build-crm /var/www/drupal .
-FROM admin-minimal as admin-cms
+FROM admin-minimal AS admin-cms
 COPY --from=admin-build-cms /var/www/drupal .
-FROM admin-minimal as admin-crm
+FROM admin-minimal AS admin-crm
 COPY --from=admin-build-crm /var/www/drupal .
diff --git a/build/drupal/11.1/php8.3/apache-bookworm/Simuliidae b/build/drupal/11.1/php8.3/apache-bookworm/Simuliidae
index 337563a..88e5180 100644
--- a/build/drupal/11.1/php8.3/apache-bookworm/Simuliidae
+++ b/build/drupal/11.1/php8.3/apache-bookworm/Simuliidae
@@ -14,7 +14,7 @@ ARG REPOSITORY_FROM=
 # Requires the VARIANT_TAG argument, which may be either the base or non-base version [??]
 ARG VARIANT_TAG=
 # Step 1. build the basic web service, a slightly extended version of the corresonding drupal modified base image.
-FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} as vhttp-base
+FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} AS vhttp-base
 # We create a drupal user to own all the code, using Dries birth year as the uid
 RUN useradd -u 1978 -g www-data -ms /bin/bash drupal
 # change the document root as per https://hub.docker.com/_/php/
@@ -57,7 +57,7 @@ CMD ["apache2-foreground"]
 # Step 2: build a basic admin service, adding some bits to the vhttp-base
 # Admin runs sshd as it's CMD by default, but can be used to, e.g. do automated setup.
 # We'll first build admin-minimal that we'll use later as a base for admin-build
-FROM vhttp-base as admin-minimal
+FROM vhttp-base AS admin-minimal
 RUN apt-get update \
   && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
@@ -87,7 +87,7 @@ CMD ["/entrypoint-sshd.sh"]
 # setup.sh runs the drupal and civicrm setup scripts and handles some ownership/permissions
 COPY setup.sh /setup.sh
 RUN chmod 775 /setup.sh
-FROM admin-minimal as admin-base
+FROM admin-minimal AS admin-base
 # add composer, uses (default) version 2
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 # add additional dependencies for installing civicrm with D9 + composer
@@ -99,7 +99,7 @@ RUN apt-get update && apt-get install -y ca-certificates curl gnupg && \
   apt-get purge -y && apt-get clean
 RUN npm install -g bower
 # Step 3: from the admin-base, add the CMS code, and then copy it over to the vhttp-base as the vhttp-cms
-FROM admin-base as admin-build-cms
+FROM admin-base AS admin-build-cms
 # https://www.drupal.org/node/3060/release
 ENV DRUPAL_VERSION 11.1.5
 USER drupal:www-data
@@ -112,7 +112,7 @@ RUN echo "Building with Drupal version $DRUPAL_VERSION"
 RUN composer require --no-update drupal/core:${DRUPAL_VERSION} --update-with-all-dependencies
 RUN composer update 
 #	chown -R drupal:www-data web/sites web/modules web/themes; 
-FROM admin-build-cms as admin-build-crm
+FROM admin-build-cms AS admin-build-crm
 ENV CIVICRM_VERSION 6.0.2
 RUN set -eux; \
   composer config extra.enable-patching true; \
@@ -126,11 +126,11 @@ RUN \
   composer config --no-plugins allow-plugins.civicrm/composer-downloads-plugin true; \
   composer config --no-plugins allow-plugins.civicrm/composer-compile-plugin true; \
   composer update;
-FROM vhttp-base as vhttp-cms
+FROM vhttp-base AS vhttp-cms
 COPY --from=admin-build-cms /var/www/drupal .
-FROM vhttp-base as vhttp-crm
+FROM vhttp-base AS vhttp-crm
 COPY --from=admin-build-crm /var/www/drupal .
-FROM admin-minimal as admin-cms
+FROM admin-minimal AS admin-cms
 COPY --from=admin-build-cms /var/www/drupal .
-FROM admin-minimal as admin-crm
+FROM admin-minimal AS admin-crm
 COPY --from=admin-build-crm /var/www/drupal .
diff --git a/build/drupal/7/php7.4/apache-bullseye/Simuliidae b/build/drupal/7/php7.4/apache-bullseye/Simuliidae
index 7cc838f..d7660f6 100644
--- a/build/drupal/7/php7.4/apache-bullseye/Simuliidae
+++ b/build/drupal/7/php7.4/apache-bullseye/Simuliidae
@@ -14,7 +14,7 @@ ARG REPOSITORY_FROM=
 # Requires the VARIANT_TAG argument, which may be either the base or non-base version [??]
 ARG VARIANT_TAG=
 # Step 1. build the basic web service, a slightly extended version of the corresonding drupal modified base image.
-FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} as vhttp-base
+FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} AS vhttp-base
 # We create a drupal user to own all the code, using Dries birth year as the uid
 RUN useradd -u 1978 -g www-data -ms /bin/bash drupal
 # use the default document root inherited from php/apache
@@ -51,7 +51,7 @@ CMD ["apache2-foreground"]
 # Step 2: build a basic admin service, adding some bits to the vhttp-base
 # Admin runs sshd as it's CMD by default, but can be used to, e.g. do automated setup.
 # We'll first build admin-minimal that we'll use later as a base for admin-build
-FROM vhttp-base as admin-minimal
+FROM vhttp-base AS admin-minimal
 RUN apt-get update \
   && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
@@ -79,9 +79,9 @@ CMD ["/entrypoint-sshd.sh"]
 # setup.sh runs the drupal and civicrm setup scripts and handles some ownership/permissions
 COPY setup.sh /setup.sh
 RUN chmod 775 /setup.sh
-FROM admin-minimal as admin-base
+FROM admin-minimal AS admin-base
 # Step 3: from the admin-base, add the CMS code, and then copy it over to the vhttp-base as the vhttp-cms
-FROM admin-base as admin-build-cms
+FROM admin-base AS admin-build-cms
 # https://www.drupal.org/node/3060/release
 ENV DRUPAL_VERSION 7.103
 ENV DRUPAL_MD5 9330ed0dd9926e82b06afb9cf236d5f6
@@ -91,17 +91,17 @@ RUN set -eux; \
 	tar -xz --strip-components=1 -f drupal.tar.gz; \
 	rm drupal.tar.gz; \
 	chown -R drupal:www-data sites modules themes;
-FROM admin-build-cms as admin-build-crm
+FROM admin-build-cms AS admin-build-crm
 ENV CIVICRM_VERSION 5.82.0
 RUN set -eux; \
         cd sites/all/modules; \
         curl -L "https://download.civicrm.org/civicrm-${CIVICRM_VERSION}-drupal.tar.gz" | tar xvz; \
 	chown -R drupal:www-data civicrm;
-FROM vhttp-base as vhttp-cms
+FROM vhttp-base AS vhttp-cms
 COPY --from=admin-build-cms /var/www/html .
-FROM vhttp-base as vhttp-crm
+FROM vhttp-base AS vhttp-crm
 COPY --from=admin-build-crm /var/www/html .
-FROM admin-minimal as admin-cms
+FROM admin-minimal AS admin-cms
 COPY --from=admin-build-cms /var/www/html .
-FROM admin-minimal as admin-crm
+FROM admin-minimal AS admin-crm
 COPY --from=admin-build-crm /var/www/html .
diff --git a/build/drupal/7/php8.1/apache-bullseye/Simuliidae b/build/drupal/7/php8.1/apache-bullseye/Simuliidae
index 019ca0e..38fad95 100644
--- a/build/drupal/7/php8.1/apache-bullseye/Simuliidae
+++ b/build/drupal/7/php8.1/apache-bullseye/Simuliidae
@@ -14,7 +14,7 @@ ARG REPOSITORY_FROM=
 # Requires the VARIANT_TAG argument, which may be either the base or non-base version [??]
 ARG VARIANT_TAG=
 # Step 1. build the basic web service, a slightly extended version of the corresonding drupal modified base image.
-FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} as vhttp-base
+FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} AS vhttp-base
 # We create a drupal user to own all the code, using Dries birth year as the uid
 RUN useradd -u 1978 -g www-data -ms /bin/bash drupal
 # use the default document root inherited from php/apache
@@ -51,7 +51,7 @@ CMD ["apache2-foreground"]
 # Step 2: build a basic admin service, adding some bits to the vhttp-base
 # Admin runs sshd as it's CMD by default, but can be used to, e.g. do automated setup.
 # We'll first build admin-minimal that we'll use later as a base for admin-build
-FROM vhttp-base as admin-minimal
+FROM vhttp-base AS admin-minimal
 RUN apt-get update \
   && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
@@ -79,9 +79,9 @@ CMD ["/entrypoint-sshd.sh"]
 # setup.sh runs the drupal and civicrm setup scripts and handles some ownership/permissions
 COPY setup.sh /setup.sh
 RUN chmod 775 /setup.sh
-FROM admin-minimal as admin-base
+FROM admin-minimal AS admin-base
 # Step 3: from the admin-base, add the CMS code, and then copy it over to the vhttp-base as the vhttp-cms
-FROM admin-base as admin-build-cms
+FROM admin-base AS admin-build-cms
 # https://www.drupal.org/node/3060/release
 ENV DRUPAL_VERSION 7.103
 ENV DRUPAL_MD5 9330ed0dd9926e82b06afb9cf236d5f6
@@ -91,17 +91,17 @@ RUN set -eux; \
 	tar -xz --strip-components=1 -f drupal.tar.gz; \
 	rm drupal.tar.gz; \
 	chown -R drupal:www-data sites modules themes;
-FROM admin-build-cms as admin-build-crm
+FROM admin-build-cms AS admin-build-crm
 ENV CIVICRM_VERSION 5.82.0
 RUN set -eux; \
         cd sites/all/modules; \
         curl -L "https://download.civicrm.org/civicrm-${CIVICRM_VERSION}-drupal.tar.gz" | tar xvz; \
 	chown -R drupal:www-data civicrm;
-FROM vhttp-base as vhttp-cms
+FROM vhttp-base AS vhttp-cms
 COPY --from=admin-build-cms /var/www/html .
-FROM vhttp-base as vhttp-crm
+FROM vhttp-base AS vhttp-crm
 COPY --from=admin-build-crm /var/www/html .
-FROM admin-minimal as admin-cms
+FROM admin-minimal AS admin-cms
 COPY --from=admin-build-cms /var/www/html .
-FROM admin-minimal as admin-crm
+FROM admin-minimal AS admin-crm
 COPY --from=admin-build-crm /var/www/html .
diff --git a/build/drupal/7/php8.2/apache-bullseye/Simuliidae b/build/drupal/7/php8.2/apache-bullseye/Simuliidae
index 019ca0e..38fad95 100644
--- a/build/drupal/7/php8.2/apache-bullseye/Simuliidae
+++ b/build/drupal/7/php8.2/apache-bullseye/Simuliidae
@@ -14,7 +14,7 @@ ARG REPOSITORY_FROM=
 # Requires the VARIANT_TAG argument, which may be either the base or non-base version [??]
 ARG VARIANT_TAG=
 # Step 1. build the basic web service, a slightly extended version of the corresonding drupal modified base image.
-FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} as vhttp-base
+FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} AS vhttp-base
 # We create a drupal user to own all the code, using Dries birth year as the uid
 RUN useradd -u 1978 -g www-data -ms /bin/bash drupal
 # use the default document root inherited from php/apache
@@ -51,7 +51,7 @@ CMD ["apache2-foreground"]
 # Step 2: build a basic admin service, adding some bits to the vhttp-base
 # Admin runs sshd as it's CMD by default, but can be used to, e.g. do automated setup.
 # We'll first build admin-minimal that we'll use later as a base for admin-build
-FROM vhttp-base as admin-minimal
+FROM vhttp-base AS admin-minimal
 RUN apt-get update \
   && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
@@ -79,9 +79,9 @@ CMD ["/entrypoint-sshd.sh"]
 # setup.sh runs the drupal and civicrm setup scripts and handles some ownership/permissions
 COPY setup.sh /setup.sh
 RUN chmod 775 /setup.sh
-FROM admin-minimal as admin-base
+FROM admin-minimal AS admin-base
 # Step 3: from the admin-base, add the CMS code, and then copy it over to the vhttp-base as the vhttp-cms
-FROM admin-base as admin-build-cms
+FROM admin-base AS admin-build-cms
 # https://www.drupal.org/node/3060/release
 ENV DRUPAL_VERSION 7.103
 ENV DRUPAL_MD5 9330ed0dd9926e82b06afb9cf236d5f6
@@ -91,17 +91,17 @@ RUN set -eux; \
 	tar -xz --strip-components=1 -f drupal.tar.gz; \
 	rm drupal.tar.gz; \
 	chown -R drupal:www-data sites modules themes;
-FROM admin-build-cms as admin-build-crm
+FROM admin-build-cms AS admin-build-crm
 ENV CIVICRM_VERSION 5.82.0
 RUN set -eux; \
         cd sites/all/modules; \
         curl -L "https://download.civicrm.org/civicrm-${CIVICRM_VERSION}-drupal.tar.gz" | tar xvz; \
 	chown -R drupal:www-data civicrm;
-FROM vhttp-base as vhttp-cms
+FROM vhttp-base AS vhttp-cms
 COPY --from=admin-build-cms /var/www/html .
-FROM vhttp-base as vhttp-crm
+FROM vhttp-base AS vhttp-crm
 COPY --from=admin-build-crm /var/www/html .
-FROM admin-minimal as admin-cms
+FROM admin-minimal AS admin-cms
 COPY --from=admin-build-cms /var/www/html .
-FROM admin-minimal as admin-crm
+FROM admin-minimal AS admin-crm
 COPY --from=admin-build-crm /var/www/html .
diff --git a/build/drupal/Simuliidae.template b/build/drupal/Simuliidae.template
index 5ac05d8..1467070 100644
--- a/build/drupal/Simuliidae.template
+++ b/build/drupal/Simuliidae.template
@@ -8,7 +8,7 @@ ARG REPOSITORY_FROM=
 # Requires the VARIANT_TAG argument, which may be either the base or non-base version [??]
 ARG VARIANT_TAG=
 # Step 1. build the basic web service, a slightly extended version of the corresonding drupal modified base image.
-FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} as vhttp-base
+FROM ${REPOSITORY_FROM}drupal:base-${VARIANT_TAG} AS vhttp-base
 # We create a drupal user to own all the code, using Dries birth year as the uid
 RUN useradd -u 1978 -g www-data -ms /bin/bash drupal
 {{ if env.version | startswith("7") then ( -}}
@@ -56,7 +56,7 @@ CMD ["apache2-foreground"]
 # Step 2: build a basic admin service, adding some bits to the vhttp-base
 # Admin runs sshd as it's CMD by default, but can be used to, e.g. do automated setup.
 # We'll first build admin-minimal that we'll use later as a base for admin-build
-FROM vhttp-base as admin-minimal
+FROM vhttp-base AS admin-minimal
 RUN apt-get update \
   && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
   && apt-get purge -y && \
@@ -96,7 +96,7 @@ CMD ["/entrypoint-sshd.sh"]
 # setup.sh runs the drupal and civicrm setup scripts and handles some ownership/permissions
 COPY setup.sh /setup.sh
 RUN chmod 775 /setup.sh
-FROM admin-minimal as admin-base
+FROM admin-minimal AS admin-base
 {{ if env.version | startswith("7") then "" else ( -}}
 # add composer, uses (default) version 2
 COPY --from=composer:{{ .composer.version }} /usr/bin/composer /usr/local/bin/
@@ -110,7 +110,7 @@ RUN apt-get update && apt-get install -y ca-certificates curl gnupg && \
 RUN npm install -g bower
 {{ ) end -}}
 # Step 3: from the admin-base, add the CMS code, and then copy it over to the vhttp-base as the vhttp-cms
-FROM admin-base as admin-build-cms
+FROM admin-base AS admin-build-cms
 # https://www.drupal.org/node/3060/release
 ENV DRUPAL_VERSION {{ .version }}
 {{ if env.version | startswith("7") then ( -}}
@@ -145,7 +145,7 @@ RUN composer require --no-update drupal/core:${DRUPAL_VERSION} --update-with-all
 RUN composer update 
 #	chown -R drupal:www-data web/sites web/modules web/themes; 
 {{ ) end -}}
-FROM admin-build-cms as admin-build-crm
+FROM admin-build-cms AS admin-build-crm
 ENV CIVICRM_VERSION {{ .civicrmVersion }}
 {{ if env.version | startswith("7") then ( -}}
 RUN set -eux; \
@@ -166,25 +166,25 @@ RUN \
   composer config --no-plugins allow-plugins.civicrm/composer-compile-plugin true; \
   composer update;
 {{ ) end -}}
-FROM vhttp-base as vhttp-cms
+FROM vhttp-base AS vhttp-cms
 {{ if env.version | startswith("7") then ( -}}
 COPY --from=admin-build-cms /var/www/html .
 {{ ) else ( -}}
 COPY --from=admin-build-cms /var/www/drupal .
 {{ ) end -}}
-FROM vhttp-base as vhttp-crm
+FROM vhttp-base AS vhttp-crm
 {{ if env.version | startswith("7") then ( -}}
 COPY --from=admin-build-crm /var/www/html .
 {{ ) else ( -}}
 COPY --from=admin-build-crm /var/www/drupal .
 {{ ) end -}}
-FROM admin-minimal as admin-cms
+FROM admin-minimal AS admin-cms
 {{ if env.version | startswith("7") then ( -}}
 COPY --from=admin-build-cms /var/www/html .
 {{ ) else ( -}}
 COPY --from=admin-build-cms /var/www/drupal .
 {{ ) end -}}
-FROM admin-minimal as admin-crm
+FROM admin-minimal AS admin-crm
 {{ if env.version | startswith("7") then ( -}}
 COPY --from=admin-build-crm /var/www/html .
 {{ ) else ( -}}

From bdfc89075a419e32a188633c03fd4276ea9a355f Mon Sep 17 00:00:00 2001
From: Alan Dixon <alan.g.dixon@gmail.com>
Date: Mon, 30 Jun 2025 16:53:44 +0000
Subject: [PATCH 3/9] bug fix in vhttp.conf!

---
 build/drupal/10.3/php8.2/apache-bullseye/vhttp.conf | 2 +-
 build/drupal/10.3/php8.3/apache-bullseye/vhttp.conf | 2 +-
 build/drupal/10.4/php8.3/apache-bullseye/vhttp.conf | 2 +-
 build/drupal/11.0/php8.3/apache-bookworm/vhttp.conf | 2 +-
 build/drupal/11.1/php8.3/apache-bookworm/vhttp.conf | 2 +-
 build/drupal/7/php7.4/apache-bullseye/vhttp.conf    | 2 +-
 build/drupal/7/php8.1/apache-bullseye/vhttp.conf    | 2 +-
 build/drupal/7/php8.2/apache-bullseye/vhttp.conf    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/drupal/10.3/php8.2/apache-bullseye/vhttp.conf b/build/drupal/10.3/php8.2/apache-bullseye/vhttp.conf
index 50de693..f6402a0 100644
--- a/build/drupal/10.3/php8.2/apache-bullseye/vhttp.conf
+++ b/build/drupal/10.3/php8.2/apache-bullseye/vhttp.conf
@@ -17,7 +17,7 @@ Alias /fr/vendor/  /var/www/drupal/web/vendor/
   <IfModule !mod_authz_core.c>
     Order allow,deny
   </IfModule>
-</FilesMatch>
+</Files>
 # prefork MPM, override default configuration
 <IfModule mpm_prefork_module>
   StartServers     5
diff --git a/build/drupal/10.3/php8.3/apache-bullseye/vhttp.conf b/build/drupal/10.3/php8.3/apache-bullseye/vhttp.conf
index 50de693..f6402a0 100644
--- a/build/drupal/10.3/php8.3/apache-bullseye/vhttp.conf
+++ b/build/drupal/10.3/php8.3/apache-bullseye/vhttp.conf
@@ -17,7 +17,7 @@ Alias /fr/vendor/  /var/www/drupal/web/vendor/
   <IfModule !mod_authz_core.c>
     Order allow,deny
   </IfModule>
-</FilesMatch>
+</Files>
 # prefork MPM, override default configuration
 <IfModule mpm_prefork_module>
   StartServers     5
diff --git a/build/drupal/10.4/php8.3/apache-bullseye/vhttp.conf b/build/drupal/10.4/php8.3/apache-bullseye/vhttp.conf
index 50de693..f6402a0 100644
--- a/build/drupal/10.4/php8.3/apache-bullseye/vhttp.conf
+++ b/build/drupal/10.4/php8.3/apache-bullseye/vhttp.conf
@@ -17,7 +17,7 @@ Alias /fr/vendor/  /var/www/drupal/web/vendor/
   <IfModule !mod_authz_core.c>
     Order allow,deny
   </IfModule>
-</FilesMatch>
+</Files>
 # prefork MPM, override default configuration
 <IfModule mpm_prefork_module>
   StartServers     5
diff --git a/build/drupal/11.0/php8.3/apache-bookworm/vhttp.conf b/build/drupal/11.0/php8.3/apache-bookworm/vhttp.conf
index 50de693..f6402a0 100644
--- a/build/drupal/11.0/php8.3/apache-bookworm/vhttp.conf
+++ b/build/drupal/11.0/php8.3/apache-bookworm/vhttp.conf
@@ -17,7 +17,7 @@ Alias /fr/vendor/  /var/www/drupal/web/vendor/
   <IfModule !mod_authz_core.c>
     Order allow,deny
   </IfModule>
-</FilesMatch>
+</Files>
 # prefork MPM, override default configuration
 <IfModule mpm_prefork_module>
   StartServers     5
diff --git a/build/drupal/11.1/php8.3/apache-bookworm/vhttp.conf b/build/drupal/11.1/php8.3/apache-bookworm/vhttp.conf
index 50de693..f6402a0 100644
--- a/build/drupal/11.1/php8.3/apache-bookworm/vhttp.conf
+++ b/build/drupal/11.1/php8.3/apache-bookworm/vhttp.conf
@@ -17,7 +17,7 @@ Alias /fr/vendor/  /var/www/drupal/web/vendor/
   <IfModule !mod_authz_core.c>
     Order allow,deny
   </IfModule>
-</FilesMatch>
+</Files>
 # prefork MPM, override default configuration
 <IfModule mpm_prefork_module>
   StartServers     5
diff --git a/build/drupal/7/php7.4/apache-bullseye/vhttp.conf b/build/drupal/7/php7.4/apache-bullseye/vhttp.conf
index 136d91e..f9057db 100644
--- a/build/drupal/7/php7.4/apache-bullseye/vhttp.conf
+++ b/build/drupal/7/php7.4/apache-bullseye/vhttp.conf
@@ -17,7 +17,7 @@ Alias /fr/vendor/  /var/www/html/vendor/
   <IfModule !mod_authz_core.c>
     Order allow,deny
   </IfModule>
-</FilesMatch>
+</Files>
 # prefork MPM, override default configuration
 <IfModule mpm_prefork_module>
   StartServers     5
diff --git a/build/drupal/7/php8.1/apache-bullseye/vhttp.conf b/build/drupal/7/php8.1/apache-bullseye/vhttp.conf
index 136d91e..f9057db 100644
--- a/build/drupal/7/php8.1/apache-bullseye/vhttp.conf
+++ b/build/drupal/7/php8.1/apache-bullseye/vhttp.conf
@@ -17,7 +17,7 @@ Alias /fr/vendor/  /var/www/html/vendor/
   <IfModule !mod_authz_core.c>
     Order allow,deny
   </IfModule>
-</FilesMatch>
+</Files>
 # prefork MPM, override default configuration
 <IfModule mpm_prefork_module>
   StartServers     5
diff --git a/build/drupal/7/php8.2/apache-bullseye/vhttp.conf b/build/drupal/7/php8.2/apache-bullseye/vhttp.conf
index 136d91e..f9057db 100644
--- a/build/drupal/7/php8.2/apache-bullseye/vhttp.conf
+++ b/build/drupal/7/php8.2/apache-bullseye/vhttp.conf
@@ -17,7 +17,7 @@ Alias /fr/vendor/  /var/www/html/vendor/
   <IfModule !mod_authz_core.c>
     Order allow,deny
   </IfModule>
-</FilesMatch>
+</Files>
 # prefork MPM, override default configuration
 <IfModule mpm_prefork_module>
   StartServers     5

From 22a6a8089921fb4977d47a0c0f33a1bd8e8ddd8f Mon Sep 17 00:00:00 2001
From: Alan Dixon <alan.g.dixon@gmail.com>
Date: Mon, 30 Jun 2025 16:54:53 +0000
Subject: [PATCH 4/9] updated ENV syntax to avoid warnings

---
 build/drupal/Simuliidae.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/drupal/Simuliidae.template b/build/drupal/Simuliidae.template
index 1467070..6dbf61c 100644
--- a/build/drupal/Simuliidae.template
+++ b/build/drupal/Simuliidae.template
@@ -18,7 +18,7 @@ WORKDIR /var/www/html
 # change the document root as per https://hub.docker.com/_/php/
 # because I want to build my code with composer and this is how I've been doing it ...
 RUN mkdir -p /var/www/drupal
-ENV APACHE_DOCUMENT_ROOT /var/www/drupal/web
+ENV APACHE_DOCUMENT_ROOT=/var/www/drupal/web
 RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
 RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
 WORKDIR /var/www/drupal

From c26188c482ee59017f0f152f4821dc781eac48a2 Mon Sep 17 00:00:00 2001
From: Alan Dixon <alan.g.dixon@gmail.com>
Date: Tue, 22 Jul 2025 14:03:40 +0000
Subject: [PATCH 5/9] install restic by COPY instead of apt-get so I can get a
 more recent version

---
 build/drupal/Simuliidae.template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/drupal/Simuliidae.template b/build/drupal/Simuliidae.template
index 6dbf61c..92e9b89 100644
--- a/build/drupal/Simuliidae.template
+++ b/build/drupal/Simuliidae.template
@@ -58,7 +58,7 @@ CMD ["apache2-foreground"]
 # We'll first build admin-minimal that we'll use later as a base for admin-build
 FROM vhttp-base AS admin-minimal
 RUN apt-get update \
-  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server restic \
+  && apt-get install -y mariadb-client sudo vim less zip unzip netcat-traditional ssh rsync openssh-server \
   && apt-get purge -y && \
   sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/g' /etc/ssh/sshd_config && \
   sed -i 's/#LogLevel INFO/LogLevel DEBUG/g' /etc/ssh/sshd_config
@@ -96,6 +96,7 @@ CMD ["/entrypoint-sshd.sh"]
 # setup.sh runs the drupal and civicrm setup scripts and handles some ownership/permissions
 COPY setup.sh /setup.sh
 RUN chmod 775 /setup.sh
+COPY --from=restic/restic:0.18.0 /usr/bin/restic /usr/bin/
 FROM admin-minimal AS admin-base
 {{ if env.version | startswith("7") then "" else ( -}}
 # add composer, uses (default) version 2

From d6c2a7e7ace5707ea4907267b0afbff29800195a Mon Sep 17 00:00:00 2001
From: Alan Dixon <alan.g.dixon@gmail.com>
Date: Sun, 23 Nov 2025 00:55:02 +0000
Subject: [PATCH 6/9] VSITE_HTTP_CPUS no longer supportable/supported

---
 compose/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/deploy.yml b/compose/deploy.yml
index 5ce7c8f..301cafc 100644
--- a/compose/deploy.yml
+++ b/compose/deploy.yml
@@ -53,7 +53,7 @@ services:
       replicas: 1
       resources:
         limits:
-          cpus: "{VSITE_HTTP_CPUS-2}"
+          cpus: "2"
           memory: "{VSITE_HTTP_MEMORY-800M}"
       restart_policy:
         max_attempts: 2

From 0eaa38dd1538033dc7c1374ad90c0992f8698663 Mon Sep 17 00:00:00 2001
From: Alan Dixon <alan.g.dixon@gmail.com>
Date: Sun, 23 Nov 2025 00:56:44 +0000
Subject: [PATCH 7/9] connect admin and vhttp to an external network

---
 compose/network.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 compose/network.yml

diff --git a/compose/network.yml b/compose/network.yml
new file mode 100644
index 0000000..abc61e2
--- /dev/null
+++ b/compose/network.yml
@@ -0,0 +1,16 @@
+# to use this, we need to define:
+# VSITE_NETWORK
+version: '3.5'
+networks:
+  vsite_network:
+    external: true
+    name: "{VSITE_NETWORK}"
+services:
+  admin:
+    networks:
+      - default
+      - vsite_network
+  vhttp:
+    networks:
+      - default
+      - vsite_network

From 7724880f0a34a5a69912ef04998616b3812b4f29 Mon Sep 17 00:00:00 2001
From: Alan Dixon <alan.g.dixon@gmail.com>
Date: Sun, 23 Nov 2025 00:58:18 +0000
Subject: [PATCH 8/9] split into lines for read/maintain + allow
 COMPOSE_PROJECT_NAME + convert cpus value to string

---
 compose/bin/stack-generate.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/compose/bin/stack-generate.sh b/compose/bin/stack-generate.sh
index e2a9e8a..a00cf61 100755
--- a/compose/bin/stack-generate.sh
+++ b/compose/bin/stack-generate.sh
@@ -30,4 +30,9 @@ do
   shift
 done
 #echo "-f ${VSITE_COMPOSE_PROJECT_VARIANT}/${BASE}.yml $CONFIGS config | sed 's/{VSITE/\${VSITE/g' | sed \"s/ \([^[:space:]]*\): ''$/ - \1/\" > ${VSITE_COMPOSE_PROJECT_VARIANT}/${GENNAME}.yml"
-bin/docker-compose -f ${VSITE_COMPOSE_PROJECT_VARIANT}/${BASE}.yml $CONFIGS config | sed 's/{VSITE/\${VSITE/g' | sed "s/ \([^[:space:]]*\): ''$/ - \1/" | sed 's/60666/\${VSITE_SFTP_PORT}/' | sed 's/60667/\${VSITE_SSH_PORT}/' | sed 's/60668/${VSITE_MYSQL_PORT}/' | sed 's/60669/${VSITE_PHPMYADMIN_PORT}/' | sed 's/60670/${VSITE_BACKUP_PORT}/' > ${VSITE_COMPOSE_PROJECT_VARIANT}/${GENNAME}.yml
+bin/docker-compose -f ${VSITE_COMPOSE_PROJECT_VARIANT}/${BASE}.yml $CONFIGS config \
+  | sed 's/{VSITE/\${VSITE/g' | sed 's/{COMPOSE_PROJECT_NAME/\${COMPOSE_PROJECT_NAME/g' | sed "s/ \([^[:space:]]*\): ''$/ - \1/"  \
+  | sed 's/60666/\${VSITE_SFTP_PORT}/' | sed 's/60667/\${VSITE_SSH_PORT}/' \
+  | sed 's/60668/${VSITE_MYSQL_PORT}/' | sed 's/60669/${VSITE_PHPMYADMIN_PORT}/' | sed 's/60670/${VSITE_BACKUP_PORT}/' \
+  | sed 's/cpus: 1.0/cpus: "1"/' | sed 's/cpus: 2.0/cpus: "2"/' \
+  > ${VSITE_COMPOSE_PROJECT_VARIANT}/${GENNAME}.yml

From bf7e1abe93c7acba89e5d9cf16a66832716c89b8 Mon Sep 17 00:00:00 2001
From: Alan Dixon <alan.g.dixon@gmail.com>
Date: Sun, 23 Nov 2025 01:05:15 +0000
Subject: [PATCH 9/9] updated last good pre-v2 vesion of docker-compose from
 1.25.2 to 1.29.2

---
 compose/bin/docker-compose-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/bin/docker-compose-install.sh b/compose/bin/docker-compose-install.sh
index 20d376b..b0ad66f 100644
--- a/compose/bin/docker-compose-install.sh
+++ b/compose/bin/docker-compose-install.sh
@@ -1,4 +1,4 @@
 # this project depends on the old docker-compose, pre-V2.
 # this script gets the latest pre-V2 version
-curl -SL https://github.com/docker/compose/releases/download/v1.25.2/docker-compose-linux-x86_64 -o docker-compose
+curl -SL https://github.com/docker/compose/releases/download/v1.29.2/docker-compose-linux-x86_64 -o docker-compose
 chmod ugo+x docker-compose