Merge pull request #188 from skyred/patch-38

tianon · web-flow · commit a0d1097902b2 · 2021-01-07T13:40:41.000-08:00
Use the correct default composer version for 9.1.x version or above
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
