Keep templates for 7, minor 8&9 fixes

yosifkit · yosifkit · commit 4a5ce8db5c29 · 2020-08-03T15:46:14.000-07:00
diff --git a/7/apache-buster/Dockerfile b/7/apache-buster/Dockerfile
@@ -56,8 +56,6 @@ RUN { \
 		echo 'opcache.fast_shutdown=1'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-WORKDIR /var/www/html
-
 # https://www.drupal.org/node/3060/release
 ENV DRUPAL_VERSION 7.72
 ENV DRUPAL_MD5 ed967195ce0e78bf2ab7245aaf0649d6
diff --git a/7/fpm-alpine3.12/Dockerfile b/7/fpm-alpine3.12/Dockerfile
@@ -46,8 +46,6 @@ RUN { \
 		echo 'opcache.fast_shutdown=1'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-WORKDIR /var/www/html
-
 # https://www.drupal.org/node/3060/release
 ENV DRUPAL_VERSION 7.72
 ENV DRUPAL_MD5 ed967195ce0e78bf2ab7245aaf0649d6
diff --git a/7/fpm-buster/Dockerfile b/7/fpm-buster/Dockerfile
@@ -56,8 +56,6 @@ RUN { \
 		echo 'opcache.fast_shutdown=1'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-WORKDIR /var/www/html
-
 # https://www.drupal.org/node/3060/release
 ENV DRUPAL_VERSION 7.72
 ENV DRUPAL_MD5 ed967195ce0e78bf2ab7245aaf0649d6
diff --git a/8.8/apache-buster/Dockerfile b/8.8/apache-buster/Dockerfile
@@ -68,11 +68,10 @@ RUN set -eux; \
 	rmdir /var/www/html; \
 	composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
 	sed -i 's!web/!html/!g' composer.json; \
-	composer install; \
+	composer install --no-interaction; \
 	cd html; \
 	chown -R www-data:www-data sites modules themes; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
-WORKDIR /var/www/html
 # vim:set ft=dockerfile:
diff --git a/8.8/fpm-alpine3.12/Dockerfile b/8.8/fpm-alpine3.12/Dockerfile
@@ -58,11 +58,10 @@ RUN set -eux; \
 	rmdir /var/www/html; \
 	composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
 	sed -i 's!web/!html/!g' composer.json; \
-	composer install; \
+	composer install --no-interaction; \
 	cd html; \
 	chown -R www-data:www-data sites modules themes; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
-WORKDIR /var/www/html
 # vim:set ft=dockerfile:
diff --git a/8.8/fpm-buster/Dockerfile b/8.8/fpm-buster/Dockerfile
@@ -68,11 +68,10 @@ RUN set -eux; \
 	rmdir /var/www/html; \
 	composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
 	sed -i 's!web/!html/!g' composer.json; \
-	composer install; \
+	composer install --no-interaction; \
 	cd html; \
 	chown -R www-data:www-data sites modules themes; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
-WORKDIR /var/www/html
 # vim:set ft=dockerfile:
diff --git a/8.9/apache-buster/Dockerfile b/8.9/apache-buster/Dockerfile
@@ -68,11 +68,10 @@ RUN set -eux; \
 	rmdir /var/www/html; \
 	composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
 	sed -i 's!web/!html/!g' composer.json; \
-	composer install; \
+	composer install --no-interaction; \
 	cd html; \
 	chown -R www-data:www-data sites modules themes; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
-WORKDIR /var/www/html
 # vim:set ft=dockerfile:
diff --git a/8.9/fpm-alpine3.12/Dockerfile b/8.9/fpm-alpine3.12/Dockerfile
@@ -58,11 +58,10 @@ RUN set -eux; \
 	rmdir /var/www/html; \
 	composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
 	sed -i 's!web/!html/!g' composer.json; \
-	composer install; \
+	composer install --no-interaction; \
 	cd html; \
 	chown -R www-data:www-data sites modules themes; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
-WORKDIR /var/www/html
 # vim:set ft=dockerfile:
diff --git a/8.9/fpm-buster/Dockerfile b/8.9/fpm-buster/Dockerfile
@@ -68,11 +68,10 @@ RUN set -eux; \
 	rmdir /var/www/html; \
 	composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
 	sed -i 's!web/!html/!g' composer.json; \
-	composer install; \
+	composer install --no-interaction; \
 	cd html; \
 	chown -R www-data:www-data sites modules themes; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
-WORKDIR /var/www/html
 # vim:set ft=dockerfile:
diff --git a/9.0/apache-buster/Dockerfile b/9.0/apache-buster/Dockerfile
@@ -68,11 +68,10 @@ RUN set -eux; \
 	rmdir /var/www/html; \
 	composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
 	sed -i 's!web/!html/!g' composer.json; \
-	composer install; \
+	composer install --no-interaction; \
 	cd html; \
 	chown -R www-data:www-data sites modules themes; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
-WORKDIR /var/www/html
 # vim:set ft=dockerfile:
diff --git a/9.0/fpm-alpine3.12/Dockerfile b/9.0/fpm-alpine3.12/Dockerfile
@@ -58,11 +58,10 @@ RUN set -eux; \
 	rmdir /var/www/html; \
 	composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
 	sed -i 's!web/!html/!g' composer.json; \
-	composer install; \
+	composer install --no-interaction; \
 	cd html; \
 	chown -R www-data:www-data sites modules themes; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
-WORKDIR /var/www/html
 # vim:set ft=dockerfile:
diff --git a/9.0/fpm-buster/Dockerfile b/9.0/fpm-buster/Dockerfile
@@ -68,11 +68,10 @@ RUN set -eux; \
 	rmdir /var/www/html; \
 	composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
 	sed -i 's!web/!html/!g' composer.json; \
-	composer install; \
+	composer install --no-interaction; \
 	cd html; \
 	chown -R www-data:www-data sites modules themes; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
-WORKDIR /var/www/html
 # vim:set ft=dockerfile:
diff --git a/Dockerfile-7-alpine.template b/Dockerfile-7-alpine.template
@@ -0,0 +1,60 @@
+# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
+FROM php:%%PHP_VERSION%%
+
+# install the PHP extensions we need
+# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
+RUN set -eux; \
+	\
+	apk add --no-cache --virtual .build-deps \
+		coreutils \
+		freetype-dev \
+		libjpeg-turbo-dev \
+		libpng-dev \
+		libzip-dev \
+		postgresql-dev \
+	; \
+	\
+	docker-php-ext-configure gd \
+		--with-freetype \
+		--with-jpeg=/usr/include \
+	; \
+	\
+	docker-php-ext-install -j "$(nproc)" \
+		gd \
+		opcache \
+		pdo_mysql \
+		pdo_pgsql \
+		zip \
+	; \
+	\
+	runDeps="$( \
+		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
+			| tr ',' '\n' \
+			| sort -u \
+			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+	)"; \
+	apk add --virtual .drupal-phpexts-rundeps $runDeps; \
+	apk del .build-deps
+
+# set recommended PHP.ini settings
+# see https://secure.php.net/manual/en/opcache.installation.php
+RUN { \
+		echo 'opcache.memory_consumption=128'; \
+		echo 'opcache.interned_strings_buffer=8'; \
+		echo 'opcache.max_accelerated_files=4000'; \
+		echo 'opcache.revalidate_freq=60'; \
+		echo 'opcache.fast_shutdown=1'; \
+	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+
+# https://www.drupal.org/node/3060/release
+ENV DRUPAL_VERSION %%VERSION%%
+ENV DRUPAL_MD5 %%MD5%%
+
+RUN set -eux; \
+	curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
+	tar -xz --strip-components=1 -f drupal.tar.gz; \
+	rm drupal.tar.gz; \
+	chown -R www-data:www-data sites modules themes
+
+# vim:set ft=dockerfile:
diff --git a/Dockerfile-7-debian.template b/Dockerfile-7-debian.template
@@ -0,0 +1,70 @@
+# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
+FROM php:%%PHP_VERSION%%
+
+# install the PHP extensions we need
+RUN set -eux; \
+	\
+	if command -v a2enmod; then \
+		a2enmod rewrite; \
+	fi; \
+	\
+	savedAptMark="$(apt-mark showmanual)"; \
+	\
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		libfreetype6-dev \
+		libjpeg-dev \
+		libpng-dev \
+		libpq-dev \
+		libzip-dev \
+	; \
+	\
+	docker-php-ext-configure gd \
+		--with-freetype \
+		--with-jpeg=/usr \
+	; \
+	\
+	docker-php-ext-install -j "$(nproc)" \
+		gd \
+		opcache \
+		pdo_mysql \
+		pdo_pgsql \
+		zip \
+	; \
+	\
+# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+	apt-mark auto '.*' > /dev/null; \
+	apt-mark manual $savedAptMark; \
+	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+		| awk '/=>/ { print $3 }' \
+		| sort -u \
+		| xargs -r dpkg-query -S \
+		| cut -d: -f1 \
+		| sort -u \
+		| xargs -rt apt-mark manual; \
+	\
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*
+
+# set recommended PHP.ini settings
+# see https://secure.php.net/manual/en/opcache.installation.php
+RUN { \
+		echo 'opcache.memory_consumption=128'; \
+		echo 'opcache.interned_strings_buffer=8'; \
+		echo 'opcache.max_accelerated_files=4000'; \
+		echo 'opcache.revalidate_freq=60'; \
+		echo 'opcache.fast_shutdown=1'; \
+	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+
+# https://www.drupal.org/node/3060/release
+ENV DRUPAL_VERSION %%VERSION%%
+ENV DRUPAL_MD5 %%MD5%%
+
+RUN set -eux; \
+	curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
+	tar -xz --strip-components=1 -f drupal.tar.gz; \
+	rm drupal.tar.gz; \
+	chown -R www-data:www-data sites modules themes
+
+# vim:set ft=dockerfile:
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -58,11 +58,10 @@ RUN set -eux; \
 	rmdir /var/www/html; \
 	composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
 	sed -i 's!web/!html/!g' composer.json; \
-	composer install; \
+	composer install --no-interaction; \
 	cd html; \
 	chown -R www-data:www-data sites modules themes; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
-WORKDIR /var/www/html
 # vim:set ft=dockerfile:
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -68,11 +68,10 @@ RUN set -eux; \
 	rmdir /var/www/html; \
 	composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
 	sed -i 's!web/!html/!g' composer.json; \
-	composer install; \
+	composer install --no-interaction; \
 	cd html; \
 	chown -R www-data:www-data sites modules themes; \
 	# delete composer cache
 	rm -rf "$COMPOSER_HOME"
 
-WORKDIR /var/www/html
 # vim:set ft=dockerfile:
diff --git a/update.sh b/update.sh
@@ -29,13 +29,12 @@ for version in "${versions[@]}"; do
 			drupalRelease="${rcVersion%%.*}.x"
 			;;
 		9.*)
-			# there is no "9.x" or `9.0.x` endpoint
+			# there is no https://updates.drupal.org/release-history/drupal/9.x (or 9.0.x)
 			# (07/2020) current could also be used for 8.7, 8.8, 8.9, 9.0, 9.1
 			drupalRelease='current'
 			;;
 	esac
 
-	fullVersion=
 	fullVersion="$(
 		wget -qO- "https://updates.drupal.org/release-history/drupal/$drupalRelease" \
 			| awk -v RS='[<>]' '
@@ -57,10 +56,7 @@ for version in "${versions[@]}"; do
 	md5="${fullVersion##* }"
 	fullVersion="${fullVersion% $md5}"
 
-	if [ "$version" != '7' ]; then
-		md5='composer'
-	fi
-	echo "$version: $fullVersion ($md5)"
+	echo "$version: $fullVersion"
 
 	for variant in {apache,fpm}-buster fpm-alpine3.12; do
 		[ -e "$version/$variant" ] || continue
@@ -70,19 +66,16 @@ for version in "${versions[@]}"; do
 		fi
 
 		phpImage="${phpVersions[$version]:-$defaultPhpVersion}-$variant"
+		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
-			sed -ri \
-				-e 's/^(FROM php:).*$/\1'"${phpImage}"'/' \
-				-e 's/^(ENV DRUPAL_VERSION ).*$/\1'"$fullVersion"'/' \
-				-e 's/^(ENV DRUPAL_MD5 ).*$/\1'"$md5"'/' \
-			"$version/$variant/Dockerfile"
-		else
-			sed -r \
-				-e 's/%%PHP_VERSION%%/'"${phpImage}"'/' \
-				-e 's/%%VERSION%%/'"$fullVersion"'/' \
-			"./Dockerfile-$dist.template" > "$version/$variant/Dockerfile"
+			template="Dockerfile-7-$dist.template"
 		fi
+		sed -r \
+			-e 's/%%PHP_VERSION%%/'"${phpImage}"'/' \
+			-e 's/%%VERSION%%/'"$fullVersion"'/' \
+			-e 's/%%MD5%%/'"$md5"'/' \
+		"$template" > "$version/$variant/Dockerfile"
 	done
 done
