From 174a4057624aa4c21d874ec992da4f0376842b62 Mon Sep 17 00:00:00 2001 From: Jingsheng Wang Date: Sat, 2 Jan 2021 00:41:48 +0800 Subject: [PATCH] Use the correct composer version for 9.1.x --- 8.9/apache-buster/Dockerfile | 1 - 8.9/fpm-alpine3.12/Dockerfile | 1 - 8.9/fpm-buster/Dockerfile | 1 - 9.0/apache-buster/Dockerfile | 1 - 9.0/fpm-alpine3.12/Dockerfile | 1 - 9.0/fpm-buster/Dockerfile | 1 - 9.1/apache-buster/Dockerfile | 3 +-- 9.1/fpm-alpine3.12/Dockerfile | 3 +-- 9.1/fpm-buster/Dockerfile | 3 +-- Dockerfile-alpine.template | 3 +-- Dockerfile-debian.template | 3 +-- update.sh | 22 +++++++++++++++++----- 12 files changed, 22 insertions(+), 21 deletions(-) diff --git a/8.9/apache-buster/Dockerfile b/8.9/apache-buster/Dockerfile index 05c993f77..c737496ba 100644 --- a/8.9/apache-buster/Dockerfile +++ b/8.9/apache-buster/Dockerfile @@ -56,7 +56,6 @@ RUN { \ echo 'opcache.fast_shutdown=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053 COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release diff --git a/8.9/fpm-alpine3.12/Dockerfile b/8.9/fpm-alpine3.12/Dockerfile index 50f99205f..2d3466854 100644 --- a/8.9/fpm-alpine3.12/Dockerfile +++ b/8.9/fpm-alpine3.12/Dockerfile @@ -46,7 +46,6 @@ RUN { \ echo 'opcache.fast_shutdown=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053 COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release diff --git a/8.9/fpm-buster/Dockerfile b/8.9/fpm-buster/Dockerfile index 2e00b2233..df81e14a6 100644 --- a/8.9/fpm-buster/Dockerfile +++ b/8.9/fpm-buster/Dockerfile @@ -56,7 +56,6 @@ RUN { \ echo 'opcache.fast_shutdown=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053 COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release diff --git a/9.0/apache-buster/Dockerfile b/9.0/apache-buster/Dockerfile index 48a07109b..ea047e87c 100644 --- a/9.0/apache-buster/Dockerfile +++ b/9.0/apache-buster/Dockerfile @@ -56,7 +56,6 @@ RUN { \ echo 'opcache.fast_shutdown=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053 COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release diff --git a/9.0/fpm-alpine3.12/Dockerfile b/9.0/fpm-alpine3.12/Dockerfile index 090200f79..dae998f37 100644 --- a/9.0/fpm-alpine3.12/Dockerfile +++ b/9.0/fpm-alpine3.12/Dockerfile @@ -46,7 +46,6 @@ RUN { \ echo 'opcache.fast_shutdown=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053 COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release diff --git a/9.0/fpm-buster/Dockerfile b/9.0/fpm-buster/Dockerfile index ffafea8a9..f6a0f861f 100644 --- a/9.0/fpm-buster/Dockerfile +++ b/9.0/fpm-buster/Dockerfile @@ -56,7 +56,6 @@ RUN { \ echo 'opcache.fast_shutdown=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053 COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release diff --git a/9.1/apache-buster/Dockerfile b/9.1/apache-buster/Dockerfile index 0d3c52d0a..d948f4dd3 100644 --- a/9.1/apache-buster/Dockerfile +++ b/9.1/apache-buster/Dockerfile @@ -56,8 +56,7 @@ RUN { \ echo 'opcache.fast_shutdown=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053 -COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/ +COPY --from=composer:2.0 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release ENV DRUPAL_VERSION 9.1.2 diff --git a/9.1/fpm-alpine3.12/Dockerfile b/9.1/fpm-alpine3.12/Dockerfile index cce3fabc0..92190c140 100644 --- a/9.1/fpm-alpine3.12/Dockerfile +++ b/9.1/fpm-alpine3.12/Dockerfile @@ -46,8 +46,7 @@ RUN { \ echo 'opcache.fast_shutdown=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053 -COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/ +COPY --from=composer:2.0 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release ENV DRUPAL_VERSION 9.1.2 diff --git a/9.1/fpm-buster/Dockerfile b/9.1/fpm-buster/Dockerfile index 87e505334..c40c761bb 100644 --- a/9.1/fpm-buster/Dockerfile +++ b/9.1/fpm-buster/Dockerfile @@ -56,8 +56,7 @@ RUN { \ echo 'opcache.fast_shutdown=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053 -COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/ +COPY --from=composer:2.0 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release ENV DRUPAL_VERSION 9.1.2 diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 7fd2057f6..23c14f22d 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -46,8 +46,7 @@ RUN { \ echo 'opcache.fast_shutdown=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053 -COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/ +COPY --from=composer:%%COMPOSER_VERSION%% /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release ENV DRUPAL_VERSION %%VERSION%% diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index b032e15a3..0d5061545 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -56,8 +56,7 @@ RUN { \ echo 'opcache.fast_shutdown=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053 -COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/ +COPY --from=composer:%%COMPOSER_VERSION%% /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release ENV DRUPAL_VERSION %%VERSION%% diff --git a/update.sh b/update.sh index 88d6c4253..e7f35ed9b 100755 --- a/update.sh +++ b/update.sh @@ -18,6 +18,12 @@ declare -A phpVersions=( [9.0]='7.4' ) +declare -A composerVersions=( + [8.9]='1.10' # https://github.com/drupal/drupal/blob/8.9.12/composer.lock#L4357-L4358 + [9.0]='1.10' # https://github.com/drupal/drupal/blob/9.0.10/composer.lock#L4448-L4449 + [9.1]='2.0' # https://github.com/drupal/drupal/blob/9.1.2/composer.lock#L4730-L4731 +) + for version in "${versions[@]}"; do rcGrepV='-v' rcVersion="${version%-rc}" @@ -68,16 +74,22 @@ for version in "${versions[@]}"; do fi phpImage="${phpVersions[$version]:-$defaultPhpVersion}-$variant" + sedArgs=( + -e 's/%%PHP_VERSION%%/'"${phpImage}"'/' + -e 's/%%VERSION%%/'"$fullVersion"'/' + -e 's/%%MD5%%/'"$md5"'/' + ) + template="Dockerfile-$dist.template" if [ "$version" = '7' ]; then # 7 has no release in drupal/recommended-project # so its Dockerfile is based on the old template template="Dockerfile-7-$dist.template" + else + composerVersion="${composerVersions[$version]}" + sedArgs+=( -e 's/%%COMPOSER_VERSION%%/'"$composerVersion"'/' ) fi - sed -r \ - -e 's/%%PHP_VERSION%%/'"${phpImage}"'/' \ - -e 's/%%VERSION%%/'"$fullVersion"'/' \ - -e 's/%%MD5%%/'"$md5"'/' \ - "$template" > "$version/$variant/Dockerfile" + + sed -r "${sedArgs[@]}" "$template" > "$version/$variant/Dockerfile" done done