From cb3f7fc1c85762269e79773ef26a055add94c2ca Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 20 Feb 2019 16:37:20 -0800 Subject: [PATCH] Remove outdated TODO See https://github.com/docker-library/wordpress/issues/156#issuecomment-419246648 and https://github.com/docker-library/wordpress/pull/272#issuecomment-419248056 for details. --- docker-entrypoint.sh | 2 -- php7.1/apache/docker-entrypoint.sh | 2 -- php7.1/fpm-alpine/docker-entrypoint.sh | 2 -- php7.1/fpm/docker-entrypoint.sh | 2 -- php7.2/apache/docker-entrypoint.sh | 2 -- php7.2/fpm-alpine/docker-entrypoint.sh | 2 -- php7.2/fpm/docker-entrypoint.sh | 2 -- php7.3/apache/docker-entrypoint.sh | 2 -- php7.3/fpm-alpine/docker-entrypoint.sh | 2 -- php7.3/fpm/docker-entrypoint.sh | 2 -- 10 files changed, 20 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index f00874db50..c549e9b702 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -89,8 +89,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then fi fi - # TODO handle WordPress upgrades magically in the same way, but only if wp-includes/version.php's $wp_version is less than /usr/src/wordpress/wp-includes/version.php's $wp_version - # allow any of these "Authentication Unique Keys and Salts." to be specified via # environment variables with a "WORDPRESS_" prefix (ie, "WORDPRESS_AUTH_KEY") uniqueEnvs=( diff --git a/php7.1/apache/docker-entrypoint.sh b/php7.1/apache/docker-entrypoint.sh index f00874db50..c549e9b702 100755 --- a/php7.1/apache/docker-entrypoint.sh +++ b/php7.1/apache/docker-entrypoint.sh @@ -89,8 +89,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then fi fi - # TODO handle WordPress upgrades magically in the same way, but only if wp-includes/version.php's $wp_version is less than /usr/src/wordpress/wp-includes/version.php's $wp_version - # allow any of these "Authentication Unique Keys and Salts." to be specified via # environment variables with a "WORDPRESS_" prefix (ie, "WORDPRESS_AUTH_KEY") uniqueEnvs=( diff --git a/php7.1/fpm-alpine/docker-entrypoint.sh b/php7.1/fpm-alpine/docker-entrypoint.sh index f00874db50..c549e9b702 100755 --- a/php7.1/fpm-alpine/docker-entrypoint.sh +++ b/php7.1/fpm-alpine/docker-entrypoint.sh @@ -89,8 +89,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then fi fi - # TODO handle WordPress upgrades magically in the same way, but only if wp-includes/version.php's $wp_version is less than /usr/src/wordpress/wp-includes/version.php's $wp_version - # allow any of these "Authentication Unique Keys and Salts." to be specified via # environment variables with a "WORDPRESS_" prefix (ie, "WORDPRESS_AUTH_KEY") uniqueEnvs=( diff --git a/php7.1/fpm/docker-entrypoint.sh b/php7.1/fpm/docker-entrypoint.sh index f00874db50..c549e9b702 100755 --- a/php7.1/fpm/docker-entrypoint.sh +++ b/php7.1/fpm/docker-entrypoint.sh @@ -89,8 +89,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then fi fi - # TODO handle WordPress upgrades magically in the same way, but only if wp-includes/version.php's $wp_version is less than /usr/src/wordpress/wp-includes/version.php's $wp_version - # allow any of these "Authentication Unique Keys and Salts." to be specified via # environment variables with a "WORDPRESS_" prefix (ie, "WORDPRESS_AUTH_KEY") uniqueEnvs=( diff --git a/php7.2/apache/docker-entrypoint.sh b/php7.2/apache/docker-entrypoint.sh index f00874db50..c549e9b702 100755 --- a/php7.2/apache/docker-entrypoint.sh +++ b/php7.2/apache/docker-entrypoint.sh @@ -89,8 +89,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then fi fi - # TODO handle WordPress upgrades magically in the same way, but only if wp-includes/version.php's $wp_version is less than /usr/src/wordpress/wp-includes/version.php's $wp_version - # allow any of these "Authentication Unique Keys and Salts." to be specified via # environment variables with a "WORDPRESS_" prefix (ie, "WORDPRESS_AUTH_KEY") uniqueEnvs=( diff --git a/php7.2/fpm-alpine/docker-entrypoint.sh b/php7.2/fpm-alpine/docker-entrypoint.sh index f00874db50..c549e9b702 100755 --- a/php7.2/fpm-alpine/docker-entrypoint.sh +++ b/php7.2/fpm-alpine/docker-entrypoint.sh @@ -89,8 +89,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then fi fi - # TODO handle WordPress upgrades magically in the same way, but only if wp-includes/version.php's $wp_version is less than /usr/src/wordpress/wp-includes/version.php's $wp_version - # allow any of these "Authentication Unique Keys and Salts." to be specified via # environment variables with a "WORDPRESS_" prefix (ie, "WORDPRESS_AUTH_KEY") uniqueEnvs=( diff --git a/php7.2/fpm/docker-entrypoint.sh b/php7.2/fpm/docker-entrypoint.sh index f00874db50..c549e9b702 100755 --- a/php7.2/fpm/docker-entrypoint.sh +++ b/php7.2/fpm/docker-entrypoint.sh @@ -89,8 +89,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then fi fi - # TODO handle WordPress upgrades magically in the same way, but only if wp-includes/version.php's $wp_version is less than /usr/src/wordpress/wp-includes/version.php's $wp_version - # allow any of these "Authentication Unique Keys and Salts." to be specified via # environment variables with a "WORDPRESS_" prefix (ie, "WORDPRESS_AUTH_KEY") uniqueEnvs=( diff --git a/php7.3/apache/docker-entrypoint.sh b/php7.3/apache/docker-entrypoint.sh index f00874db50..c549e9b702 100755 --- a/php7.3/apache/docker-entrypoint.sh +++ b/php7.3/apache/docker-entrypoint.sh @@ -89,8 +89,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then fi fi - # TODO handle WordPress upgrades magically in the same way, but only if wp-includes/version.php's $wp_version is less than /usr/src/wordpress/wp-includes/version.php's $wp_version - # allow any of these "Authentication Unique Keys and Salts." to be specified via # environment variables with a "WORDPRESS_" prefix (ie, "WORDPRESS_AUTH_KEY") uniqueEnvs=( diff --git a/php7.3/fpm-alpine/docker-entrypoint.sh b/php7.3/fpm-alpine/docker-entrypoint.sh index f00874db50..c549e9b702 100755 --- a/php7.3/fpm-alpine/docker-entrypoint.sh +++ b/php7.3/fpm-alpine/docker-entrypoint.sh @@ -89,8 +89,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then fi fi - # TODO handle WordPress upgrades magically in the same way, but only if wp-includes/version.php's $wp_version is less than /usr/src/wordpress/wp-includes/version.php's $wp_version - # allow any of these "Authentication Unique Keys and Salts." to be specified via # environment variables with a "WORDPRESS_" prefix (ie, "WORDPRESS_AUTH_KEY") uniqueEnvs=( diff --git a/php7.3/fpm/docker-entrypoint.sh b/php7.3/fpm/docker-entrypoint.sh index f00874db50..c549e9b702 100755 --- a/php7.3/fpm/docker-entrypoint.sh +++ b/php7.3/fpm/docker-entrypoint.sh @@ -89,8 +89,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then fi fi - # TODO handle WordPress upgrades magically in the same way, but only if wp-includes/version.php's $wp_version is less than /usr/src/wordpress/wp-includes/version.php's $wp_version - # allow any of these "Authentication Unique Keys and Salts." to be specified via # environment variables with a "WORDPRESS_" prefix (ie, "WORDPRESS_AUTH_KEY") uniqueEnvs=(