Update drupal #9533
Merged
Update drupal #9533
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/drupal@d73ee20: Merge pull request docker-library/drupal#190 from infosiftr/jq-template - docker-library/drupal@488c0c9: Auto-scrape Composer version from upstream composer.lock files - docker-library/drupal@1eca4a1: Add initial jq-based templating engine
Diff for 464768d:diff --git a/_bashbrew-cat b/_bashbrew-cat
index dc0d695..661883d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,62 +1,77 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/drupal.git
-Tags: 7.78-apache-buster, 7-apache-buster, 7.78-apache, 7-apache, 7.78, 7
+Tags: 7.78-php7.4-apache-buster, 7-php7.4-apache-buster, 7.78-php7.4-apache, 7-php7.4-apache, 7.78-apache-buster, 7-apache-buster, 7.78-apache, 7-apache, 7.78, 7, 7.78-php7.4, 7-php7.4
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b10ebf1064f777db1bd0a2212bd0c55d0bec9649
-Directory: 7/apache-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 7/php7.4/apache-buster
-Tags: 7.78-fpm-alpine3.12, 7-fpm-alpine3.12, 7.78-fpm-alpine, 7-fpm-alpine
+Tags: 7.78-php7.4-fpm-alpine3.12, 7-php7.4-fpm-alpine3.12, 7.78-php7.4-fpm-alpine, 7-php7.4-fpm-alpine, 7.78-fpm-alpine3.12, 7-fpm-alpine3.12, 7.78-fpm-alpine, 7-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b10ebf1064f777db1bd0a2212bd0c55d0bec9649
-Directory: 7/fpm-alpine3.12
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 7/php7.4/fpm-alpine3.12
-Tags: 7.78-fpm-buster, 7-fpm-buster, 7.78-fpm, 7-fpm
+Tags: 7.78-php7.4-fpm-buster, 7-php7.4-fpm-buster, 7.78-php7.4-fpm, 7-php7.4-fpm, 7.78-fpm-buster, 7-fpm-buster, 7.78-fpm, 7-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b10ebf1064f777db1bd0a2212bd0c55d0bec9649
-Directory: 7/fpm-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 7/php7.4/fpm-buster
-Tags: 8.9.13-apache-buster, 8.9-apache-buster, 8-apache-buster, 8.9.13-apache, 8.9-apache, 8-apache, 8.9.13, 8.9, 8
+Tags: 8.9.13-php7.4-apache-buster, 8.9-php7.4-apache-buster, 8-php7.4-apache-buster, 8.9.13-php7.4-apache, 8.9-php7.4-apache, 8-php7.4-apache, 8.9.13-apache-buster, 8.9-apache-buster, 8-apache-buster, 8.9.13-apache, 8.9-apache, 8-apache, 8.9.13, 8.9, 8, 8.9.13-php7.4, 8.9-php7.4, 8-php7.4
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 537d74ca9b9851e5de4dce362e35d6daf8727154
-Directory: 8.9/apache-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 8.9/php7.4/apache-buster
-Tags: 8.9.13-fpm-alpine3.12, 8.9-fpm-alpine3.12, 8-fpm-alpine3.12, 8.9.13-fpm-alpine, 8.9-fpm-alpine, 8-fpm-alpine
+Tags: 8.9.13-php7.4-fpm-alpine3.12, 8.9-php7.4-fpm-alpine3.12, 8-php7.4-fpm-alpine3.12, 8.9.13-php7.4-fpm-alpine, 8.9-php7.4-fpm-alpine, 8-php7.4-fpm-alpine, 8.9.13-fpm-alpine3.12, 8.9-fpm-alpine3.12, 8-fpm-alpine3.12, 8.9.13-fpm-alpine, 8.9-fpm-alpine, 8-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 537d74ca9b9851e5de4dce362e35d6daf8727154
-Directory: 8.9/fpm-alpine3.12
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 8.9/php7.4/fpm-alpine3.12
-Tags: 8.9.13-fpm-buster, 8.9-fpm-buster, 8-fpm-buster, 8.9.13-fpm, 8.9-fpm, 8-fpm
+Tags: 8.9.13-php7.4-fpm-buster, 8.9-php7.4-fpm-buster, 8-php7.4-fpm-buster, 8.9.13-php7.4-fpm, 8.9-php7.4-fpm, 8-php7.4-fpm, 8.9.13-fpm-buster, 8.9-fpm-buster, 8-fpm-buster, 8.9.13-fpm, 8.9-fpm, 8-fpm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 537d74ca9b9851e5de4dce362e35d6daf8727154
-Directory: 8.9/fpm-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 8.9/php7.4/fpm-buster
-Tags: 9.0.11-apache-buster, 9.0-apache-buster, 9.0.11-apache, 9.0-apache, 9.0.11, 9.0
+Tags: 9.0.11-php7.4-apache-buster, 9.0-php7.4-apache-buster, 9.0.11-php7.4-apache, 9.0-php7.4-apache, 9.0.11-apache-buster, 9.0-apache-buster, 9.0.11-apache, 9.0-apache, 9.0.11, 9.0, 9.0.11-php7.4, 9.0-php7.4
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4ec63d38beb91ce90f585a0cfa2547d31872f9a8
-Directory: 9.0/apache-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.0/php7.4/apache-buster
-Tags: 9.0.11-fpm-alpine3.12, 9.0-fpm-alpine3.12, 9.0.11-fpm-alpine, 9.0-fpm-alpine
+Tags: 9.0.11-php7.4-fpm-alpine3.12, 9.0-php7.4-fpm-alpine3.12, 9.0.11-php7.4-fpm-alpine, 9.0-php7.4-fpm-alpine, 9.0.11-fpm-alpine3.12, 9.0-fpm-alpine3.12, 9.0.11-fpm-alpine, 9.0-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4ec63d38beb91ce90f585a0cfa2547d31872f9a8
-Directory: 9.0/fpm-alpine3.12
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.0/php7.4/fpm-alpine3.12
-Tags: 9.0.11-fpm-buster, 9.0-fpm-buster, 9.0.11-fpm, 9.0-fpm
+Tags: 9.0.11-php7.4-fpm-buster, 9.0-php7.4-fpm-buster, 9.0.11-php7.4-fpm, 9.0-php7.4-fpm, 9.0.11-fpm-buster, 9.0-fpm-buster, 9.0.11-fpm, 9.0-fpm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4ec63d38beb91ce90f585a0cfa2547d31872f9a8
-Directory: 9.0/fpm-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.0/php7.4/fpm-buster
-Tags: 9.1.3-apache-buster, 9.1-apache-buster, 9-apache-buster, apache-buster, 9.1.3-apache, 9.1-apache, 9-apache, apache, 9.1.3, 9.1, 9, latest
+Tags: 9.1.3-php7.4-apache-buster, 9.1-php7.4-apache-buster, 9-php7.4-apache-buster, php7.4-apache-buster, 9.1.3-php7.4-apache, 9.1-php7.4-apache, 9-php7.4-apache, php7.4-apache
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: dac9cf49b9c58b834014ba4cd5ccc9cbcb9319ba
-Directory: 9.1/apache-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.1/php7.4/apache-buster
-Tags: 9.1.3-fpm-alpine3.12, 9.1-fpm-alpine3.12, 9-fpm-alpine3.12, fpm-alpine3.12, 9.1.3-fpm-alpine, 9.1-fpm-alpine, 9-fpm-alpine, fpm-alpine
+Tags: 9.1.3-php7.4-fpm-alpine3.12, 9.1-php7.4-fpm-alpine3.12, 9-php7.4-fpm-alpine3.12, php7.4-fpm-alpine3.12, 9.1.3-php7.4-fpm-alpine, 9.1-php7.4-fpm-alpine, 9-php7.4-fpm-alpine, php7.4-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: dac9cf49b9c58b834014ba4cd5ccc9cbcb9319ba
-Directory: 9.1/fpm-alpine3.12
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.1/php7.4/fpm-alpine3.12
-Tags: 9.1.3-fpm-buster, 9.1-fpm-buster, 9-fpm-buster, fpm-buster, 9.1.3-fpm, 9.1-fpm, 9-fpm, fpm
+Tags: 9.1.3-php7.4-fpm-buster, 9.1-php7.4-fpm-buster, 9-php7.4-fpm-buster, php7.4-fpm-buster, 9.1.3-php7.4-fpm, 9.1-php7.4-fpm, 9-php7.4-fpm, php7.4-fpm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: dac9cf49b9c58b834014ba4cd5ccc9cbcb9319ba
-Directory: 9.1/fpm-buster
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.1/php7.4/fpm-buster
+
+Tags: 9.1.3-php8.0-apache-buster, 9.1-php8.0-apache-buster, 9-php8.0-apache-buster, php8.0-apache-buster, 9.1.3-php8.0-apache, 9.1-php8.0-apache, 9-php8.0-apache, php8.0-apache, 9.1.3-apache-buster, 9.1-apache-buster, 9-apache-buster, apache-buster, 9.1.3-apache, 9.1-apache, 9-apache, apache, 9.1.3, 9.1, 9, latest, 9.1.3-php8.0, 9.1-php8.0, 9-php8.0, php8.0
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.1/php8.0/apache-buster
+
+Tags: 9.1.3-php8.0-fpm-alpine3.12, 9.1-php8.0-fpm-alpine3.12, 9-php8.0-fpm-alpine3.12, php8.0-fpm-alpine3.12, 9.1.3-php8.0-fpm-alpine, 9.1-php8.0-fpm-alpine, 9-php8.0-fpm-alpine, php8.0-fpm-alpine, 9.1.3-fpm-alpine3.12, 9.1-fpm-alpine3.12, 9-fpm-alpine3.12, fpm-alpine3.12, 9.1.3-fpm-alpine, 9.1-fpm-alpine, 9-fpm-alpine, fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.1/php8.0/fpm-alpine3.12
+
+Tags: 9.1.3-php8.0-fpm-buster, 9.1-php8.0-fpm-buster, 9-php8.0-fpm-buster, php8.0-fpm-buster, 9.1.3-php8.0-fpm, 9.1-php8.0-fpm, 9-php8.0-fpm, php8.0-fpm, 9.1.3-fpm-buster, 9.1-fpm-buster, 9-fpm-buster, fpm-buster, 9.1.3-fpm, 9.1-fpm, 9-fpm, fpm
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 1eca4a1de50210dce5d1b443e002e728a838f6b6
+Directory: 9.1/php8.0/fpm-buster
diff --git a/_bashbrew-list b/_bashbrew-list
index cdc00db..8b39c82 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -5,6 +5,13 @@ drupal:7-fpm
drupal:7-fpm-alpine
drupal:7-fpm-alpine3.12
drupal:7-fpm-buster
+drupal:7-php7.4
+drupal:7-php7.4-apache
+drupal:7-php7.4-apache-buster
+drupal:7-php7.4-fpm
+drupal:7-php7.4-fpm-alpine
+drupal:7-php7.4-fpm-alpine3.12
+drupal:7-php7.4-fpm-buster
drupal:7.78
drupal:7.78-apache
drupal:7.78-apache-buster
@@ -12,6 +19,13 @@ drupal:7.78-fpm
drupal:7.78-fpm-alpine
drupal:7.78-fpm-alpine3.12
drupal:7.78-fpm-buster
+drupal:7.78-php7.4
+drupal:7.78-php7.4-apache
+drupal:7.78-php7.4-apache-buster
+drupal:7.78-php7.4-fpm
+drupal:7.78-php7.4-fpm-alpine
+drupal:7.78-php7.4-fpm-alpine3.12
+drupal:7.78-php7.4-fpm-buster
drupal:8
drupal:8-apache
drupal:8-apache-buster
@@ -19,6 +33,13 @@ drupal:8-fpm
drupal:8-fpm-alpine
drupal:8-fpm-alpine3.12
drupal:8-fpm-buster
+drupal:8-php7.4
+drupal:8-php7.4-apache
+drupal:8-php7.4-apache-buster
+drupal:8-php7.4-fpm
+drupal:8-php7.4-fpm-alpine
+drupal:8-php7.4-fpm-alpine3.12
+drupal:8-php7.4-fpm-buster
drupal:8.9
drupal:8.9-apache
drupal:8.9-apache-buster
@@ -26,6 +47,13 @@ drupal:8.9-fpm
drupal:8.9-fpm-alpine
drupal:8.9-fpm-alpine3.12
drupal:8.9-fpm-buster
+drupal:8.9-php7.4
+drupal:8.9-php7.4-apache
+drupal:8.9-php7.4-apache-buster
+drupal:8.9-php7.4-fpm
+drupal:8.9-php7.4-fpm-alpine
+drupal:8.9-php7.4-fpm-alpine3.12
+drupal:8.9-php7.4-fpm-buster
drupal:8.9.13
drupal:8.9.13-apache
drupal:8.9.13-apache-buster
@@ -33,6 +61,13 @@ drupal:8.9.13-fpm
drupal:8.9.13-fpm-alpine
drupal:8.9.13-fpm-alpine3.12
drupal:8.9.13-fpm-buster
+drupal:8.9.13-php7.4
+drupal:8.9.13-php7.4-apache
+drupal:8.9.13-php7.4-apache-buster
+drupal:8.9.13-php7.4-fpm
+drupal:8.9.13-php7.4-fpm-alpine
+drupal:8.9.13-php7.4-fpm-alpine3.12
+drupal:8.9.13-php7.4-fpm-buster
drupal:9
drupal:9-apache
drupal:9-apache-buster
@@ -40,6 +75,19 @@ drupal:9-fpm
drupal:9-fpm-alpine
drupal:9-fpm-alpine3.12
drupal:9-fpm-buster
+drupal:9-php7.4-apache
+drupal:9-php7.4-apache-buster
+drupal:9-php7.4-fpm
+drupal:9-php7.4-fpm-alpine
+drupal:9-php7.4-fpm-alpine3.12
+drupal:9-php7.4-fpm-buster
+drupal:9-php8.0
+drupal:9-php8.0-apache
+drupal:9-php8.0-apache-buster
+drupal:9-php8.0-fpm
+drupal:9-php8.0-fpm-alpine
+drupal:9-php8.0-fpm-alpine3.12
+drupal:9-php8.0-fpm-buster
drupal:9.0
drupal:9.0-apache
drupal:9.0-apache-buster
@@ -47,6 +95,13 @@ drupal:9.0-fpm
drupal:9.0-fpm-alpine
drupal:9.0-fpm-alpine3.12
drupal:9.0-fpm-buster
+drupal:9.0-php7.4
+drupal:9.0-php7.4-apache
+drupal:9.0-php7.4-apache-buster
+drupal:9.0-php7.4-fpm
+drupal:9.0-php7.4-fpm-alpine
+drupal:9.0-php7.4-fpm-alpine3.12
+drupal:9.0-php7.4-fpm-buster
drupal:9.0.11
drupal:9.0.11-apache
drupal:9.0.11-apache-buster
@@ -54,6 +109,13 @@ drupal:9.0.11-fpm
drupal:9.0.11-fpm-alpine
drupal:9.0.11-fpm-alpine3.12
drupal:9.0.11-fpm-buster
+drupal:9.0.11-php7.4
+drupal:9.0.11-php7.4-apache
+drupal:9.0.11-php7.4-apache-buster
+drupal:9.0.11-php7.4-fpm
+drupal:9.0.11-php7.4-fpm-alpine
+drupal:9.0.11-php7.4-fpm-alpine3.12
+drupal:9.0.11-php7.4-fpm-buster
drupal:9.1
drupal:9.1-apache
drupal:9.1-apache-buster
@@ -61,6 +123,19 @@ drupal:9.1-fpm
drupal:9.1-fpm-alpine
drupal:9.1-fpm-alpine3.12
drupal:9.1-fpm-buster
+drupal:9.1-php7.4-apache
+drupal:9.1-php7.4-apache-buster
+drupal:9.1-php7.4-fpm
+drupal:9.1-php7.4-fpm-alpine
+drupal:9.1-php7.4-fpm-alpine3.12
+drupal:9.1-php7.4-fpm-buster
+drupal:9.1-php8.0
+drupal:9.1-php8.0-apache
+drupal:9.1-php8.0-apache-buster
+drupal:9.1-php8.0-fpm
+drupal:9.1-php8.0-fpm-alpine
+drupal:9.1-php8.0-fpm-alpine3.12
+drupal:9.1-php8.0-fpm-buster
drupal:9.1.3
drupal:9.1.3-apache
drupal:9.1.3-apache-buster
@@ -68,6 +143,19 @@ drupal:9.1.3-fpm
drupal:9.1.3-fpm-alpine
drupal:9.1.3-fpm-alpine3.12
drupal:9.1.3-fpm-buster
+drupal:9.1.3-php7.4-apache
+drupal:9.1.3-php7.4-apache-buster
+drupal:9.1.3-php7.4-fpm
+drupal:9.1.3-php7.4-fpm-alpine
+drupal:9.1.3-php7.4-fpm-alpine3.12
+drupal:9.1.3-php7.4-fpm-buster
+drupal:9.1.3-php8.0
+drupal:9.1.3-php8.0-apache
+drupal:9.1.3-php8.0-apache-buster
+drupal:9.1.3-php8.0-fpm
+drupal:9.1.3-php8.0-fpm-alpine
+drupal:9.1.3-php8.0-fpm-alpine3.12
+drupal:9.1.3-php8.0-fpm-buster
drupal:apache
drupal:apache-buster
drupal:fpm
@@ -75,3 +163,16 @@ drupal:fpm-alpine
drupal:fpm-alpine3.12
drupal:fpm-buster
drupal:latest
+drupal:php7.4-apache
+drupal:php7.4-apache-buster
+drupal:php7.4-fpm
+drupal:php7.4-fpm-alpine
+drupal:php7.4-fpm-alpine3.12
+drupal:php7.4-fpm-buster
+drupal:php8.0
+drupal:php8.0-apache
+drupal:php8.0-apache-buster
+drupal:php8.0-fpm
+drupal:php8.0-fpm-alpine
+drupal:php8.0-fpm-alpine3.12
+drupal:php8.0-fpm-buster
diff --git a/drupal_7-fpm-alpine/Dockerfile b/drupal_7-fpm-alpine/Dockerfile
index 617579f..122ba0f 100644
--- a/drupal_7-fpm-alpine/Dockerfile
+++ b/drupal_7-fpm-alpine/Dockerfile
@@ -1,8 +1,13 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-fpm-alpine3.12
# 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 \
@@ -11,6 +16,7 @@ RUN set -eux; \
libjpeg-turbo-dev \
libpng-dev \
libzip-dev \
+# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
postgresql-dev \
; \
\
@@ -33,8 +39,8 @@ RUN set -eux; \
| 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
+ apk add --no-network --virtual .drupal-phpexts-rundeps $runDeps; \
+ apk del --no-network .build-deps
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
diff --git a/drupal_7-fpm/Dockerfile b/drupal_7-fpm/Dockerfile
index f8310dd..7ca2806 100644
--- a/drupal_7-fpm/Dockerfile
+++ b/drupal_7-fpm/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-fpm-buster
diff --git a/drupal_7/Dockerfile b/drupal_7-php7.4/Dockerfile
similarity index 94%
rename from drupal_7/Dockerfile
rename to drupal_7-php7.4/Dockerfile
index 9b93180..26d7cbc 100644
--- a/drupal_7/Dockerfile
+++ b/drupal_7-php7.4/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-apache-buster
diff --git a/drupal_8-fpm-alpine/Dockerfile b/drupal_8-fpm-alpine/Dockerfile
index 037d006..4f3e5df 100644
--- a/drupal_8-fpm-alpine/Dockerfile
+++ b/drupal_8-fpm-alpine/Dockerfile
@@ -1,8 +1,13 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-fpm-alpine3.12
# 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 \
@@ -11,6 +16,7 @@ RUN set -eux; \
libjpeg-turbo-dev \
libpng-dev \
libzip-dev \
+# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
postgresql-dev \
; \
\
@@ -33,8 +39,8 @@ RUN set -eux; \
| 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
+ apk add --no-network --virtual .drupal-phpexts-rundeps $runDeps; \
+ apk del --no-network .build-deps
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
diff --git a/drupal_8-fpm/Dockerfile b/drupal_8-fpm/Dockerfile
index de408c0..ce35cee 100644
--- a/drupal_8-fpm/Dockerfile
+++ b/drupal_8-fpm/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-fpm-buster
diff --git a/drupal_8/Dockerfile b/drupal_8-php7.4/Dockerfile
similarity index 95%
rename from drupal_8/Dockerfile
rename to drupal_8-php7.4/Dockerfile
index b4c32fb..7a25c5e 100644
--- a/drupal_8/Dockerfile
+++ b/drupal_8-php7.4/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-apache-buster
diff --git a/drupal_9.0-fpm-alpine/Dockerfile b/drupal_9.0-fpm-alpine/Dockerfile
index 4b320fc..61173ab 100644
--- a/drupal_9.0-fpm-alpine/Dockerfile
+++ b/drupal_9.0-fpm-alpine/Dockerfile
@@ -1,8 +1,13 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-fpm-alpine3.12
# 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 \
@@ -11,6 +16,7 @@ RUN set -eux; \
libjpeg-turbo-dev \
libpng-dev \
libzip-dev \
+# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
postgresql-dev \
; \
\
@@ -33,8 +39,8 @@ RUN set -eux; \
| 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
+ apk add --no-network --virtual .drupal-phpexts-rundeps $runDeps; \
+ apk del --no-network .build-deps
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
diff --git a/drupal_9.0-fpm/Dockerfile b/drupal_9.0-fpm/Dockerfile
index c6acb06..4b28502 100644
--- a/drupal_9.0-fpm/Dockerfile
+++ b/drupal_9.0-fpm/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-fpm-buster
diff --git a/drupal_9.0/Dockerfile b/drupal_9.0-php7.4/Dockerfile
similarity index 95%
rename from drupal_9.0/Dockerfile
rename to drupal_9.0-php7.4/Dockerfile
index 3fa3b5b..b025da3 100644
--- a/drupal_9.0/Dockerfile
+++ b/drupal_9.0-php7.4/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-apache-buster
diff --git a/drupal_fpm-alpine/Dockerfile b/drupal_fpm-alpine/Dockerfile
index a808059..056637f 100644
--- a/drupal_fpm-alpine/Dockerfile
+++ b/drupal_fpm-alpine/Dockerfile
@@ -1,8 +1,13 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:8.0-fpm-alpine3.12
# 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 \
@@ -11,6 +16,7 @@ RUN set -eux; \
libjpeg-turbo-dev \
libpng-dev \
libzip-dev \
+# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
postgresql-dev \
; \
\
@@ -33,8 +39,8 @@ RUN set -eux; \
| 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
+ apk add --no-network --virtual .drupal-phpexts-rundeps $runDeps; \
+ apk del --no-network .build-deps
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
diff --git a/drupal_fpm/Dockerfile b/drupal_fpm/Dockerfile
index abb50f7..3477c8c 100644
--- a/drupal_fpm/Dockerfile
+++ b/drupal_fpm/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:8.0-fpm-buster
diff --git a/drupal_fpm/Dockerfile b/drupal_php7.4-apache/Dockerfile
similarity index 93%
copy from drupal_fpm/Dockerfile
copy to drupal_php7.4-apache/Dockerfile
index abb50f7..66e09b8 100644
--- a/drupal_fpm/Dockerfile
+++ b/drupal_php7.4-apache/Dockerfile
@@ -1,5 +1,11 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-fpm-buster
+FROM php:7.4-apache-buster
# install the PHP extensions we need
RUN set -eux; \
diff --git a/drupal_fpm-alpine/Dockerfile b/drupal_php7.4-fpm-alpine/Dockerfile
similarity index 87%
copy from drupal_fpm-alpine/Dockerfile
copy to drupal_php7.4-fpm-alpine/Dockerfile
index a808059..5ab6492 100644
--- a/drupal_fpm-alpine/Dockerfile
+++ b/drupal_php7.4-fpm-alpine/Dockerfile
@@ -1,8 +1,13 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-fpm-alpine3.12
+FROM php:7.4-fpm-alpine3.12
# 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 \
@@ -11,6 +16,7 @@ RUN set -eux; \
libjpeg-turbo-dev \
libpng-dev \
libzip-dev \
+# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
postgresql-dev \
; \
\
@@ -33,8 +39,8 @@ RUN set -eux; \
| 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
+ apk add --no-network --virtual .drupal-phpexts-rundeps $runDeps; \
+ apk del --no-network .build-deps
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
diff --git a/drupal_fpm/Dockerfile b/drupal_php7.4-fpm/Dockerfile
similarity index 93%
copy from drupal_fpm/Dockerfile
copy to drupal_php7.4-fpm/Dockerfile
index abb50f7..76d59e5 100644
--- a/drupal_fpm/Dockerfile
+++ b/drupal_php7.4-fpm/Dockerfile
@@ -1,5 +1,11 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-fpm-buster
+FROM php:7.4-fpm-buster
# install the PHP extensions we need
RUN set -eux; \
diff --git a/drupal_latest/Dockerfile b/drupal_php8.0/Dockerfile
similarity index 95%
rename from drupal_latest/Dockerfile
rename to drupal_php8.0/Dockerfile
index f687b7c..87ce007 100644
--- a/drupal_latest/Dockerfile
+++ b/drupal_php8.0/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:8.0-apache-buster
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: