diff --git a/.github/workflows/docker-hub.yml b/.github/workflows/docker-hub.yml
index 459e9e6..e3e8c38 100644
--- a/.github/workflows/docker-hub.yml
+++ b/.github/workflows/docker-hub.yml
@@ -44,7 +44,7 @@ jobs:
strategy:
matrix:
- php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+ php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
env:
PHP_VERSION: ${{ matrix.php }}
PHP_LATEST: '8.2'
@@ -79,7 +79,7 @@ jobs:
needs: build-php-images
strategy:
matrix:
- php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+ php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
env:
PHP_VERSION: ${{ matrix.php }}
@@ -142,7 +142,7 @@ jobs:
needs: build-php-images
strategy:
matrix:
- php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+ php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
env:
PHP_VERSION: ${{ matrix.php }}
diff --git a/.github/workflows/github-container-registry.yml b/.github/workflows/github-container-registry.yml
index 03d7885..bd31de9 100644
--- a/.github/workflows/github-container-registry.yml
+++ b/.github/workflows/github-container-registry.yml
@@ -53,7 +53,7 @@ jobs:
needs: [ check-for-changes ]
strategy:
matrix:
- php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+ php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
env:
PHP_VERSION: ${{ matrix.php }}
PHP_LATEST: '8.2'
@@ -88,7 +88,7 @@ jobs:
needs: build-php-images
strategy:
matrix:
- php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+ php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
env:
PHP_VERSION: ${{ matrix.php }}
@@ -151,7 +151,7 @@ jobs:
needs: build-php-images
strategy:
matrix:
- php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+ php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
env:
PHP_VERSION: ${{ matrix.php }}
diff --git a/images/8.4/cli/Dockerfile b/images/8.4/cli/Dockerfile
deleted file mode 100644
index f21132c..0000000
--- a/images/8.4/cli/Dockerfile
+++ /dev/null
@@ -1,40 +0,0 @@
-ARG PACKAGE_REGISTRY
-ARG PR_TAG
-FROM $PACKAGE_REGISTRY/php:8.4-fpm$PR_TAG
-
-##########################################################################
-#
-# WARNING: This file was generated by update.php.
-#
-# You can find the relevant template in the `/templates` folder.
-#
-
-
-# install wp-cli dependences
-RUN set -ex; \
- \
- apt-get update; \
- \
- apt-get install -y --no-install-recommends \
- less \
- virtual-mysql-client \
- ;
-
-RUN set -ex; \
- \
- curl -L -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar; \
- \
- chmod +x /usr/local/bin/wp; \
- \
- wp --allow-root --version;
-
-COPY entrypoint.sh /entrypoint.sh
-
-RUN chmod +x /entrypoint.sh
-
-ENTRYPOINT [ "/entrypoint.sh" ]
-
-
-WORKDIR /var/www
-
-CMD [ "wp", "shell" ]
diff --git a/images/8.4/cli/entrypoint.sh b/images/8.4/cli/entrypoint.sh
deleted file mode 100644
index a975386..0000000
--- a/images/8.4/cli/entrypoint.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-set -e
-
-source /common.sh
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
- set -- wp "$@"
-fi
-
-# if our command is a valid wp-cli subcommand, let's invoke it through wp-cli instead
-if sudo -u wp_php wp --path=/dev/null help "$1" > /dev/null 2>&1; then
- set -- wp "$@"
-fi
-
-# Execute CMD
-sudo -E -u wp_php "$@"
diff --git a/images/8.4/php/Dockerfile b/images/8.4/php/Dockerfile
deleted file mode 100644
index 8b00e5f..0000000
--- a/images/8.4/php/Dockerfile
+++ /dev/null
@@ -1,63 +0,0 @@
-FROM php:8.3-fpm
-
-WORKDIR /var/www
-
-##########################################################################
-#
-# WARNING: This file was generated by update.php.
-#
-# You can find the relevant template in the `/templates` folder.
-#
-
-ENV COMPOSER_ALLOW_SUPERUSER 1
-ENV COMPOSER_HOME /tmp
-
-# install the PHP extensions we need
-RUN set -ex; \
- \
- apt-get update; \
- \
- apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \
- apt-get upgrade openssl -y; \
- update-ca-certificates --fresh; \
- sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \
- locale-gen; \
- \
- docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr; \
- \
- docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
- \
- curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
- curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
- php -r " \
- \$signature = file_get_contents( '/tmp/installer.sig' ); \
- \$hash = hash( 'sha384', file_get_contents('/tmp/installer.php') ); \
- if ( \$signature !== \$hash ) { \
- unlink( '/tmp/installer.php' ); \
- unlink( '/tmp/installer.sig' ); \
- echo 'Integrity check failed, installer is either corrupt or worse.' . PHP_EOL; \
- exit( 1 ); \
- }"; \
- php /tmp/installer.php --no-ansi --install-dir=/usr/bin --filename=composer; \
- composer --ansi --version --no-interaction; \
- rm -f /tmp/installer.php /tmp/installer.sig;
-
-COPY entrypoint.sh /entrypoint.sh
-COPY common.sh /common.sh
-COPY php-fpm.conf /usr/local/etc/php-fpm.d/zz-wordpress.conf
-
-ARG imagemagic_config=/etc/ImageMagick-6/policy.xml
-RUN if [ -f $imagemagic_config ] ; then \
- sed -i 's///g' $imagemagic_config; \
- else \
- echo did not see file $imagemagic_config; \
- fi
-
-RUN chmod +x /entrypoint.sh && \
- chmod +x /common.sh && \
- groupadd -g 1000 -r wp_php && \
- useradd -u 1000 -s /bin/bash -g wp_php wp_php
-
-ENTRYPOINT [ "/entrypoint.sh" ]
-
-CMD [ "php-fpm" ]
diff --git a/images/8.4/php/common.sh b/images/8.4/php/common.sh
deleted file mode 100644
index b0df597..0000000
--- a/images/8.4/php/common.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-set -e
-
-# If LOCAL_PHP_XDEBUG=true xdebug extension will be enabled
-if [ "$LOCAL_PHP_XDEBUG" = true ]; then
- docker-php-ext-enable xdebug
- rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-else
- docker-php-ext-enable opcache
- rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-fi
-
-# If LOCAL_PHP_MEMCACHED=true memcached extension will be enabled
-if [ "$LOCAL_PHP_MEMCACHED" = true ]; then
- docker-php-ext-enable memcached
-else
- rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
-fi
-
-### Change UID/GID
-WP_PHP_UID="${PHP_FPM_UID-1000}"
-WP_PHP_GID="${PHP_FPM_GID-1000}"
-
-if [ "$WP_PHP_UID" != "`id -u wp_php`" ]; then
- usermod -o -u "${WP_PHP_UID}" "wp_php"
-fi
-
-if [ "$WP_PHP_GID" != "`id -g wp_php`" ]; then
- groupmod -o -g "${WP_PHP_GID}" "wp_php"
-fi
diff --git a/images/8.4/php/entrypoint.sh b/images/8.4/php/entrypoint.sh
deleted file mode 100644
index c3c3b23..0000000
--- a/images/8.4/php/entrypoint.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -e
-
-source /common.sh
-
-# Execute CMD
-exec "$@"
diff --git a/images/8.4/php/php-fpm.conf b/images/8.4/php/php-fpm.conf
deleted file mode 100644
index fe69bda..0000000
--- a/images/8.4/php/php-fpm.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[www]
-user = wp_php
-group = wp_php
\ No newline at end of file
diff --git a/images/8.4/phpunit/Dockerfile b/images/8.4/phpunit/Dockerfile
deleted file mode 100644
index 6c3a6f6..0000000
--- a/images/8.4/phpunit/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-ARG PACKAGE_REGISTRY
-ARG PR_TAG
-FROM $PACKAGE_REGISTRY/php:8.4-fpm$PR_TAG
-
-##########################################################################
-#
-# WARNING: This file was generated by update.php.
-#
-# You can find the relevant template in the `/templates` folder.
-#
-
-RUN curl -sL https://phar.phpunit.de/phpunit-9.phar > /usr/local/bin/phpunit && chmod +x /usr/local/bin/phpunit
-
-WORKDIR /var/www
-
-COPY entrypoint.sh /entrypoint.sh
-
-RUN chmod +x /entrypoint.sh
-
-ENTRYPOINT [ "/entrypoint.sh" ]
-
-CMD /usr/local/bin/phpunit
diff --git a/images/8.4/phpunit/entrypoint.sh b/images/8.4/phpunit/entrypoint.sh
deleted file mode 100644
index ef08bb8..0000000
--- a/images/8.4/phpunit/entrypoint.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-set -e
-
-source /common.sh
-
-chown -R wp_php:wp_php /var/www/${LOCAL_DIR-src}/wp-content/uploads
-
-# Execute CMD
-sudo -E -u wp_php "$@"
diff --git a/update.php b/update.php
index 5df0804..fd52d91 100644
--- a/update.php
+++ b/update.php
@@ -153,20 +153,6 @@
'download_url' => 'https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar',
),
),
- '8.4' => array(
- 'php' => array(
- 'base_name' => 'php:8.3-fpm',
- 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
- 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
- 'pecl_extensions' => array(),
- 'composer' => true,
- ),
- 'phpunit' => 9,
- 'cli' => array(
- 'mysql_client' => 'virtual-mysql-client',
- 'download_url' => 'https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar',
- ),
- ),
);
/**