diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index cad4aed3..38000a82 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5" ] + php: [ "8.2", "8.3", "8.4", "8.5" ] runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c256fe5e..fc3576ba 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5" ] + php: [ "8.2", "8.3", "8.4", "8.5" ] runs-on: ubuntu-latest steps: - diff --git a/README.md b/README.md index 853f7c5d..f6feff19 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Open the site and follow WordPress's installation (site title and admin user). * ⏰ System cron for WordPress's scheduled tasks * 🛡️ Optional NinjaFirewall in full web application firewall mode, and WebAuthn passkey logins * ⚡ Redis object cache settings, for use with a Redis plugin -* 🐘 PHP 7.4 to 8.5 - choose with the image tag +* 🐘 PHP 8.2 to 8.5 - choose with the image tag * 🗜️ Everything from [Nginx + PHP](https://github.com/bfren/docker-nginx-php#features): PHP-FPM, OPcache, compression and logs * 🩺 Health check that loads the login page diff --git a/VERSION b/VERSION index 26a96787..8b23b8d4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.2.4 \ No newline at end of file +7.3.0 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index be4cea5e..a88f8118 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -7.2 \ No newline at end of file +7.3 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 808afd35..965950f1 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,10 +4,10 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="9.0.8" +BASE_VERSION="9.1.0" echo "Base: ${BASE_VERSION}" -PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4 8.5" +PHP_VERSIONS="8.2 8.3 8.4 8.5" for V in ${PHP_VERSIONS} ; do echo "WordPress for PHP ${V}" diff --git a/php7.4/Dockerfile b/php7.4/Dockerfile deleted file mode 100644 index ac81950d..00000000 --- a/php7.4/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -FROM quay.io/bfren/nginx-php:php7.4.33-9.0.8 - -LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" - -ARG BF_IMAGE -ARG BF_PUBLISHING -ARG BF_VERSION - -ARG \ - # set to a valid WordPress version or the installation will fail - # if empty, will use value in /overlay/tmp/WP_VERSION - WP_VERSION= \ - # set to a valid WordPress locale or the installation will fail - # if empty, will use value in /overlay/tmp/WP_LOCALE - WP_LOCALE= - -COPY ./overlay / -COPY ./php7.4/overlay / - -ENV \ - # load the WordPress login page for healthcheck - BF_NGINX_HEALTHCHECK_URI=http://localhost/wp-login.php \ - # options for config file permissions: - # - 0 (make it writeable by web server user) - # - 1 (make it readonly to web server user) - BF_WP_CONFIG_HARDEN=1 \ - # options for config file generation: - # - 0 (generate on container startup if it does not exist) - # - 1 (always regenerate on container startup) - BF_WP_CONFIG_REGENERATE=1 \ - # set to 0 to re-enable WordPress core updates - otherwise they will be handled by the image - BF_WP_DISABLE_MAJOR_UPDATES=1 \ - # whether or not to enable HTTPS behind a proxy server - BF_WP_ENABLE_HTTPS_BEHIND_PROXY=1 \ - # set to 1 if you want the NinjaFirewall plugin to be setup to run in full WAF mode - # (you will still have to enable it in the WordPress backend) - # NB: this must be 0 until you have installed WordPress or you will not be able to access the site - BF_WP_INSTALL_NINJAFIREWALL=0 \ - # set to 0 if you don't want the WebAuthn plugin to be installed automatically - BF_WP_INSTALL_WEBAUTHN=1 \ - # set to 0 to use WordPress cron instead of system cron (will reduce performance) - # you must remove define('DISABLE_WP_CRON', true); to wp-config.php to make a difference - BF_WP_USE_SYSTEM_CRON=1 - -RUN bf-install - -VOLUME [ "/wp-content" ] diff --git a/php7.4/PHP_REVISION b/php7.4/PHP_REVISION deleted file mode 100644 index 1d66e6b9..00000000 --- a/php7.4/PHP_REVISION +++ /dev/null @@ -1 +0,0 @@ -7.4.33 \ No newline at end of file diff --git a/php7.4/overlay/tmp/PHP_EXT b/php7.4/overlay/tmp/PHP_EXT deleted file mode 100644 index 23163860..00000000 --- a/php7.4/overlay/tmp/PHP_EXT +++ /dev/null @@ -1,26 +0,0 @@ --cgi --ctype --curl --dom --exif --fileinfo --ftp --gd --gettext --iconv --imap --intl --json --mbstring --mysqli --mysqlnd --openssl --simplexml --soap --sockets --sodium --xml --xmlrpc --xmlreader --zip -icu-libs \ No newline at end of file diff --git a/php8.0/Dockerfile b/php8.0/Dockerfile deleted file mode 100644 index 3aadecdb..00000000 --- a/php8.0/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -FROM quay.io/bfren/nginx-php:php8.0.30-9.0.8 - -LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" - -ARG BF_IMAGE -ARG BF_PUBLISHING -ARG BF_VERSION - -ARG \ - # set to a valid WordPress version or the installation will fail - # if empty, will use value in /overlay/tmp/WP_VERSION - WP_VERSION= \ - # set to a valid WordPress locale or the installation will fail - # if empty, will use value in /overlay/tmp/WP_LOCALE - WP_LOCALE= - -COPY ./overlay / -COPY ./php8.0/overlay / - -ENV \ - # load the WordPress login page for healthcheck - BF_NGINX_HEALTHCHECK_URI=http://localhost/wp-login.php \ - # options for config file permissions: - # - 0 (make it writeable by web server user) - # - 1 (make it readonly to web server user) - BF_WP_CONFIG_HARDEN=1 \ - # options for config file generation: - # - 0 (generate on container startup if it does not exist) - # - 1 (always regenerate on container startup) - BF_WP_CONFIG_REGENERATE=1 \ - # set to 0 to re-enable WordPress core updates - otherwise they will be handled by the image - BF_WP_DISABLE_MAJOR_UPDATES=1 \ - # whether or not to enable HTTPS behind a proxy server - BF_WP_ENABLE_HTTPS_BEHIND_PROXY=1 \ - # set to 1 if you want the NinjaFirewall plugin to be setup to run in full WAF mode - # (you will still have to enable it in the WordPress backend) - # NB: this must be 0 until you have installed WordPress or you will not be able to access the site - BF_WP_INSTALL_NINJAFIREWALL=0 \ - # set to 0 if you don't want the WebAuthn plugin to be installed automatically - BF_WP_INSTALL_WEBAUTHN=1 \ - # set to 0 to use WordPress cron instead of system cron (will reduce performance) - # you must remove define('DISABLE_WP_CRON', true); to wp-config.php to make a difference - BF_WP_USE_SYSTEM_CRON=1 - -RUN bf-install - -VOLUME [ "/wp-content" ] diff --git a/php8.0/PHP_REVISION b/php8.0/PHP_REVISION deleted file mode 100644 index 96e24d86..00000000 --- a/php8.0/PHP_REVISION +++ /dev/null @@ -1 +0,0 @@ -8.0.30 \ No newline at end of file diff --git a/php8.0/overlay/.empty b/php8.0/overlay/.empty deleted file mode 100644 index e69de29b..00000000 diff --git a/php8.1/Dockerfile b/php8.1/Dockerfile deleted file mode 100644 index 1567fab2..00000000 --- a/php8.1/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -FROM quay.io/bfren/nginx-php:php8.1.34-9.0.8 - -LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" - -ARG BF_IMAGE -ARG BF_PUBLISHING -ARG BF_VERSION - -ARG \ - # set to a valid WordPress version or the installation will fail - # if empty, will use value in /overlay/tmp/WP_VERSION - WP_VERSION= \ - # set to a valid WordPress locale or the installation will fail - # if empty, will use value in /overlay/tmp/WP_LOCALE - WP_LOCALE= - -COPY ./overlay / -COPY ./php8.1/overlay / - -ENV \ - # load the WordPress login page for healthcheck - BF_NGINX_HEALTHCHECK_URI=http://localhost/wp-login.php \ - # options for config file permissions: - # - 0 (make it writeable by web server user) - # - 1 (make it readonly to web server user) - BF_WP_CONFIG_HARDEN=1 \ - # options for config file generation: - # - 0 (generate on container startup if it does not exist) - # - 1 (always regenerate on container startup) - BF_WP_CONFIG_REGENERATE=1 \ - # set to 0 to re-enable WordPress core updates - otherwise they will be handled by the image - BF_WP_DISABLE_MAJOR_UPDATES=1 \ - # whether or not to enable HTTPS behind a proxy server - BF_WP_ENABLE_HTTPS_BEHIND_PROXY=1 \ - # set to 1 if you want the NinjaFirewall plugin to be setup to run in full WAF mode - # (you will still have to enable it in the WordPress backend) - # NB: this must be 0 until you have installed WordPress or you will not be able to access the site - BF_WP_INSTALL_NINJAFIREWALL=0 \ - # set to 0 if you don't want the WebAuthn plugin to be installed automatically - BF_WP_INSTALL_WEBAUTHN=1 \ - # set to 0 to use WordPress cron instead of system cron (will reduce performance) - # you must remove define('DISABLE_WP_CRON', true); to wp-config.php to make a difference - BF_WP_USE_SYSTEM_CRON=1 - -RUN bf-install - -VOLUME [ "/wp-content" ] diff --git a/php8.1/PHP_REVISION b/php8.1/PHP_REVISION deleted file mode 100644 index e66cace4..00000000 --- a/php8.1/PHP_REVISION +++ /dev/null @@ -1 +0,0 @@ -8.1.34 \ No newline at end of file diff --git a/php8.1/overlay/.empty b/php8.1/overlay/.empty deleted file mode 100644 index e69de29b..00000000 diff --git a/php8.2/Dockerfile b/php8.2/Dockerfile index 515604a7..340e6d22 100644 --- a/php8.2/Dockerfile +++ b/php8.2/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/nginx-php:php8.2.35-9.0.8 +FROM quay.io/bfren/nginx-php:php8.2.35-9.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" diff --git a/php8.3/Dockerfile b/php8.3/Dockerfile index 349ec556..c567148a 100644 --- a/php8.3/Dockerfile +++ b/php8.3/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/nginx-php:php8.3.36-9.0.8 +FROM quay.io/bfren/nginx-php:php8.3.36-9.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" diff --git a/php8.4/Dockerfile b/php8.4/Dockerfile index 42b97c99..92d1da6c 100644 --- a/php8.4/Dockerfile +++ b/php8.4/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/nginx-php:php8.4.27-9.0.8 +FROM quay.io/bfren/nginx-php:php8.4.27-9.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" diff --git a/php8.5/Dockerfile b/php8.5/Dockerfile index f70c843e..d04ba6b4 100644 --- a/php8.5/Dockerfile +++ b/php8.5/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/nginx-php:php8.5.12-9.0.8 +FROM quay.io/bfren/nginx-php:php8.5.12-9.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress"