From e885e5f1c821154af48069f1bcc1cd69f66b78c0 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 21 Apr 2023 08:57:12 +0100 Subject: [PATCH 1/6] Bumping version to 2.4.20 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c79f748..deae66e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.19 \ No newline at end of file +2.4.20 \ No newline at end of file From 4218e8263715310ab43f642ca01f4aaf5f00f39d Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 21 Apr 2023 08:57:21 +0100 Subject: [PATCH 2/6] Updating to PHP 8.1.18 and 8.2.5 --- 8.1/overlay/tmp/PHP_BUILD | 2 +- 8.1/overlay/tmp/PHP_REVISION | 2 +- 8.2/overlay/tmp/PHP_BUILD | 2 +- 8.2/overlay/tmp/PHP_REVISION | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/8.1/overlay/tmp/PHP_BUILD b/8.1/overlay/tmp/PHP_BUILD index 2fde242..7e31954 100644 --- a/8.1/overlay/tmp/PHP_BUILD +++ b/8.1/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.1.17-r2 \ No newline at end of file +8.1.18-r0 \ No newline at end of file diff --git a/8.1/overlay/tmp/PHP_REVISION b/8.1/overlay/tmp/PHP_REVISION index 7f9444e..5c262d7 100644 --- a/8.1/overlay/tmp/PHP_REVISION +++ b/8.1/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.1.17 \ No newline at end of file +8.1.18 \ No newline at end of file diff --git a/8.2/overlay/tmp/PHP_BUILD b/8.2/overlay/tmp/PHP_BUILD index cb7d954..ff7149d 100644 --- a/8.2/overlay/tmp/PHP_BUILD +++ b/8.2/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.2.4-r2 \ No newline at end of file +8.2.5-r0 \ No newline at end of file diff --git a/8.2/overlay/tmp/PHP_REVISION b/8.2/overlay/tmp/PHP_REVISION index 7e98f24..971f1f4 100644 --- a/8.2/overlay/tmp/PHP_REVISION +++ b/8.2/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.2.4 \ No newline at end of file +8.2.5 \ No newline at end of file From 10d7af7258bb5d2cd1bb2c54db5802e24c2a15f7 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 21 Apr 2023 09:03:54 +0100 Subject: [PATCH 3/6] Bumping version to 2.5.0 --- VERSION | 2 +- VERSION_MINOR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index deae66e..fad066f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.20 \ No newline at end of file +2.5.0 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index 7208c21..68151b2 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -2.4 \ No newline at end of file +2.5 \ No newline at end of file From 668e3d5312db84f2808de6bc85fb5a736081ca13 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 21 Apr 2023 09:04:02 +0100 Subject: [PATCH 4/6] Removing PHP 7.4 build (EOL) --- .github/workflows/dev.yml | 2 +- .github/workflows/publish.yml | 2 +- 7.4/APACHE_BASE | 1 - 7.4/Dockerfile | 36 ----------------------------------- 7.4/overlay/tmp/PHP_BUILD | 1 - 7.4/overlay/tmp/PHP_REVISION | 1 - 7.4/overlay/tmp/install-php | 14 -------------- generate-dockerfiles.sh | 2 +- 8 files changed, 3 insertions(+), 56 deletions(-) delete mode 100644 7.4/APACHE_BASE delete mode 100644 7.4/Dockerfile delete mode 100644 7.4/overlay/tmp/PHP_BUILD delete mode 100644 7.4/overlay/tmp/PHP_REVISION delete mode 100644 7.4/overlay/tmp/install-php diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 73a94fa..8d0e0c3 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ "5.6", "7.4", "8.0", "8.1", "8.2" ] + php: [ "5.6", "8.0", "8.1", "8.2" ] runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d8a7889..6302189 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ "5.6", "7.4", "8.0", "8.1", "8.2" ] + php: [ "5.6", "8.0", "8.1", "8.2" ] runs-on: ubuntu-latest steps: - diff --git a/7.4/APACHE_BASE b/7.4/APACHE_BASE deleted file mode 100644 index 6d52280..0000000 --- a/7.4/APACHE_BASE +++ /dev/null @@ -1 +0,0 @@ -apache2.4.5x \ No newline at end of file diff --git a/7.4/Dockerfile b/7.4/Dockerfile deleted file mode 100644 index 40ab194..0000000 --- a/7.4/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM bfren/apache:apache2.4.5x-2.2.29 - -LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php" - -ARG BF_IMAGE -ARG BF_VERSION - -ENV \ - # PHP config directory - PHP_DIR=/etc/php7 \ - # www.conf override: log_level - PHP_FPM_LOG_LEVEL="notice" \ - # php.ini template to use, or 'custom' if you want to bind your own custom php.ini - - # which will cause the other PHP_INI_* environment variables to be ignored - PHP_INI="production" \ - # php.ini override: display_errors - PHP_INI_DISPLAY_ERRORS= \ - # php.ini override: display_startup_errors - PHP_INI_DISPLAY_STARTUP_ERRORS= \ - # php.ini override: error_log - PHP_INI_ERROR_LOG="/var/log/php7/error.log" \ - # php.ini override: err-r_reporting - PHP_INI_ERROR_REPORTING= \ - # php.ini override: memory_limit - PHP_INI_MEMORY_LIMIT="256M" \ - # php.ini override: max_post - PHP_INI_MAX_POST="64M" \ - # php.ini override: max_upload - PHP_INI_MAX_UPLOAD="64M" \ - # php.ini override: session_max_lifetime - PHP_SESSION_MAX_LIFETIME=86400 - -COPY ./overlay / -COPY ./7.4/overlay / - -RUN bf-install diff --git a/7.4/overlay/tmp/PHP_BUILD b/7.4/overlay/tmp/PHP_BUILD deleted file mode 100644 index f7b381b..0000000 --- a/7.4/overlay/tmp/PHP_BUILD +++ /dev/null @@ -1 +0,0 @@ -7.4.33-r1 \ No newline at end of file diff --git a/7.4/overlay/tmp/PHP_REVISION b/7.4/overlay/tmp/PHP_REVISION deleted file mode 100644 index 1d66e6b..0000000 --- a/7.4/overlay/tmp/PHP_REVISION +++ /dev/null @@ -1 +0,0 @@ -7.4.33 \ No newline at end of file diff --git a/7.4/overlay/tmp/install-php b/7.4/overlay/tmp/install-php deleted file mode 100644 index c9be503..0000000 --- a/7.4/overlay/tmp/install-php +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -euo pipefail - - -#====================================================================================================================== -# Install PHP7 and create symlink. -#====================================================================================================================== - -apk add --no-cache \ - php7=${1} \ - php7-apache2=${1} \ - php7-common=${1} \ - php7-session=${1} diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 24bf78c..d6c83b3 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -7,7 +7,7 @@ docker pull bfren/alpine BASE_REVISION="2.2.29" echo "Base: ${BASE_REVISION}" -PHP_VERSIONS="5.6 7.4 8.0 8.1 8.2" +PHP_VERSIONS="5.6 8.0 8.1 8.2" for V in ${PHP_VERSIONS} ; do echo "PHP ${V}" From 54fcb26d03dab5528f408bf89f6b3df3589ba9e4 Mon Sep 17 00:00:00 2001 From: bfren Date: Mon, 24 Apr 2023 19:21:34 +0100 Subject: [PATCH 5/6] Removing PHP 8.0 and 8.2 --- .github/workflows/dev.yml | 2 +- .github/workflows/publish.yml | 2 +- 8.0/APACHE_BASE | 1 - 8.0/Dockerfile | 36 ----------------------------------- 8.0/overlay/tmp/PHP_BUILD | 1 - 8.0/overlay/tmp/PHP_REVISION | 1 - 8.0/overlay/tmp/install-php | 14 -------------- 8.2/APACHE_BASE | 1 - 8.2/Dockerfile | 36 ----------------------------------- 8.2/overlay/tmp/PHP_BUILD | 1 - 8.2/overlay/tmp/PHP_REVISION | 1 - 8.2/overlay/tmp/install-php | 14 -------------- generate-dockerfiles.sh | 2 +- 13 files changed, 3 insertions(+), 109 deletions(-) delete mode 100644 8.0/APACHE_BASE delete mode 100644 8.0/Dockerfile delete mode 100644 8.0/overlay/tmp/PHP_BUILD delete mode 100644 8.0/overlay/tmp/PHP_REVISION delete mode 100644 8.0/overlay/tmp/install-php delete mode 100644 8.2/APACHE_BASE delete mode 100644 8.2/Dockerfile delete mode 100644 8.2/overlay/tmp/PHP_BUILD delete mode 100644 8.2/overlay/tmp/PHP_REVISION delete mode 100644 8.2/overlay/tmp/install-php diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 8d0e0c3..ba64086 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ "5.6", "8.0", "8.1", "8.2" ] + php: [ "5.6", "8.1" ] runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6302189..1bdc66d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ "5.6", "8.0", "8.1", "8.2" ] + php: [ "5.6", "8.1" ] runs-on: ubuntu-latest steps: - diff --git a/8.0/APACHE_BASE b/8.0/APACHE_BASE deleted file mode 100644 index 6d52280..0000000 --- a/8.0/APACHE_BASE +++ /dev/null @@ -1 +0,0 @@ -apache2.4.5x \ No newline at end of file diff --git a/8.0/Dockerfile b/8.0/Dockerfile deleted file mode 100644 index cf22014..0000000 --- a/8.0/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM bfren/apache:apache2.4.5x-2.2.29 - -LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php" - -ARG BF_IMAGE -ARG BF_VERSION - -ENV \ - # PHP config directory - PHP_DIR=/etc/php8 \ - # www.conf override: log_level - PHP_FPM_LOG_LEVEL="notice" \ - # php.ini template to use, or 'custom' if you want to bind your own custom php.ini - - # which will cause the other PHP_INI_* environment variables to be ignored - PHP_INI="production" \ - # php.ini override: display_errors - PHP_INI_DISPLAY_ERRORS= \ - # php.ini override: display_startup_errors - PHP_INI_DISPLAY_STARTUP_ERRORS= \ - # php.ini override: error_log - PHP_INI_ERROR_LOG="/var/log/php8/error.log" \ - # php.ini override: err-r_reporting - PHP_INI_ERROR_REPORTING= \ - # php.ini override: memory_limit - PHP_INI_MEMORY_LIMIT="256M" \ - # php.ini override: max_post - PHP_INI_MAX_POST="64M" \ - # php.ini override: max_upload - PHP_INI_MAX_UPLOAD="64M" \ - # php.ini override: session_max_lifetime - PHP_SESSION_MAX_LIFETIME=86400 - -COPY ./overlay / -COPY ./8.0/overlay / - -RUN bf-install diff --git a/8.0/overlay/tmp/PHP_BUILD b/8.0/overlay/tmp/PHP_BUILD deleted file mode 100644 index d087748..0000000 --- a/8.0/overlay/tmp/PHP_BUILD +++ /dev/null @@ -1 +0,0 @@ -8.0.28-r0 \ No newline at end of file diff --git a/8.0/overlay/tmp/PHP_REVISION b/8.0/overlay/tmp/PHP_REVISION deleted file mode 100644 index 53f862c..0000000 --- a/8.0/overlay/tmp/PHP_REVISION +++ /dev/null @@ -1 +0,0 @@ -8.0.28 \ No newline at end of file diff --git a/8.0/overlay/tmp/install-php b/8.0/overlay/tmp/install-php deleted file mode 100644 index 777df34..0000000 --- a/8.0/overlay/tmp/install-php +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -euo pipefail - - -#====================================================================================================================== -# Install PHP8. -#====================================================================================================================== - -apk add --no-cache \ - php8=${1} \ - php8-apache2=${1} \ - php8-common=${1} \ - php8-session=${1} diff --git a/8.2/APACHE_BASE b/8.2/APACHE_BASE deleted file mode 100644 index 6d52280..0000000 --- a/8.2/APACHE_BASE +++ /dev/null @@ -1 +0,0 @@ -apache2.4.5x \ No newline at end of file diff --git a/8.2/Dockerfile b/8.2/Dockerfile deleted file mode 100644 index 2cf77a7..0000000 --- a/8.2/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM bfren/apache:apache2.4.5x-2.2.29 - -LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php" - -ARG BF_IMAGE -ARG BF_VERSION - -ENV \ - # PHP config directory - PHP_DIR=/etc/php8 \ - # www.conf override: log_level - PHP_FPM_LOG_LEVEL="notice" \ - # php.ini template to use, or 'custom' if you want to bind your own custom php.ini - - # which will cause the other PHP_INI_* environment variables to be ignored - PHP_INI="production" \ - # php.ini override: display_errors - PHP_INI_DISPLAY_ERRORS= \ - # php.ini override: display_startup_errors - PHP_INI_DISPLAY_STARTUP_ERRORS= \ - # php.ini override: error_log - PHP_INI_ERROR_LOG="/var/log/php8/error.log" \ - # php.ini override: err-r_reporting - PHP_INI_ERROR_REPORTING= \ - # php.ini override: memory_limit - PHP_INI_MEMORY_LIMIT="256M" \ - # php.ini override: max_post - PHP_INI_MAX_POST="64M" \ - # php.ini override: max_upload - PHP_INI_MAX_UPLOAD="64M" \ - # php.ini override: session_max_lifetime - PHP_SESSION_MAX_LIFETIME=86400 - -COPY ./overlay / -COPY ./8.2/overlay / - -RUN bf-install diff --git a/8.2/overlay/tmp/PHP_BUILD b/8.2/overlay/tmp/PHP_BUILD deleted file mode 100644 index ff7149d..0000000 --- a/8.2/overlay/tmp/PHP_BUILD +++ /dev/null @@ -1 +0,0 @@ -8.2.5-r0 \ No newline at end of file diff --git a/8.2/overlay/tmp/PHP_REVISION b/8.2/overlay/tmp/PHP_REVISION deleted file mode 100644 index 971f1f4..0000000 --- a/8.2/overlay/tmp/PHP_REVISION +++ /dev/null @@ -1 +0,0 @@ -8.2.5 \ No newline at end of file diff --git a/8.2/overlay/tmp/install-php b/8.2/overlay/tmp/install-php deleted file mode 100644 index 10bad00..0000000 --- a/8.2/overlay/tmp/install-php +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -euo pipefail - - -#====================================================================================================================== -# Install PHP8. -#====================================================================================================================== - -apk add --no-cache \ - php82=${1} \ - php82-apache2=${1} \ - php82-common=${1} \ - php82-session=${1} diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index d6c83b3..4c97ae2 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -7,7 +7,7 @@ docker pull bfren/alpine BASE_REVISION="2.2.29" echo "Base: ${BASE_REVISION}" -PHP_VERSIONS="5.6 8.0 8.1 8.2" +PHP_VERSIONS="5.6 8.1" for V in ${PHP_VERSIONS} ; do echo "PHP ${V}" From 8218a898841110392cd14c79f3ee9547c1aeae9f Mon Sep 17 00:00:00 2001 From: bfren Date: Mon, 24 Apr 2023 19:23:14 +0100 Subject: [PATCH 6/6] Updating PHP 8.1 build --- 8.1/overlay/tmp/PHP_BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1/overlay/tmp/PHP_BUILD b/8.1/overlay/tmp/PHP_BUILD index 7e31954..76df9c6 100644 --- a/8.1/overlay/tmp/PHP_BUILD +++ b/8.1/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.1.18-r0 \ No newline at end of file +8.1.18-r1 \ No newline at end of file