diff --git a/composer.json b/composer.json
index b5b91fa5ef8a6df78f5b37b339c0296da9657a6b..e6f257dbaae6dd0523864a9a3058ba1a02b842c0 100644
--- a/composer.json
+++ b/composer.json
@@ -146,9 +146,9 @@
"drupal/components": "3.0.0-beta3",
"drupal/config_update": "2.0.0-alpha3",
"drupal/content_access": "2.0.0",
- "drupal/core-composer-scaffold": "10.1.8",
- "drupal/core-project-message": "10.1.8",
- "drupal/core-recommended": "10.1.8",
+ "drupal/core-composer-scaffold": "10.2.6",
+ "drupal/core-project-message": "10.2.6",
+ "drupal/core-recommended": "10.2.6",
"drupal/ctools": "4.0.4",
"drupal/date_popup": "2.0.1",
"drupal/devel": "5.1.2",
@@ -219,7 +219,7 @@
"drupal/views_taxonomy_term_name_depth": "7.2.0",
"drupal/viewsreference": "dev-1.x",
"drupal/webform": "6.2.2",
- "drush/drush": "12.1.2",
+ "drush/drush": "12.4.3",
"npm-asset/jquery": "3.6.4",
"vlucas/phpdotenv": "v5.6.0",
"webflo/drupal-finder": "1.2.2",
@@ -352,4 +352,4 @@
"merge-scripts": true
}
}
-}
\ No newline at end of file
+}
diff --git a/images/Dockerfile-composerbuilder b/images/Dockerfile-composerbuilder
index c8ef83898642a8505251055b14620bd12b624542..cf49ef358aeb2db51386c9fe207f35e4c7156376 100644
--- a/images/Dockerfile-composerbuilder
+++ b/images/Dockerfile-composerbuilder
@@ -13,8 +13,12 @@ LABEL maintainer="Drupal Admins <drupal-admins@cern.ch>" \
# TODO: check if we need this, this might be unnecessary
RUN source /etc/os-release && \
- ALPINE_VERSION=$(echo "$VERSION_ID" | cut -d. -f1-2) && \
- echo "http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/main" >> /etc/apk/repositories
+ ALPINE_VERSION=$(echo "$VERSION_ID" | cut -d. -f1-2) && \
+ echo "http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/main" >> /etc/apk/repositories
+
+# Ensure the correct Alpine 3.16 version repositories are used
+#RUN echo "http://dl-cdn.alpinelinux.org/alpine/v3.16/main" > /etc/apk/repositories && \
+# echo "http://dl-cdn.alpinelinux.org/alpine/v3.16/community" >> /etc/apk/repositories
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://github.com/docker-library/docs/blob/master/php/README.md#supported-tags-and-respective-dockerfile-links
@@ -35,7 +39,7 @@ RUN apk --update add \
libcurl \
imagemagick-dev \
imagemagick \
- php8-pecl-imagick \
+ php81-pecl-imagick \
bzip2-dev \
ldb-dev \
libldap \
@@ -46,7 +50,7 @@ RUN apk --update add \
libxslt \
net-snmp \
net-snmp-dev \
- php8-mbstring
+ php81-mbstring
# Fix for iconv library
# This must be present in the sitebuilder image,
@@ -185,7 +189,8 @@ RUN set -x \
x86_64|aarch64) \
# arches officially built by upstream
set -x \
- && KEY_SHA512="e7fa8303923d9b95db37a77ad46c68fd4755ff935d0a534d26eba83de193c76166c68bfe7f65471bf8881004ef4aa6df3e34689c305662750c0172fca5d8552a *stdin" \
+ && KEY_SHA512="de7031fdac1354096d3388d6f711a508328ce66c168967ee0658c294226d6e7a161ce7f2628d577d56f8b63ff6892cc576af6f7ef2a6aa2e17c62ff7b6bf0d98 *stdin" \
+ #&& KEY_SHA512="e7fa8303923d9b95db37a77ad46c68fd4755ff935d0a534d26eba83de193c76166c68bfe7f65471bf8881004ef4aa6df3e34689c305662750c0172fca5d8552a *stdin" \
&& apk add --no-cache --virtual .cert-deps \
openssl \
&& wget -O /tmp/nginx_signing.rsa.pub https://nginx.org/keys/nginx_signing.rsa.pub \
diff --git a/images/Dockerfile-sitebuilder b/images/Dockerfile-sitebuilder
index d639a1d54572cfd243d226bf4841864eaed56bae..a5785bc0d9dd6f43798dfdbf50ca2404fa61da6a 100644
--- a/images/Dockerfile-sitebuilder
+++ b/images/Dockerfile-sitebuilder
@@ -77,6 +77,8 @@ ENV COMPOSER_HOME=${DRUPAL_APP_DIR} COMPOSER_CACHE_DIR=${DRUPAL_APP_DIR}/.compos
# Do not run Composer as root/super user! See https://getcomposer.org/root for details
# Set up drupal minimum stack
ENV COMPOSER_MEMORY_LIMIT=-1
+ENV COMPOSER_ALLOW_SUPERUSER=1
+RUN composer update
RUN composer install --optimize-autoloader -v
ENV PATH=$PATH:${DRUPAL_APP_DIR}/vendor/bin
diff --git a/images/softwareVersions b/images/softwareVersions
index ed5279faa09bc809641962737264167580b316ef..85fa9b27417e171f8b3c5ce81df7a33e418a9a13 100644
--- a/images/softwareVersions
+++ b/images/softwareVersions
@@ -2,11 +2,11 @@ php: '8.1-rc-fpm-alpine'
# These values together define the version of nginx
# Ref: https://github.com/nginxinc/docker-nginx/blob/master/stable/alpine/Dockerfile
-nginx: '1.22.0'
-nginxNJS: '0.7.5'
+nginx: '1.26.0'
+nginxNJS: '0.8.4'
# This value is used to build the composer-builder ONLY.
# It will NOT affect the sitebuilder directly.
-composer: '2.3.5'
+composer: '2.7.6'
# This is instead the version of the composer builder that the sitebuilder will use.
-composerBuilderTag: 'v9.4-2-RELEASE-2022.10.28T15-35-05Z'
+composerBuilderTag: 'dev10.2-0-56d96fe2'