Skip to content

Commit dd8724a

Browse files
committed
Fix the .htaccess bit I missed
1 parent 25ed301 commit dd8724a

19 files changed

+76
-76
lines changed

beta/php7.3/apache/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php7.3/fpm-alpine/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php7.3/fpm/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php7.4/apache/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php7.4/fpm-alpine/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php7.4/fpm/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.0/apache/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.0/fpm-alpine/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.0/fpm/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker-entrypoint.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then
5151
fi
5252
# loop over "pluggable" content in the source, and if it already exists in the destination, skip it
5353
# https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded)
54-
for contentDir in \
54+
for contentPath in \
5555
/usr/src/wordpress/.htaccess \
5656
/usr/src/wordpress/wp-content/*/*/ \
5757
; do
58-
contentDir="${contentDir%/}"
59-
[ -d "$contentDir" ] || continue
60-
contentPath="${contentDir#/usr/src/wordpress/}" # "wp-content/plugins/akismet", etc.
58+
contentPath="${contentPath%/}"
59+
[ -e "$contentPath" ] || continue
60+
contentPath="${contentPath#/usr/src/wordpress/}" # "wp-content/plugins/akismet", etc.
6161
if [ -e "$PWD/$contentPath" ]; then
6262
echo >&2 "WARNING: '$PWD/$contentPath' exists! (not copying the WordPress version)"
6363
sourceTarArgs+=( --exclude "./$contentPath" )

latest/php7.3/apache/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php7.3/fpm-alpine/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php7.3/fpm/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php7.4/apache/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php7.4/fpm-alpine/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php7.4/fpm/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php8.0/apache/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php8.0/fpm-alpine/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php8.0/fpm/docker-entrypoint.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)