Skip to content

Update php #8631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Aug 31, 2020
Merged

Update php #8631

merged 1 commit into from
Aug 31, 2020

Conversation

tianon
Copy link
Member

@tianon tianon commented Aug 29, 2020

Changes:

@docker-library-bot
Update php
604fa1f 
Changes:

- docker-library/php@2f5aa9a: Merge pull request docker-library/php#1052 from infosiftr/jq-template
- docker-library/php@165f8ca: Add initial jq-based templating engine
- docker-library/php@b44c4f1: Merge pull request docker-library/php#1011 from docker-library/github-actions
- docker-library/php@5dc2907: Add initial GitHub Actions CI
@github-actions
Copy link

Diff for 604fa1f: 
TODO diff too large for GitHub comment!
See: http://github.com/docker-library/official-images/actions/runs/229499011

@yosifkit
Copy link
Member

Diff: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7c9f1d8..45be50c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,220 +3,220 @@ GitRepo: https://github.com/docker-library/php.git
 
 Tags: 7.2.33-apache-buster, 7.2-apache-buster, 7.2.33-apache, 7.2-apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8663909bd06cb1695dcdbbff21c4d393afb30557
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.2/buster/apache
 
 Tags: 7.2.33-apache-stretch, 7.2-apache-stretch
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386
-GitCommit: 8663909bd06cb1695dcdbbff21c4d393afb30557
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.2/stretch/apache
 
 Tags: 7.2.33-cli-alpine3.11, 7.2-cli-alpine3.11, 7.2.33-alpine3.11, 7.2-alpine3.11
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8663909bd06cb1695dcdbbff21c4d393afb30557
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.2/alpine3.11/cli
 
 Tags: 7.2.33-cli-alpine3.12, 7.2-cli-alpine3.12, 7.2.33-alpine3.12, 7.2-alpine3.12, 7.2.33-cli-alpine, 7.2-cli-alpine, 7.2.33-alpine, 7.2-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8663909bd06cb1695dcdbbff21c4d393afb30557
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.2/alpine3.12/cli
 
 Tags: 7.2.33-cli-buster, 7.2-cli-buster, 7.2.33-buster, 7.2-buster, 7.2.33-cli, 7.2-cli, 7.2.33, 7.2
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8663909bd06cb1695dcdbbff21c4d393afb30557
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.2/buster/cli
 
 Tags: 7.2.33-cli-stretch, 7.2-cli-stretch, 7.2.33-stretch, 7.2-stretch
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386
-GitCommit: 8663909bd06cb1695dcdbbff21c4d393afb30557
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.2/stretch/cli
 
 Tags: 7.2.33-fpm-alpine3.11, 7.2-fpm-alpine3.11
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8663909bd06cb1695dcdbbff21c4d393afb30557
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.2/alpine3.11/fpm
 
 Tags: 7.2.33-fpm-alpine3.12, 7.2-fpm-alpine3.12, 7.2.33-fpm-alpine, 7.2-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8663909bd06cb1695dcdbbff21c4d393afb30557
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.2/alpine3.12/fpm
 
 Tags: 7.2.33-fpm-buster, 7.2-fpm-buster, 7.2.33-fpm, 7.2-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8663909bd06cb1695dcdbbff21c4d393afb30557
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.2/buster/fpm
 
 Tags: 7.2.33-fpm-stretch, 7.2-fpm-stretch
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386
-GitCommit: 8663909bd06cb1695dcdbbff21c4d393afb30557
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.2/stretch/fpm
 
 Tags: 7.2.33-zts-alpine3.11, 7.2-zts-alpine3.11
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8663909bd06cb1695dcdbbff21c4d393afb30557
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.2/alpine3.11/zts
 
 Tags: 7.2.33-zts-alpine3.12, 7.2-zts-alpine3.12, 7.2.33-zts-alpine, 7.2-zts-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8663909bd06cb1695dcdbbff21c4d393afb30557
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.2/alpine3.12/zts
 
 Tags: 7.2.33-zts-buster, 7.2-zts-buster, 7.2.33-zts, 7.2-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8663909bd06cb1695dcdbbff21c4d393afb30557
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.2/buster/zts
 
 Tags: 7.2.33-zts-stretch, 7.2-zts-stretch
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386
-GitCommit: 8663909bd06cb1695dcdbbff21c4d393afb30557
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.2/stretch/zts
 
 Tags: 7.3.21-apache-buster, 7.3-apache-buster, 7.3.21-apache, 7.3-apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 098e442542e8a10bdee2c22484a98d41583a8fb9
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.3/buster/apache
 
 Tags: 7.3.21-apache-stretch, 7.3-apache-stretch
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386
-GitCommit: 098e442542e8a10bdee2c22484a98d41583a8fb9
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.3/stretch/apache
 
 Tags: 7.3.21-cli-alpine3.11, 7.3-cli-alpine3.11, 7.3.21-alpine3.11, 7.3-alpine3.11
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 098e442542e8a10bdee2c22484a98d41583a8fb9
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.3/alpine3.11/cli
 
 Tags: 7.3.21-cli-alpine3.12, 7.3-cli-alpine3.12, 7.3.21-alpine3.12, 7.3-alpine3.12, 7.3.21-cli-alpine, 7.3-cli-alpine, 7.3.21-alpine, 7.3-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 098e442542e8a10bdee2c22484a98d41583a8fb9
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.3/alpine3.12/cli
 
 Tags: 7.3.21-cli-buster, 7.3-cli-buster, 7.3.21-buster, 7.3-buster, 7.3.21-cli, 7.3-cli, 7.3.21, 7.3
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 098e442542e8a10bdee2c22484a98d41583a8fb9
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.3/buster/cli
 
 Tags: 7.3.21-cli-stretch, 7.3-cli-stretch, 7.3.21-stretch, 7.3-stretch
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386
-GitCommit: 098e442542e8a10bdee2c22484a98d41583a8fb9
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.3/stretch/cli
 
 Tags: 7.3.21-fpm-alpine3.11, 7.3-fpm-alpine3.11
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 098e442542e8a10bdee2c22484a98d41583a8fb9
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.3/alpine3.11/fpm
 
 Tags: 7.3.21-fpm-alpine3.12, 7.3-fpm-alpine3.12, 7.3.21-fpm-alpine, 7.3-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 098e442542e8a10bdee2c22484a98d41583a8fb9
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.3/alpine3.12/fpm
 
 Tags: 7.3.21-fpm-buster, 7.3-fpm-buster, 7.3.21-fpm, 7.3-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 098e442542e8a10bdee2c22484a98d41583a8fb9
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.3/buster/fpm
 
 Tags: 7.3.21-fpm-stretch, 7.3-fpm-stretch
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386
-GitCommit: 098e442542e8a10bdee2c22484a98d41583a8fb9
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.3/stretch/fpm
 
 Tags: 7.3.21-zts-alpine3.11, 7.3-zts-alpine3.11
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 098e442542e8a10bdee2c22484a98d41583a8fb9
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.3/alpine3.11/zts
 
 Tags: 7.3.21-zts-alpine3.12, 7.3-zts-alpine3.12, 7.3.21-zts-alpine, 7.3-zts-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 098e442542e8a10bdee2c22484a98d41583a8fb9
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.3/alpine3.12/zts
 
 Tags: 7.3.21-zts-buster, 7.3-zts-buster, 7.3.21-zts, 7.3-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 098e442542e8a10bdee2c22484a98d41583a8fb9
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.3/buster/zts
 
 Tags: 7.3.21-zts-stretch, 7.3-zts-stretch
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386
-GitCommit: 098e442542e8a10bdee2c22484a98d41583a8fb9
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.3/stretch/zts
 
 Tags: 7.4.9-apache-buster, 7.4-apache-buster, 7-apache-buster, apache-buster, 7.4.9-apache, 7.4-apache, 7-apache, apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 14a53e7cbf88bd59af72d086418844a3e0b4160a
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.4/buster/apache
 
 Tags: 7.4.9-cli-alpine3.11, 7.4-cli-alpine3.11, 7-cli-alpine3.11, cli-alpine3.11, 7.4.9-alpine3.11, 7.4-alpine3.11, 7-alpine3.11, alpine3.11
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 14a53e7cbf88bd59af72d086418844a3e0b4160a
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.4/alpine3.11/cli
 
 Tags: 7.4.9-cli-alpine3.12, 7.4-cli-alpine3.12, 7-cli-alpine3.12, cli-alpine3.12, 7.4.9-alpine3.12, 7.4-alpine3.12, 7-alpine3.12, alpine3.12, 7.4.9-cli-alpine, 7.4-cli-alpine, 7-cli-alpine, cli-alpine, 7.4.9-alpine, 7.4-alpine, 7-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 14a53e7cbf88bd59af72d086418844a3e0b4160a
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.4/alpine3.12/cli
 
 Tags: 7.4.9-cli-buster, 7.4-cli-buster, 7-cli-buster, cli-buster, 7.4.9-buster, 7.4-buster, 7-buster, buster, 7.4.9-cli, 7.4-cli, 7-cli, cli, 7.4.9, 7.4, 7, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 14a53e7cbf88bd59af72d086418844a3e0b4160a
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.4/buster/cli
 
 Tags: 7.4.9-fpm-alpine3.11, 7.4-fpm-alpine3.11, 7-fpm-alpine3.11, fpm-alpine3.11
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 14a53e7cbf88bd59af72d086418844a3e0b4160a
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.4/alpine3.11/fpm
 
 Tags: 7.4.9-fpm-alpine3.12, 7.4-fpm-alpine3.12, 7-fpm-alpine3.12, fpm-alpine3.12, 7.4.9-fpm-alpine, 7.4-fpm-alpine, 7-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 14a53e7cbf88bd59af72d086418844a3e0b4160a
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.4/alpine3.12/fpm
 
 Tags: 7.4.9-fpm-buster, 7.4-fpm-buster, 7-fpm-buster, fpm-buster, 7.4.9-fpm, 7.4-fpm, 7-fpm, fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 14a53e7cbf88bd59af72d086418844a3e0b4160a
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.4/buster/fpm
 
 Tags: 7.4.9-zts-alpine3.11, 7.4-zts-alpine3.11, 7-zts-alpine3.11, zts-alpine3.11
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 14a53e7cbf88bd59af72d086418844a3e0b4160a
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.4/alpine3.11/zts
 
 Tags: 7.4.9-zts-alpine3.12, 7.4-zts-alpine3.12, 7-zts-alpine3.12, zts-alpine3.12, 7.4.9-zts-alpine, 7.4-zts-alpine, 7-zts-alpine, zts-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 14a53e7cbf88bd59af72d086418844a3e0b4160a
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.4/alpine3.12/zts
 
 Tags: 7.4.9-zts-buster, 7.4-zts-buster, 7-zts-buster, zts-buster, 7.4.9-zts, 7.4-zts, 7-zts, zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 14a53e7cbf88bd59af72d086418844a3e0b4160a
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 7.4/buster/zts
 
 Tags: 8.0.0beta2-apache-buster, 8.0-rc-apache-buster, rc-apache-buster, 8.0.0beta2-apache, 8.0-rc-apache, rc-apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6ae59ac9da022f2d06a9f3cb314da7388213fc55
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 8.0-rc/buster/apache
 
 Tags: 8.0.0beta2-cli-alpine3.12, 8.0-rc-cli-alpine3.12, rc-cli-alpine3.12, 8.0.0beta2-alpine3.12, 8.0-rc-alpine3.12, rc-alpine3.12, 8.0.0beta2-cli-alpine, 8.0-rc-cli-alpine, rc-cli-alpine, 8.0.0beta2-alpine, 8.0-rc-alpine, rc-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 6ae59ac9da022f2d06a9f3cb314da7388213fc55
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 8.0-rc/alpine3.12/cli
 
 Tags: 8.0.0beta2-cli-buster, 8.0-rc-cli-buster, rc-cli-buster, 8.0.0beta2-buster, 8.0-rc-buster, rc-buster, 8.0.0beta2-cli, 8.0-rc-cli, rc-cli, 8.0.0beta2, 8.0-rc, rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6ae59ac9da022f2d06a9f3cb314da7388213fc55
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 8.0-rc/buster/cli
 
 Tags: 8.0.0beta2-fpm-alpine3.12, 8.0-rc-fpm-alpine3.12, rc-fpm-alpine3.12, 8.0.0beta2-fpm-alpine, 8.0-rc-fpm-alpine, rc-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 6ae59ac9da022f2d06a9f3cb314da7388213fc55
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 8.0-rc/alpine3.12/fpm
 
 Tags: 8.0.0beta2-fpm-buster, 8.0-rc-fpm-buster, rc-fpm-buster, 8.0.0beta2-fpm, 8.0-rc-fpm, rc-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6ae59ac9da022f2d06a9f3cb314da7388213fc55
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 8.0-rc/buster/fpm
 
 Tags: 8.0.0beta2-zts-buster, 8.0-rc-zts-buster, rc-zts-buster, 8.0.0beta2-zts, 8.0-rc-zts, rc-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6ae59ac9da022f2d06a9f3cb314da7388213fc55
+GitCommit: 165f8ca09cbbe90f22566c6ad6b18a284b77bb7e
 Directory: 8.0-rc/buster/zts
diff --git a/php_7.2-alpine/Dockerfile b/php_7.2-alpine/Dockerfile
index d6bd122..41488f7 100644
--- a/php_7.2-alpine/Dockerfile
+++ b/php_7.2-alpine/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
-##</autogenerated>##
-
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
@@ -177,6 +174,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -186,6 +184,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_7.2-alpine3.11/Dockerfile b/php_7.2-alpine3.11/Dockerfile
index 7b2b51a..970f5bb 100644
--- a/php_7.2-alpine3.11/Dockerfile
+++ b/php_7.2-alpine3.11/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
-##</autogenerated>##
-
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
@@ -177,6 +174,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -186,6 +184,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_7.2-apache-stretch/Dockerfile b/php_7.2-apache-stretch/Dockerfile
index fa7c1e4..32e2518 100644
--- a/php_7.2-apache-stretch/Dockerfile
+++ b/php_7.2-apache-stretch/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,7 +48,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
 
@@ -109,7 +108,6 @@ RUN { \
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
 ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -166,7 +164,6 @@ COPY docker-php-source /usr/local/bin/
 RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
-##<argon2-stretch>##
 	sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
 	{ \
 		echo 'Package: *'; \
@@ -177,7 +174,6 @@ RUN set -eux; \
 		echo 'Pin: release n=buster*'; \
 		echo 'Pin-Priority: 990'; \
 	} > /etc/apt/preferences.d/argon2-buster; \
-##</argon2-stretch>##
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libargon2-dev \
@@ -270,6 +266,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -279,7 +276,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
 STOPSIGNAL SIGWINCH
 
@@ -288,4 +284,3 @@ WORKDIR /var/www/html
 
 EXPOSE 80
 CMD ["apache2-foreground"]
-##</autogenerated>##
diff --git a/php_7.2-apache/Dockerfile b/php_7.2-apache/Dockerfile
index e0b4f31..9863829 100644
--- a/php_7.2-apache/Dockerfile
+++ b/php_7.2-apache/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,7 +48,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
 
@@ -109,7 +108,6 @@ RUN { \
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
 ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -258,6 +256,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -270,7 +269,6 @@ RUN docker-php-ext-enable sodium
 RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
 STOPSIGNAL SIGWINCH
 
@@ -279,4 +277,3 @@ WORKDIR /var/www/html
 
 EXPOSE 80
 CMD ["apache2-foreground"]
-##</autogenerated>##
diff --git a/php_7.2-fpm-alpine/Dockerfile b/php_7.2-fpm-alpine/Dockerfile
index 672cb1c..f901779 100644
--- a/php_7.2-fpm-alpine/Dockerfile
+++ b/php_7.2-fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -178,6 +176,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -187,7 +186,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 WORKDIR /var/www/html
 
 RUN set -eux; \
@@ -232,4 +230,3 @@ STOPSIGNAL SIGQUIT
 
 EXPOSE 9000
 CMD ["php-fpm"]
-##</autogenerated>##
diff --git a/php_7.2-fpm-alpine3.11/Dockerfile b/php_7.2-fpm-alpine3.11/Dockerfile
index e2fc9c2..7edb9d4 100644
--- a/php_7.2-fpm-alpine3.11/Dockerfile
+++ b/php_7.2-fpm-alpine3.11/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -178,6 +176,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -187,7 +186,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 WORKDIR /var/www/html
 
 RUN set -eux; \
@@ -232,4 +230,3 @@ STOPSIGNAL SIGQUIT
 
 EXPOSE 9000
 CMD ["php-fpm"]
-##</autogenerated>##
diff --git a/php_7.2-fpm-stretch/Dockerfile b/php_7.2-fpm-stretch/Dockerfile
index c9f211f..9832a8a 100644
--- a/php_7.2-fpm-stretch/Dockerfile
+++ b/php_7.2-fpm-stretch/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -107,7 +105,6 @@ COPY docker-php-source /usr/local/bin/
 RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
-##<argon2-stretch>##
 	sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
 	{ \
 		echo 'Package: *'; \
@@ -118,7 +115,6 @@ RUN set -eux; \
 		echo 'Pin: release n=buster*'; \
 		echo 'Pin-Priority: 990'; \
 	} > /etc/apt/preferences.d/argon2-buster; \
-##</argon2-stretch>##
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libargon2-dev \
@@ -211,6 +207,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -220,7 +217,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 WORKDIR /var/www/html
 
 RUN set -eux; \
@@ -265,4 +261,3 @@ STOPSIGNAL SIGQUIT
 
 EXPOSE 9000
 CMD ["php-fpm"]
-##</autogenerated>##
diff --git a/php_7.2-fpm/Dockerfile b/php_7.2-fpm/Dockerfile
index 84c329d..52b320e 100644
--- a/php_7.2-fpm/Dockerfile
+++ b/php_7.2-fpm/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -199,6 +197,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -211,7 +210,6 @@ RUN docker-php-ext-enable sodium
 RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 WORKDIR /var/www/html
 
 RUN set -eux; \
@@ -256,4 +254,3 @@ STOPSIGNAL SIGQUIT
 
 EXPOSE 9000
 CMD ["php-fpm"]
-##</autogenerated>##
diff --git a/php_7.2-stretch/Dockerfile b/php_7.2-stretch/Dockerfile
index 926e687..d1d4d41 100644
--- a/php_7.2-stretch/Dockerfile
+++ b/php_7.2-stretch/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
-##</autogenerated>##
-
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
@@ -106,7 +103,6 @@ COPY docker-php-source /usr/local/bin/
 RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
-##<argon2-stretch>##
 	sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
 	{ \
 		echo 'Package: *'; \
@@ -117,7 +113,6 @@ RUN set -eux; \
 		echo 'Pin: release n=buster*'; \
 		echo 'Pin-Priority: 990'; \
 	} > /etc/apt/preferences.d/argon2-buster; \
-##</argon2-stretch>##
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libargon2-dev \
@@ -210,6 +205,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -219,6 +215,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_7.2-zts-alpine/Dockerfile b/php_7.2-zts-alpine/Dockerfile
index 0adcd56..cf4cb8e 100644
--- a/php_7.2-zts-alpine/Dockerfile
+++ b/php_7.2-zts-alpine/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -178,6 +176,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -187,6 +186,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_7.2-zts-alpine3.11/Dockerfile b/php_7.2-zts-alpine3.11/Dockerfile
index 93bc039..e23b12a 100644
--- a/php_7.2-zts-alpine3.11/Dockerfile
+++ b/php_7.2-zts-alpine3.11/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -178,6 +176,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -187,6 +186,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_7.2-zts-stretch/Dockerfile b/php_7.2-zts-stretch/Dockerfile
index 1c9e316..a81be82 100644
--- a/php_7.2-zts-stretch/Dockerfile
+++ b/php_7.2-zts-stretch/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -107,7 +105,6 @@ COPY docker-php-source /usr/local/bin/
 RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
-##<argon2-stretch>##
 	sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
 	{ \
 		echo 'Package: *'; \
@@ -118,7 +115,6 @@ RUN set -eux; \
 		echo 'Pin: release n=buster*'; \
 		echo 'Pin-Priority: 990'; \
 	} > /etc/apt/preferences.d/argon2-buster; \
-##</argon2-stretch>##
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libargon2-dev \
@@ -211,6 +207,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -220,6 +217,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_7.2-zts/Dockerfile b/php_7.2-zts/Dockerfile
index 5e27986..4389093 100644
--- a/php_7.2-zts/Dockerfile
+++ b/php_7.2-zts/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -199,6 +197,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -211,6 +210,4 @@ RUN docker-php-ext-enable sodium
 RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_7.2/Dockerfile b/php_7.2/Dockerfile
index 111bc0f..879cff1 100644
--- a/php_7.2/Dockerfile
+++ b/php_7.2/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
-##</autogenerated>##
-
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
@@ -198,6 +195,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -210,6 +208,4 @@ RUN docker-php-ext-enable sodium
 RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_7.3-alpine/Dockerfile b/php_7.3-alpine/Dockerfile
index d83c716..3cd1dd7 100644
--- a/php_7.3-alpine/Dockerfile
+++ b/php_7.3-alpine/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
-##</autogenerated>##
-
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
@@ -177,6 +174,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -186,6 +184,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_7.3-alpine3.11/Dockerfile b/php_7.3-alpine3.11/Dockerfile
index 459763b..1143a55 100644
--- a/php_7.3-alpine3.11/Dockerfile
+++ b/php_7.3-alpine3.11/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
-##</autogenerated>##
-
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
@@ -177,6 +174,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -186,6 +184,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_7.3-apache-stretch/Dockerfile b/php_7.3-apache-stretch/Dockerfile
index e4daf4e..1e19a87 100644
--- a/php_7.3-apache-stretch/Dockerfile
+++ b/php_7.3-apache-stretch/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,7 +48,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
 
@@ -109,7 +108,6 @@ RUN { \
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
 ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -166,7 +164,6 @@ COPY docker-php-source /usr/local/bin/
 RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
-##<argon2-stretch>##
 	sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
 	{ \
 		echo 'Package: *'; \
@@ -177,7 +174,6 @@ RUN set -eux; \
 		echo 'Pin: release n=buster*'; \
 		echo 'Pin-Priority: 990'; \
 	} > /etc/apt/preferences.d/argon2-buster; \
-##</argon2-stretch>##
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libargon2-dev \
@@ -270,6 +266,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -279,7 +276,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
 STOPSIGNAL SIGWINCH
 
@@ -288,4 +284,3 @@ WORKDIR /var/www/html
 
 EXPOSE 80
 CMD ["apache2-foreground"]
-##</autogenerated>##
diff --git a/php_7.3-apache/Dockerfile b/php_7.3-apache/Dockerfile
index a62e869..f49970f 100644
--- a/php_7.3-apache/Dockerfile
+++ b/php_7.3-apache/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,7 +48,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
 
@@ -109,7 +108,6 @@ RUN { \
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
 ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -258,6 +256,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -270,7 +269,6 @@ RUN docker-php-ext-enable sodium
 RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
 STOPSIGNAL SIGWINCH
 
@@ -279,4 +277,3 @@ WORKDIR /var/www/html
 
 EXPOSE 80
 CMD ["apache2-foreground"]
-##</autogenerated>##
diff --git a/php_7.3-fpm-alpine/Dockerfile b/php_7.3-fpm-alpine/Dockerfile
index 0078e7e..b0a3317 100644
--- a/php_7.3-fpm-alpine/Dockerfile
+++ b/php_7.3-fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -178,6 +176,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -187,7 +186,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 WORKDIR /var/www/html
 
 RUN set -eux; \
@@ -234,4 +232,3 @@ STOPSIGNAL SIGQUIT
 
 EXPOSE 9000
 CMD ["php-fpm"]
-##</autogenerated>##
diff --git a/php_7.3-fpm-alpine3.11/Dockerfile b/php_7.3-fpm-alpine3.11/Dockerfile
index 795f721..957ead4 100644
--- a/php_7.3-fpm-alpine3.11/Dockerfile
+++ b/php_7.3-fpm-alpine3.11/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -178,6 +176,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -187,7 +186,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 WORKDIR /var/www/html
 
 RUN set -eux; \
@@ -234,4 +232,3 @@ STOPSIGNAL SIGQUIT
 
 EXPOSE 9000
 CMD ["php-fpm"]
-##</autogenerated>##
diff --git a/php_7.3-fpm-stretch/Dockerfile b/php_7.3-fpm-stretch/Dockerfile
index ad8f2cd..5596e13 100644
--- a/php_7.3-fpm-stretch/Dockerfile
+++ b/php_7.3-fpm-stretch/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -107,7 +105,6 @@ COPY docker-php-source /usr/local/bin/
 RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
-##<argon2-stretch>##
 	sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
 	{ \
 		echo 'Package: *'; \
@@ -118,7 +115,6 @@ RUN set -eux; \
 		echo 'Pin: release n=buster*'; \
 		echo 'Pin-Priority: 990'; \
 	} > /etc/apt/preferences.d/argon2-buster; \
-##</argon2-stretch>##
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libargon2-dev \
@@ -211,6 +207,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -220,7 +217,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 WORKDIR /var/www/html
 
 RUN set -eux; \
@@ -267,4 +263,3 @@ STOPSIGNAL SIGQUIT
 
 EXPOSE 9000
 CMD ["php-fpm"]
-##</autogenerated>##
diff --git a/php_7.3-fpm/Dockerfile b/php_7.3-fpm/Dockerfile
index 501861b..91e208b 100644
--- a/php_7.3-fpm/Dockerfile
+++ b/php_7.3-fpm/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -199,6 +197,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -211,7 +210,6 @@ RUN docker-php-ext-enable sodium
 RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 WORKDIR /var/www/html
 
 RUN set -eux; \
@@ -258,4 +256,3 @@ STOPSIGNAL SIGQUIT
 
 EXPOSE 9000
 CMD ["php-fpm"]
-##</autogenerated>##
diff --git a/php_7.3-stretch/Dockerfile b/php_7.3-stretch/Dockerfile
index 71705ce..5437ecc 100644
--- a/php_7.3-stretch/Dockerfile
+++ b/php_7.3-stretch/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
-##</autogenerated>##
-
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
@@ -106,7 +103,6 @@ COPY docker-php-source /usr/local/bin/
 RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
-##<argon2-stretch>##
 	sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
 	{ \
 		echo 'Package: *'; \
@@ -117,7 +113,6 @@ RUN set -eux; \
 		echo 'Pin: release n=buster*'; \
 		echo 'Pin-Priority: 990'; \
 	} > /etc/apt/preferences.d/argon2-buster; \
-##</argon2-stretch>##
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libargon2-dev \
@@ -210,6 +205,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -219,6 +215,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_7.3-zts-alpine/Dockerfile b/php_7.3-zts-alpine/Dockerfile
index 2c4922a..9b37bef 100644
--- a/php_7.3-zts-alpine/Dockerfile
+++ b/php_7.3-zts-alpine/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -178,6 +176,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -187,6 +186,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_7.3-zts-alpine3.11/Dockerfile b/php_7.3-zts-alpine3.11/Dockerfile
index b919664..3652b40 100644
--- a/php_7.3-zts-alpine3.11/Dockerfile
+++ b/php_7.3-zts-alpine3.11/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -178,6 +176,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -187,6 +186,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_7.3-zts-stretch/Dockerfile b/php_7.3-zts-stretch/Dockerfile
index 86e1ddb..b98cb1b 100644
--- a/php_7.3-zts-stretch/Dockerfile
+++ b/php_7.3-zts-stretch/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -107,7 +105,6 @@ COPY docker-php-source /usr/local/bin/
 RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
-##<argon2-stretch>##
 	sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
 	{ \
 		echo 'Package: *'; \
@@ -118,7 +115,6 @@ RUN set -eux; \
 		echo 'Pin: release n=buster*'; \
 		echo 'Pin-Priority: 990'; \
 	} > /etc/apt/preferences.d/argon2-buster; \
-##</argon2-stretch>##
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libargon2-dev \
@@ -211,6 +207,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -220,6 +217,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_7.3-zts/Dockerfile b/php_7.3-zts/Dockerfile
index 2634bb7..f4f5c33 100644
--- a/php_7.3-zts/Dockerfile
+++ b/php_7.3-zts/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -199,6 +197,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -211,6 +210,4 @@ RUN docker-php-ext-enable sodium
 RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_7.3/Dockerfile b/php_7.3/Dockerfile
index c636cc4..fb4b6d5 100644
--- a/php_7.3/Dockerfile
+++ b/php_7.3/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
-##</autogenerated>##
-
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
@@ -198,6 +195,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -210,6 +208,4 @@ RUN docker-php-ext-enable sodium
 RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_alpine/Dockerfile b/php_alpine/Dockerfile
index 84bf7f6..a0ddefd 100644
--- a/php_alpine/Dockerfile
+++ b/php_alpine/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
-##</autogenerated>##
-
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
@@ -148,7 +145,8 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
-# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")
+# ... and are removed in PHP 8+; see also https://github.com/docker-library/php/pull/847#issuecomment-505638229
 		--with-pear \
 		\
 # bundled pcre does not support JIT on s390x
@@ -182,6 +180,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -191,6 +190,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_alpine3.11/Dockerfile b/php_alpine3.11/Dockerfile
index 71ec897..dff11aa 100644
--- a/php_alpine3.11/Dockerfile
+++ b/php_alpine3.11/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
-##</autogenerated>##
-
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
@@ -148,7 +145,8 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
-# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")
+# ... and are removed in PHP 8+; see also https://github.com/docker-library/php/pull/847#issuecomment-505638229
 		--with-pear \
 		\
 # bundled pcre does not support JIT on s390x
@@ -182,6 +180,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -191,6 +190,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_apache/Dockerfile b/php_apache/Dockerfile
index 04cb18e..f733d53 100644
--- a/php_apache/Dockerfile
+++ b/php_apache/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,7 +48,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
 
@@ -109,7 +108,6 @@ RUN { \
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
 ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -224,7 +222,8 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
-# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")
+# ... and are removed in PHP 8+; see also https://github.com/docker-library/php/pull/847#issuecomment-505638229
 		--with-pear \
 		\
 # bundled pcre does not support JIT on s390x
@@ -262,6 +261,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -271,7 +271,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
 STOPSIGNAL SIGWINCH
 
@@ -280,4 +279,3 @@ WORKDIR /var/www/html
 
 EXPOSE 80
 CMD ["apache2-foreground"]
-##</autogenerated>##
diff --git a/php_fpm-alpine/Dockerfile b/php_fpm-alpine/Dockerfile
index 8edb5ef..09ba509 100644
--- a/php_fpm-alpine/Dockerfile
+++ b/php_fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -149,7 +147,8 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
-# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")
+# ... and are removed in PHP 8+; see also https://github.com/docker-library/php/pull/847#issuecomment-505638229
 		--with-pear \
 		\
 # bundled pcre does not support JIT on s390x
@@ -183,6 +182,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -192,7 +192,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 WORKDIR /var/www/html
 
 RUN set -eux; \
@@ -239,4 +238,3 @@ STOPSIGNAL SIGQUIT
 
 EXPOSE 9000
 CMD ["php-fpm"]
-##</autogenerated>##
diff --git a/php_fpm-alpine3.11/Dockerfile b/php_fpm-alpine3.11/Dockerfile
index 6668b5e..7cb5aa7 100644
--- a/php_fpm-alpine3.11/Dockerfile
+++ b/php_fpm-alpine3.11/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -149,7 +147,8 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
-# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")
+# ... and are removed in PHP 8+; see also https://github.com/docker-library/php/pull/847#issuecomment-505638229
 		--with-pear \
 		\
 # bundled pcre does not support JIT on s390x
@@ -183,6 +182,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -192,7 +192,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 WORKDIR /var/www/html
 
 RUN set -eux; \
@@ -239,4 +238,3 @@ STOPSIGNAL SIGQUIT
 
 EXPOSE 9000
 CMD ["php-fpm"]
-##</autogenerated>##
diff --git a/php_fpm/Dockerfile b/php_fpm/Dockerfile
index af5108a..ba9ac12 100644
--- a/php_fpm/Dockerfile
+++ b/php_fpm/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -165,7 +163,8 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
-# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")
+# ... and are removed in PHP 8+; see also https://github.com/docker-library/php/pull/847#issuecomment-505638229
 		--with-pear \
 		\
 # bundled pcre does not support JIT on s390x
@@ -203,6 +202,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -212,7 +212,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 WORKDIR /var/www/html
 
 RUN set -eux; \
@@ -259,4 +258,3 @@ STOPSIGNAL SIGQUIT
 
 EXPOSE 9000
 CMD ["php-fpm"]
-##</autogenerated>##
diff --git a/php_latest/Dockerfile b/php_latest/Dockerfile
index e8aa36b..bc1bbdb 100644
--- a/php_latest/Dockerfile
+++ b/php_latest/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
-##</autogenerated>##
-
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
@@ -164,7 +161,8 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
-# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")
+# ... and are removed in PHP 8+; see also https://github.com/docker-library/php/pull/847#issuecomment-505638229
 		--with-pear \
 		\
 # bundled pcre does not support JIT on s390x
@@ -202,6 +200,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -211,6 +210,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_rc-alpine/Dockerfile b/php_rc-alpine/Dockerfile
index 82876a9..d111a4c 100644
--- a/php_rc-alpine/Dockerfile
+++ b/php_rc-alpine/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
-##</autogenerated>##
-
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
@@ -185,6 +182,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_rc-apache/Dockerfile b/php_rc-apache/Dockerfile
index be77944..682c73b 100644
--- a/php_rc-apache/Dockerfile
+++ b/php_rc-apache/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,7 +48,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
 
@@ -109,7 +108,6 @@ RUN { \
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
 ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -265,7 +263,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
 STOPSIGNAL SIGWINCH
 
@@ -274,4 +271,3 @@ WORKDIR /var/www/html
 
 EXPOSE 80
 CMD ["apache2-foreground"]
-##</autogenerated>##
diff --git a/php_rc-fpm-alpine/Dockerfile b/php_rc-fpm-alpine/Dockerfile
index e5c3e97..77dbe7c 100644
--- a/php_rc-fpm-alpine/Dockerfile
+++ b/php_rc-fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -186,7 +184,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 WORKDIR /var/www/html
 
 RUN set -eux; \
@@ -233,4 +230,3 @@ STOPSIGNAL SIGQUIT
 
 EXPOSE 9000
 CMD ["php-fpm"]
-##</autogenerated>##
diff --git a/php_rc-fpm/Dockerfile b/php_rc-fpm/Dockerfile
index 405e4f0..b65eb19 100644
--- a/php_rc-fpm/Dockerfile
+++ b/php_rc-fpm/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -206,7 +204,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 WORKDIR /var/www/html
 
 RUN set -eux; \
@@ -253,4 +250,3 @@ STOPSIGNAL SIGQUIT
 
 EXPOSE 9000
 CMD ["php-fpm"]
-##</autogenerated>##
diff --git a/php_rc-zts/Dockerfile b/php_rc-zts/Dockerfile
index 8a58be5..840babe 100644
--- a/php_rc-zts/Dockerfile
+++ b/php_rc-zts/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-zts --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -206,6 +204,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_rc/Dockerfile b/php_rc/Dockerfile
index 34e3eb2..7801a25 100644
--- a/php_rc/Dockerfile
+++ b/php_rc/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,6 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
-##</autogenerated>##
-
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
 # Enable optimization (-O2)
@@ -205,6 +202,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_zts-alpine/Dockerfile b/php_zts-alpine/Dockerfile
index 46ca829..dd9e21f 100644
--- a/php_zts-alpine/Dockerfile
+++ b/php_zts-alpine/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -149,7 +147,8 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
-# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")
+# ... and are removed in PHP 8+; see also https://github.com/docker-library/php/pull/847#issuecomment-505638229
 		--with-pear \
 		\
 # bundled pcre does not support JIT on s390x
@@ -183,6 +182,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -192,6 +192,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_zts-alpine3.11/Dockerfile b/php_zts-alpine3.11/Dockerfile
index d1429e8..4149f13 100644
--- a/php_zts-alpine3.11/Dockerfile
+++ b/php_zts-alpine3.11/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -46,9 +46,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -149,7 +147,8 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
-# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")
+# ... and are removed in PHP 8+; see also https://github.com/docker-library/php/pull/847#issuecomment-505638229
 		--with-pear \
 		\
 # bundled pcre does not support JIT on s390x
@@ -183,6 +182,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -192,6 +192,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/php_zts/Dockerfile b/php_zts/Dockerfile
index 6d0e505..c4c3c1a 100644
--- a/php_zts/Dockerfile
+++ b/php_zts/Dockerfile
@@ -1,5 +1,5 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
@@ -48,9 +48,7 @@ RUN set -eux; \
 	chown www-data:www-data /var/www/html; \
 	chmod 777 /var/www/html
 
-##<autogenerated>##
 ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
@@ -165,7 +163,8 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
-# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")
+# ... and are removed in PHP 8+; see also https://github.com/docker-library/php/pull/847#issuecomment-505638229
 		--with-pear \
 		\
 # bundled pcre does not support JIT on s390x
@@ -203,6 +202,7 @@ RUN set -eux; \
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
 	rm -rf /tmp/pear ~/.pearrc; \
+	\
 # smoke test
 	php --version
 
@@ -212,6 +212,4 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
 CMD ["php", "-a"]
-##</autogenerated>##

@yosifkit yosifkit merged commit 19d61a9 into docker-library:master Aug 31, 2020
@yosifkit yosifkit deleted the php branch August 31, 2020 23:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/php
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tianon @yosifkit @docker-library-bot