Release 7.5.3 - See CHANGELOG.md

tiredofit · Mar 23, 2023 · 1e4ed52 · 1e4ed52
1 parent e11a8ba
commit 1e4ed52
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.5.3 2023-03-23 <dave at tiredofit dot ca>
+
+   ### Added
+      - Introduce PHP_HIDE_X_POWERED_BY variable
+
+
 ## 7.5.2 2023-03-20 <dave at tiredofit dot ca>
 
    ### Added

diff --git a/Dockerfile.debian b/Dockerfile.debian
@@ -6,7 +6,7 @@ LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
 
 ARG PHP_BASE
 
-ENV PHP_BASE=${PHP_BASE:-"8.0"} \
+ENV PHP_BASE=${PHP_BASE:-"8.2"} \
     PHP_ENABLE_APCU=TRUE \
     PHP_ENABLE_BCMATH=TRUE \
     PHP_ENABLE_BZ2=TRUE \

diff --git a/README.md b/README.md
@@ -76,18 +76,18 @@ Builds of the image are available on [Docker Hub](https://hub.docker.com/r/tired
 docker pull docker.io/tiredofdit/nginx-php-fpm:(imagetag)
 ```
 
-Builds of the image are also available on the [Github Container Registry](https://github.com/tiredofit/docker-nginx-php-fpm/pkgs/container/docker-nginx-php-fpm) 
- 
+Builds of the image are also available on the [Github Container Registry](https://github.com/tiredofit/docker-nginx-php-fpm/pkgs/container/docker-nginx-php-fpm)
+
 ```
 docker pull ghcr.io/tiredofit/docker-nginx-php-fpm:(imagetag)
-``` 
+```
 
 The following image tags are available along with their tagged release based on what's written in the [Changelog](CHANGELOG.md):
 
 | PHP version | Alpine Base | Tag            | Debian Base | Tag           |
 | ----------- | ----------- | -------------- | ----------- | ------------- |
 | latest      | edge        | `:alpine-edge` |             |               |
-| 8.2.x       | edge        | `:alpine-8.1`  | Bullseye    | `:debian-8.2` |
+| 8.2.x       | edge        | `:alpine-8.2`  | Bullseye    | `:debian-8.2` |
 | 8.1.x       | 3.17        | `:alpine-8.1`  | Buster      | `:debian-8.1` |
 | 8.0.x       | 3.16        | `:alpine-8.0`  | Buster      | `:debian-8.0` |
 | 7.4.x       | 3.15        | `:alpine-7.4`  | Buster      | `:debian-7.3` |
@@ -203,6 +203,7 @@ When `PHP_FPM_CONTAINER_MODE` set to `nginx` the `PHP_FPM_LISTEN_PORT` environme
 | `PHP_FPM_POST_INIT_SCRIPT`            | If you wish to execute a script before php-fpm executes, enter it here and seperate multiples by comma.  |                                                |
 | `PHP_FPM_PROCESS_MANAGER`             | How to handle processes `static`, `ondemand`, `dynamic`                                                  | `dynamic`                                      |
 | `PHP_FPM_START_SERVERS`               | How many FPM servers to start initially                                                                  | `2`                                            |
+| `PHP_HIDE_X_POWERED_BY`               | Hide X-Powered by response                                                                               | `TRUE`                                         |
 | `PHP_LOG_ACCESS_FILE`                 | PHP Access Logfile Name                                                                                  | `access.log`                                   |
 | `PHP_LOG_ERROR_FILE`                  | Logfile name                                                                                             | `error.log`                                    |
 | `PHP_LOG_LEVEL`                       | PHP Log Level `alert` `error` `warning` `notice` `debug`                                                 | `notice`                                       |

diff --git a/install/assets/defaults/20-php-fpm b/install/assets/defaults/20-php-fpm
@@ -7,6 +7,7 @@ PHP_APC_TTL=${PHP_APC_TTL:-"7200"}
 PHP_FPM_CONTAINER_MODE=${PHP_FPM_CONTAINER_MODE:-"nginx-php-fpm"}
 PHP_DISPLAY_ERRORS=${PHP_DISPLAY_ERRORS:-"TRUE"}
 PHP_ENABLE_CREATE_SAMPLE_PHP=${PHP_ENABLE_CREATE_SAMPLE_PHP:-"TRUE"}
+PHP_HIDE_X_POWERED_BY=${PHP_HIDE_X_POWERED_BY:-"TRUE"}
 PHP_KITCHENSINK=${PHP_KITCHENSINK:-"FALSE"}
 PHP_FPM_HOST=${PHP_FPM_HOST:-"127.0.0.1"}
 PHP_FPM_LISTEN_PORT=${PHP_FPM_LISTEN_PORT:-"9000"}

diff --git a/install/assets/functions/20-php-fpm b/install/assets/functions/20-php-fpm
@@ -177,6 +177,10 @@ phpfpm_configure_nginx() {
                 -e "/# Do not delete - Upstream Configuration/a\ \ \ \ include \/etc\/nginx\/snippets\/php-fpm-upstream.conf;" \
                 -e "/# Do not delete - Upstream Configuration/a\ \ \ \ ### PHP-FPM Multiple Handlers configuration" \
             /etc/nginx/nginx.conf
+
+    if var_true "${PHP_HIDE_X_POWERED_BY}" ; then
+        sed -i "/fastcgi_buffer_size/a \    fastcgi_hide_header X-Powered-By;" /etc/nginx/nginx.conf
+    fi
 }
 
 phpfpm_configure_server() {