Update wordpress #9388
Merged
Update wordpress #9388
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/wordpress@f6444fd: Merge pull request docker-library/wordpress#554 from infosiftr/jq-template - docker-library/wordpress@af6cc1c: Move .htaccess to the Dockerfile (and update it) - docker-library/wordpress@fe3078d: Add initial jq-based templating engine
Diff for dbbbaaf:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 66c5d03..5c44bc3 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,40 +3,40 @@ GitRepo: https://github.com/docker-library/wordpress.git
Tags: 5.6.0-apache, 5.6-apache, 5-apache, apache, 5.6.0, 5.6, 5, latest, 5.6.0-php7.4-apache, 5.6-php7.4-apache, 5-php7.4-apache, php7.4-apache, 5.6.0-php7.4, 5.6-php7.4, 5-php7.4, php7.4
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 5b53a06ca346a2396f2e0373959314c5c9c73e04
-Directory: php7.4/apache
+GitCommit: af6cc1c9637878a7d3c59c1a451f202533189b96
+Directory: latest/php7.4/apache
Tags: 5.6.0-fpm, 5.6-fpm, 5-fpm, fpm, 5.6.0-php7.4-fpm, 5.6-php7.4-fpm, 5-php7.4-fpm, php7.4-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 5b53a06ca346a2396f2e0373959314c5c9c73e04
-Directory: php7.4/fpm
+GitCommit: af6cc1c9637878a7d3c59c1a451f202533189b96
+Directory: latest/php7.4/fpm
Tags: 5.6.0-fpm-alpine, 5.6-fpm-alpine, 5-fpm-alpine, fpm-alpine, 5.6.0-php7.4-fpm-alpine, 5.6-php7.4-fpm-alpine, 5-php7.4-fpm-alpine, php7.4-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 5b53a06ca346a2396f2e0373959314c5c9c73e04
-Directory: php7.4/fpm-alpine
+GitCommit: af6cc1c9637878a7d3c59c1a451f202533189b96
+Directory: latest/php7.4/fpm-alpine
Tags: 5.6.0-php7.3-apache, 5.6-php7.3-apache, 5-php7.3-apache, php7.3-apache, 5.6.0-php7.3, 5.6-php7.3, 5-php7.3, php7.3
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 5b53a06ca346a2396f2e0373959314c5c9c73e04
-Directory: php7.3/apache
+GitCommit: af6cc1c9637878a7d3c59c1a451f202533189b96
+Directory: latest/php7.3/apache
Tags: 5.6.0-php7.3-fpm, 5.6-php7.3-fpm, 5-php7.3-fpm, php7.3-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 5b53a06ca346a2396f2e0373959314c5c9c73e04
-Directory: php7.3/fpm
+GitCommit: af6cc1c9637878a7d3c59c1a451f202533189b96
+Directory: latest/php7.3/fpm
Tags: 5.6.0-php7.3-fpm-alpine, 5.6-php7.3-fpm-alpine, 5-php7.3-fpm-alpine, php7.3-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 5b53a06ca346a2396f2e0373959314c5c9c73e04
-Directory: php7.3/fpm-alpine
+GitCommit: af6cc1c9637878a7d3c59c1a451f202533189b96
+Directory: latest/php7.3/fpm-alpine
Tags: cli-2.4.0, cli-2.4, cli-2, cli, cli-2.4.0-php7.4, cli-2.4-php7.4, cli-2-php7.4, cli-php7.4
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c0d11ed412fef07e748a5463041b7be0b5755dd6
-Directory: php7.4/cli
+GitCommit: fe3078d7544bd0bd77e30e1121988234f426dff9
+Directory: cli/php7.4/alpine
Tags: cli-2.4.0-php7.3, cli-2.4-php7.3, cli-2-php7.3, cli-php7.3
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c0d11ed412fef07e748a5463041b7be0b5755dd6
-Directory: php7.3/cli
+GitCommit: fe3078d7544bd0bd77e30e1121988234f426dff9
+Directory: cli/php7.3/alpine
diff --git a/wordpress_cli-php7.3/Dockerfile b/wordpress_cli-php7.3/Dockerfile
index b9d56a1..b05e59a 100644
--- a/wordpress_cli-php7.3/Dockerfile
+++ b/wordpress_cli-php7.3/Dockerfile
@@ -1,5 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM php:7.3-alpine
+# install wp-cli dependencies
+RUN apk add --no-cache \
+# bash is needed for 'wp shell': https://github.com/wp-cli/shell-command/blob/b8dafcc2a2eba5732fdee70be077675a302848e9/src/WP_CLI/REPL.php#L104
+ bash \
+ less \
+ mysql-client
+
+RUN set -ex; \
+ mkdir -p /var/www/html; \
+ chown -R www-data:www-data /var/www/html
+WORKDIR /var/www/html
+
# install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions)
RUN set -ex; \
\
@@ -12,7 +30,11 @@ RUN set -ex; \
libzip-dev \
; \
\
- docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
+ docker-php-ext-configure gd \
+ --with-freetype-dir=/usr \
+ --with-jpeg-dir=/usr \
+ --with-png-dir=/usr \
+ ; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
exif \
@@ -29,8 +51,8 @@ RUN set -ex; \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)"; \
- apk add --virtual .wordpress-phpexts-rundeps $runDeps; \
- apk del .build-deps
+ apk add --no-network --virtual .wordpress-phpexts-rundeps $runDeps; \
+ apk del --no-network .build-deps
# set recommended PHP.ini settings
# excluding opcache due https://github.com/docker-library/wordpress/issues/407
@@ -49,18 +71,6 @@ RUN { \
echo 'html_errors = Off'; \
} > /usr/local/etc/php/conf.d/error-logging.ini
-# install wp-cli dependencies
-RUN apk add --no-cache \
-# bash is needed for 'wp shell': https://github.com/wp-cli/shell-command/blob/b8dafcc2a2eba5732fdee70be077675a302848e9/src/WP_CLI/REPL.php#L104
- bash \
- less \
- mysql-client
-
-RUN set -ex; \
- mkdir -p /var/www/html; \
- chown -R www-data:www-data /var/www/html
-WORKDIR /var/www/html
-
# https://make.wordpress.org/cli/2018/05/31/gpg-signature-change/
# pub rsa2048 2018-05-31 [SC]
# 63AF 7AA1 5067 C056 16FD DD88 A3A2 E8F2 26F0 BC06
@@ -77,18 +87,18 @@ RUN set -ex; \
gnupg \
; \
\
- curl -o /usr/local/bin/wp.gpg -fSL "https://github.com/wp-cli/wp-cli/releases/download/v${WORDPRESS_CLI_VERSION}/wp-cli-${WORDPRESS_CLI_VERSION}.phar.gpg"; \
+ curl -o /usr/local/bin/wp.gpg -fL "https://github.com/wp-cli/wp-cli/releases/download/v${WORDPRESS_CLI_VERSION}/wp-cli-${WORDPRESS_CLI_VERSION}.phar.gpg"; \
\
- export GNUPGHOME="$(mktemp -d)"; \
+ GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \
gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \
- command -v gpgconf && gpgconf --kill all || :; \
- rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \
+ gpgconf --kill all; \
+ rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; unset GNUPGHOME; \
\
echo "$WORDPRESS_CLI_SHA512 */usr/local/bin/wp" | sha512sum -c -; \
chmod +x /usr/local/bin/wp; \
\
- apk del .fetch-deps; \
+ apk del --no-network .fetch-deps; \
\
wp --allow-root --version
diff --git a/wordpress_cli-php7.4/Dockerfile b/wordpress_cli-php7.4/Dockerfile
index 4e784dd..5902fe7 100644
--- a/wordpress_cli-php7.4/Dockerfile
+++ b/wordpress_cli-php7.4/Dockerfile
@@ -1,5 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM php:7.4-alpine
+# install wp-cli dependencies
+RUN apk add --no-cache \
+# bash is needed for 'wp shell': https://github.com/wp-cli/shell-command/blob/b8dafcc2a2eba5732fdee70be077675a302848e9/src/WP_CLI/REPL.php#L104
+ bash \
+ less \
+ mysql-client
+
+RUN set -ex; \
+ mkdir -p /var/www/html; \
+ chown -R www-data:www-data /var/www/html
+WORKDIR /var/www/html
+
# install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions)
RUN set -ex; \
\
@@ -12,7 +30,10 @@ RUN set -ex; \
libzip-dev \
; \
\
- docker-php-ext-configure gd --with-freetype --with-jpeg; \
+ docker-php-ext-configure gd \
+ --with-freetype \
+ --with-jpeg \
+ ; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
exif \
@@ -29,8 +50,8 @@ RUN set -ex; \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)"; \
- apk add --virtual .wordpress-phpexts-rundeps $runDeps; \
- apk del .build-deps
+ apk add --no-network --virtual .wordpress-phpexts-rundeps $runDeps; \
+ apk del --no-network .build-deps
# set recommended PHP.ini settings
# excluding opcache due https://github.com/docker-library/wordpress/issues/407
@@ -49,18 +70,6 @@ RUN { \
echo 'html_errors = Off'; \
} > /usr/local/etc/php/conf.d/error-logging.ini
-# install wp-cli dependencies
-RUN apk add --no-cache \
-# bash is needed for 'wp shell': https://github.com/wp-cli/shell-command/blob/b8dafcc2a2eba5732fdee70be077675a302848e9/src/WP_CLI/REPL.php#L104
- bash \
- less \
- mysql-client
-
-RUN set -ex; \
- mkdir -p /var/www/html; \
- chown -R www-data:www-data /var/www/html
-WORKDIR /var/www/html
-
# https://make.wordpress.org/cli/2018/05/31/gpg-signature-change/
# pub rsa2048 2018-05-31 [SC]
# 63AF 7AA1 5067 C056 16FD DD88 A3A2 E8F2 26F0 BC06
@@ -77,18 +86,18 @@ RUN set -ex; \
gnupg \
; \
\
- curl -o /usr/local/bin/wp.gpg -fSL "https://github.com/wp-cli/wp-cli/releases/download/v${WORDPRESS_CLI_VERSION}/wp-cli-${WORDPRESS_CLI_VERSION}.phar.gpg"; \
+ curl -o /usr/local/bin/wp.gpg -fL "https://github.com/wp-cli/wp-cli/releases/download/v${WORDPRESS_CLI_VERSION}/wp-cli-${WORDPRESS_CLI_VERSION}.phar.gpg"; \
\
- export GNUPGHOME="$(mktemp -d)"; \
+ GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \
gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \
- command -v gpgconf && gpgconf --kill all || :; \
- rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \
+ gpgconf --kill all; \
+ rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; unset GNUPGHOME; \
\
echo "$WORDPRESS_CLI_SHA512 */usr/local/bin/wp" | sha512sum -c -; \
chmod +x /usr/local/bin/wp; \
\
- apk del .fetch-deps; \
+ apk del --no-network .fetch-deps; \
\
wp --allow-root --version
diff --git a/wordpress_php7.3-fpm-alpine/Dockerfile b/wordpress_php7.3-fpm-alpine/Dockerfile
index 23b1536..faa5697 100644
--- a/wordpress_php7.3-fpm-alpine/Dockerfile
+++ b/wordpress_php7.3-fpm-alpine/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM php:7.3-fpm-alpine
# persistent dependencies
@@ -23,7 +29,11 @@ RUN set -ex; \
libzip-dev \
; \
\
- docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
+ docker-php-ext-configure gd \
+ --with-freetype-dir=/usr \
+ --with-jpeg-dir=/usr \
+ --with-png-dir=/usr \
+ ; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
exif \
@@ -40,8 +50,8 @@ RUN set -ex; \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)"; \
- apk add --virtual .wordpress-phpexts-rundeps $runDeps; \
- apk del .build-deps
+ apk add --no-network --virtual .wordpress-phpexts-rundeps $runDeps; \
+ apk del --no-network .build-deps
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
@@ -69,16 +79,33 @@ RUN { \
echo 'html_errors = Off'; \
} > /usr/local/etc/php/conf.d/error-logging.ini
-
-ENV WORDPRESS_VERSION 5.6
-ENV WORDPRESS_SHA1 db8b75bfc9de27490434b365c12fd805ca6784ce
-
-RUN set -ex; \
- curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \
- echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c -; \
+RUN set -eux; \
+ version='5.6'; \
+ sha1='db8b75bfc9de27490434b365c12fd805ca6784ce'; \
+ \
+ curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
+ echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
+ \
# upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
tar -xzf wordpress.tar.gz -C /usr/src/; \
rm wordpress.tar.gz; \
+ \
+# https://wordpress.org/support/article/htaccess/
+ [ ! -e /usr/src/wordpress/.htaccess ]; \
+ { \
+ echo '# BEGIN WordPress'; \
+ echo ''; \
+ echo 'RewriteEngine On'; \
+ echo 'RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]'; \
+ echo 'RewriteBase /'; \
+ echo 'RewriteRule ^index\.php$ - [L]'; \
+ echo 'RewriteCond %{REQUEST_FILENAME} !-f'; \
+ echo 'RewriteCond %{REQUEST_FILENAME} !-d'; \
+ echo 'RewriteRule . /index.php [L]'; \
+ echo ''; \
+ echo '# END WordPress'; \
+ } > /usr/src/wordpress/.htaccess; \
+ \
chown -R www-data:www-data /usr/src/wordpress; \
# pre-create wp-content (and single-level children) for folks who want to bind-mount themes, etc so permissions are pre-created properly instead of root:root
# wp-content/cache: https://github.com/docker-library/wordpress/issues/534#issuecomment-705733507
diff --git a/wordpress_php7.3-fpm-alpine/docker-entrypoint.sh b/wordpress_php7.3-fpm-alpine/docker-entrypoint.sh
index 8878d3e..6a40c02 100755
--- a/wordpress_php7.3-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_php7.3-fpm-alpine/docker-entrypoint.sh
@@ -82,22 +82,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
done
tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}"
echo >&2 "Complete! WordPress has been successfully copied to $PWD"
- if [ ! -e .htaccess ]; then
- # NOTE: The "Indexes" option is disabled in the php:apache base image
- cat > .htaccess <<-'EOF'
- # BEGIN WordPress
- <IfModule mod_rewrite.c>
- RewriteEngine On
- RewriteBase /
- RewriteRule ^index\.php$ - [L]
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule . /index.php [L]
- </IfModule>
- # END WordPress
- EOF
- chown "$user:$group" .htaccess
- fi
fi
# allow any of these "Authentication Unique Keys and Salts." to be specified via
diff --git a/wordpress_php7.3-fpm/Dockerfile b/wordpress_php7.3-fpm/Dockerfile
index 5504dba..4351bc4 100644
--- a/wordpress_php7.3-fpm/Dockerfile
+++ b/wordpress_php7.3-fpm/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM php:7.3-fpm
# persistent dependencies
@@ -23,7 +29,11 @@ RUN set -ex; \
libzip-dev \
; \
\
- docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
+ docker-php-ext-configure gd \
+ --with-freetype-dir=/usr \
+ --with-jpeg-dir=/usr \
+ --with-png-dir=/usr \
+ ; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
exif \
@@ -74,16 +84,33 @@ RUN { \
echo 'html_errors = Off'; \
} > /usr/local/etc/php/conf.d/error-logging.ini
-
-ENV WORDPRESS_VERSION 5.6
-ENV WORDPRESS_SHA1 db8b75bfc9de27490434b365c12fd805ca6784ce
-
-RUN set -ex; \
- curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \
- echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c -; \
+RUN set -eux; \
+ version='5.6'; \
+ sha1='db8b75bfc9de27490434b365c12fd805ca6784ce'; \
+ \
+ curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
+ echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
+ \
# upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
tar -xzf wordpress.tar.gz -C /usr/src/; \
rm wordpress.tar.gz; \
+ \
+# https://wordpress.org/support/article/htaccess/
+ [ ! -e /usr/src/wordpress/.htaccess ]; \
+ { \
+ echo '# BEGIN WordPress'; \
+ echo ''; \
+ echo 'RewriteEngine On'; \
+ echo 'RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]'; \
+ echo 'RewriteBase /'; \
+ echo 'RewriteRule ^index\.php$ - [L]'; \
+ echo 'RewriteCond %{REQUEST_FILENAME} !-f'; \
+ echo 'RewriteCond %{REQUEST_FILENAME} !-d'; \
+ echo 'RewriteRule . /index.php [L]'; \
+ echo ''; \
+ echo '# END WordPress'; \
+ } > /usr/src/wordpress/.htaccess; \
+ \
chown -R www-data:www-data /usr/src/wordpress; \
# pre-create wp-content (and single-level children) for folks who want to bind-mount themes, etc so permissions are pre-created properly instead of root:root
# wp-content/cache: https://github.com/docker-library/wordpress/issues/534#issuecomment-705733507
diff --git a/wordpress_php7.3-fpm/docker-entrypoint.sh b/wordpress_php7.3-fpm/docker-entrypoint.sh
index 8878d3e..6a40c02 100755
--- a/wordpress_php7.3-fpm/docker-entrypoint.sh
+++ b/wordpress_php7.3-fpm/docker-entrypoint.sh
@@ -82,22 +82,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
done
tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}"
echo >&2 "Complete! WordPress has been successfully copied to $PWD"
- if [ ! -e .htaccess ]; then
- # NOTE: The "Indexes" option is disabled in the php:apache base image
- cat > .htaccess <<-'EOF'
- # BEGIN WordPress
- <IfModule mod_rewrite.c>
- RewriteEngine On
- RewriteBase /
- RewriteRule ^index\.php$ - [L]
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule . /index.php [L]
- </IfModule>
- # END WordPress
- EOF
- chown "$user:$group" .htaccess
- fi
fi
# allow any of these "Authentication Unique Keys and Salts." to be specified via
diff --git a/wordpress_php7.3/Dockerfile b/wordpress_php7.3/Dockerfile
index d3666ef..76401c5 100644
--- a/wordpress_php7.3/Dockerfile
+++ b/wordpress_php7.3/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM php:7.3-apache
# persistent dependencies
@@ -23,7 +29,11 @@ RUN set -ex; \
libzip-dev \
; \
\
- docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
+ docker-php-ext-configure gd \
+ --with-freetype-dir=/usr \
+ --with-jpeg-dir=/usr \
+ --with-png-dir=/usr \
+ ; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
exif \
@@ -93,16 +103,33 @@ RUN set -eux; \
# (replace all instances of "%h" with "%a" in LogFormat)
find /etc/apache2 -type f -name '*.conf' -exec sed -ri 's/([[:space:]]*LogFormat[[:space:]]+"[^"]*)%h([^"]*")/\1%a\2/g' '{}' +
-
-ENV WORDPRESS_VERSION 5.6
-ENV WORDPRESS_SHA1 db8b75bfc9de27490434b365c12fd805ca6784ce
-
-RUN set -ex; \
- curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \
- echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c -; \
+RUN set -eux; \
+ version='5.6'; \
+ sha1='db8b75bfc9de27490434b365c12fd805ca6784ce'; \
+ \
+ curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
+ echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
+ \
# upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
tar -xzf wordpress.tar.gz -C /usr/src/; \
rm wordpress.tar.gz; \
+ \
+# https://wordpress.org/support/article/htaccess/
+ [ ! -e /usr/src/wordpress/.htaccess ]; \
+ { \
+ echo '# BEGIN WordPress'; \
+ echo ''; \
+ echo 'RewriteEngine On'; \
+ echo 'RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]'; \
+ echo 'RewriteBase /'; \
+ echo 'RewriteRule ^index\.php$ - [L]'; \
+ echo 'RewriteCond %{REQUEST_FILENAME} !-f'; \
+ echo 'RewriteCond %{REQUEST_FILENAME} !-d'; \
+ echo 'RewriteRule . /index.php [L]'; \
+ echo ''; \
+ echo '# END WordPress'; \
+ } > /usr/src/wordpress/.htaccess; \
+ \
chown -R www-data:www-data /usr/src/wordpress; \
# pre-create wp-content (and single-level children) for folks who want to bind-mount themes, etc so permissions are pre-created properly instead of root:root
# wp-content/cache: https://github.com/docker-library/wordpress/issues/534#issuecomment-705733507
diff --git a/wordpress_php7.3/docker-entrypoint.sh b/wordpress_php7.3/docker-entrypoint.sh
index 8878d3e..6a40c02 100755
--- a/wordpress_php7.3/docker-entrypoint.sh
+++ b/wordpress_php7.3/docker-entrypoint.sh
@@ -82,22 +82,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
done
tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}"
echo >&2 "Complete! WordPress has been successfully copied to $PWD"
- if [ ! -e .htaccess ]; then
- # NOTE: The "Indexes" option is disabled in the php:apache base image
- cat > .htaccess <<-'EOF'
- # BEGIN WordPress
- <IfModule mod_rewrite.c>
- RewriteEngine On
- RewriteBase /
- RewriteRule ^index\.php$ - [L]
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule . /index.php [L]
- </IfModule>
- # END WordPress
- EOF
- chown "$user:$group" .htaccess
- fi
fi
# allow any of these "Authentication Unique Keys and Salts." to be specified via
diff --git a/wordpress_php7.4-fpm-alpine/Dockerfile b/wordpress_php7.4-fpm-alpine/Dockerfile
index e0c1f9d..6c2ed0f 100644
--- a/wordpress_php7.4-fpm-alpine/Dockerfile
+++ b/wordpress_php7.4-fpm-alpine/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM php:7.4-fpm-alpine
# persistent dependencies
@@ -23,7 +29,10 @@ RUN set -ex; \
libzip-dev \
; \
\
- docker-php-ext-configure gd --with-freetype --with-jpeg; \
+ docker-php-ext-configure gd \
+ --with-freetype \
+ --with-jpeg \
+ ; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
exif \
@@ -40,8 +49,8 @@ RUN set -ex; \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)"; \
- apk add --virtual .wordpress-phpexts-rundeps $runDeps; \
- apk del .build-deps
+ apk add --no-network --virtual .wordpress-phpexts-rundeps $runDeps; \
+ apk del --no-network .build-deps
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
@@ -69,16 +78,33 @@ RUN { \
echo 'html_errors = Off'; \
} > /usr/local/etc/php/conf.d/error-logging.ini
-
-ENV WORDPRESS_VERSION 5.6
-ENV WORDPRESS_SHA1 db8b75bfc9de27490434b365c12fd805ca6784ce
-
-RUN set -ex; \
- curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \
- echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c -; \
+RUN set -eux; \
+ version='5.6'; \
+ sha1='db8b75bfc9de27490434b365c12fd805ca6784ce'; \
+ \
+ curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
+ echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
+ \
# upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
tar -xzf wordpress.tar.gz -C /usr/src/; \
rm wordpress.tar.gz; \
+ \
+# https://wordpress.org/support/article/htaccess/
+ [ ! -e /usr/src/wordpress/.htaccess ]; \
+ { \
+ echo '# BEGIN WordPress'; \
+ echo ''; \
+ echo 'RewriteEngine On'; \
+ echo 'RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]'; \
+ echo 'RewriteBase /'; \
+ echo 'RewriteRule ^index\.php$ - [L]'; \
+ echo 'RewriteCond %{REQUEST_FILENAME} !-f'; \
+ echo 'RewriteCond %{REQUEST_FILENAME} !-d'; \
+ echo 'RewriteRule . /index.php [L]'; \
+ echo ''; \
+ echo '# END WordPress'; \
+ } > /usr/src/wordpress/.htaccess; \
+ \
chown -R www-data:www-data /usr/src/wordpress; \
# pre-create wp-content (and single-level children) for folks who want to bind-mount themes, etc so permissions are pre-created properly instead of root:root
# wp-content/cache: https://github.com/docker-library/wordpress/issues/534#issuecomment-705733507
diff --git a/wordpress_php7.4-fpm-alpine/docker-entrypoint.sh b/wordpress_php7.4-fpm-alpine/docker-entrypoint.sh
index 8878d3e..6a40c02 100755
--- a/wordpress_php7.4-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_php7.4-fpm-alpine/docker-entrypoint.sh
@@ -82,22 +82,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
done
tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}"
echo >&2 "Complete! WordPress has been successfully copied to $PWD"
- if [ ! -e .htaccess ]; then
- # NOTE: The "Indexes" option is disabled in the php:apache base image
- cat > .htaccess <<-'EOF'
- # BEGIN WordPress
- <IfModule mod_rewrite.c>
- RewriteEngine On
- RewriteBase /
- RewriteRule ^index\.php$ - [L]
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule . /index.php [L]
- </IfModule>
- # END WordPress
- EOF
- chown "$user:$group" .htaccess
- fi
fi
# allow any of these "Authentication Unique Keys and Salts." to be specified via
diff --git a/wordpress_php7.4-fpm/Dockerfile b/wordpress_php7.4-fpm/Dockerfile
index f6c98ac..6f3e922 100644
--- a/wordpress_php7.4-fpm/Dockerfile
+++ b/wordpress_php7.4-fpm/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM php:7.4-fpm
# persistent dependencies
@@ -23,7 +29,10 @@ RUN set -ex; \
libzip-dev \
; \
\
- docker-php-ext-configure gd --with-freetype --with-jpeg; \
+ docker-php-ext-configure gd \
+ --with-freetype \
+ --with-jpeg \
+ ; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
exif \
@@ -74,16 +83,33 @@ RUN { \
echo 'html_errors = Off'; \
} > /usr/local/etc/php/conf.d/error-logging.ini
-
-ENV WORDPRESS_VERSION 5.6
-ENV WORDPRESS_SHA1 db8b75bfc9de27490434b365c12fd805ca6784ce
-
-RUN set -ex; \
- curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \
- echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c -; \
+RUN set -eux; \
+ version='5.6'; \
+ sha1='db8b75bfc9de27490434b365c12fd805ca6784ce'; \
+ \
+ curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
+ echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
+ \
# upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
tar -xzf wordpress.tar.gz -C /usr/src/; \
rm wordpress.tar.gz; \
+ \
+# https://wordpress.org/support/article/htaccess/
+ [ ! -e /usr/src/wordpress/.htaccess ]; \
+ { \
+ echo '# BEGIN WordPress'; \
+ echo ''; \
+ echo 'RewriteEngine On'; \
+ echo 'RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]'; \
+ echo 'RewriteBase /'; \
+ echo 'RewriteRule ^index\.php$ - [L]'; \
+ echo 'RewriteCond %{REQUEST_FILENAME} !-f'; \
+ echo 'RewriteCond %{REQUEST_FILENAME} !-d'; \
+ echo 'RewriteRule . /index.php [L]'; \
+ echo ''; \
+ echo '# END WordPress'; \
+ } > /usr/src/wordpress/.htaccess; \
+ \
chown -R www-data:www-data /usr/src/wordpress; \
# pre-create wp-content (and single-level children) for folks who want to bind-mount themes, etc so permissions are pre-created properly instead of root:root
# wp-content/cache: https://github.com/docker-library/wordpress/issues/534#issuecomment-705733507
diff --git a/wordpress_php7.4-fpm/docker-entrypoint.sh b/wordpress_php7.4-fpm/docker-entrypoint.sh
index 8878d3e..6a40c02 100755
--- a/wordpress_php7.4-fpm/docker-entrypoint.sh
+++ b/wordpress_php7.4-fpm/docker-entrypoint.sh
@@ -82,22 +82,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
done
tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}"
echo >&2 "Complete! WordPress has been successfully copied to $PWD"
- if [ ! -e .htaccess ]; then
- # NOTE: The "Indexes" option is disabled in the php:apache base image
- cat > .htaccess <<-'EOF'
- # BEGIN WordPress
- <IfModule mod_rewrite.c>
- RewriteEngine On
- RewriteBase /
- RewriteRule ^index\.php$ - [L]
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule . /index.php [L]
- </IfModule>
- # END WordPress
- EOF
- chown "$user:$group" .htaccess
- fi
fi
# allow any of these "Authentication Unique Keys and Salts." to be specified via
diff --git a/wordpress_php7.4/Dockerfile b/wordpress_php7.4/Dockerfile
index a11927b..23ea62d 100644
--- a/wordpress_php7.4/Dockerfile
+++ b/wordpress_php7.4/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM php:7.4-apache
# persistent dependencies
@@ -23,7 +29,10 @@ RUN set -ex; \
libzip-dev \
; \
\
- docker-php-ext-configure gd --with-freetype --with-jpeg; \
+ docker-php-ext-configure gd \
+ --with-freetype \
+ --with-jpeg \
+ ; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
exif \
@@ -93,16 +102,33 @@ RUN set -eux; \
# (replace all instances of "%h" with "%a" in LogFormat)
find /etc/apache2 -type f -name '*.conf' -exec sed -ri 's/([[:space:]]*LogFormat[[:space:]]+"[^"]*)%h([^"]*")/\1%a\2/g' '{}' +
-
-ENV WORDPRESS_VERSION 5.6
-ENV WORDPRESS_SHA1 db8b75bfc9de27490434b365c12fd805ca6784ce
-
-RUN set -ex; \
- curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \
- echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c -; \
+RUN set -eux; \
+ version='5.6'; \
+ sha1='db8b75bfc9de27490434b365c12fd805ca6784ce'; \
+ \
+ curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
+ echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
+ \
# upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
tar -xzf wordpress.tar.gz -C /usr/src/; \
rm wordpress.tar.gz; \
+ \
+# https://wordpress.org/support/article/htaccess/
+ [ ! -e /usr/src/wordpress/.htaccess ]; \
+ { \
+ echo '# BEGIN WordPress'; \
+ echo ''; \
+ echo 'RewriteEngine On'; \
+ echo 'RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]'; \
+ echo 'RewriteBase /'; \
+ echo 'RewriteRule ^index\.php$ - [L]'; \
+ echo 'RewriteCond %{REQUEST_FILENAME} !-f'; \
+ echo 'RewriteCond %{REQUEST_FILENAME} !-d'; \
+ echo 'RewriteRule . /index.php [L]'; \
+ echo ''; \
+ echo '# END WordPress'; \
+ } > /usr/src/wordpress/.htaccess; \
+ \
chown -R www-data:www-data /usr/src/wordpress; \
# pre-create wp-content (and single-level children) for folks who want to bind-mount themes, etc so permissions are pre-created properly instead of root:root
# wp-content/cache: https://github.com/docker-library/wordpress/issues/534#issuecomment-705733507
diff --git a/wordpress_php7.4/docker-entrypoint.sh b/wordpress_php7.4/docker-entrypoint.sh
index 8878d3e..6a40c02 100755
--- a/wordpress_php7.4/docker-entrypoint.sh
+++ b/wordpress_php7.4/docker-entrypoint.sh
@@ -82,22 +82,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
done
tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}"
echo >&2 "Complete! WordPress has been successfully copied to $PWD"
- if [ ! -e .htaccess ]; then
- # NOTE: The "Indexes" option is disabled in the php:apache base image
- cat > .htaccess <<-'EOF'
- # BEGIN WordPress
- <IfModule mod_rewrite.c>
- RewriteEngine On
- RewriteBase /
- RewriteRule ^index\.php$ - [L]
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule . /index.php [L]
- </IfModule>
- # END WordPress
- EOF
- chown "$user:$group" .htaccess
- fi
fi
# allow any of these "Authentication Unique Keys and Salts." to be specified via
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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: