From 1a3fcfacb8ca0158c203fe9a67a1a6f38ef3d16d Mon Sep 17 00:00:00 2001 From: Ben Green Date: Sun, 7 Feb 2021 14:58:16 +0000 Subject: [PATCH 1/2] Show PHP version when service is started --- 7.3/php-fpm/run | 3 ++- 7.4/php-fpm/run | 3 ++- 8.0/php-fpm/run | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/7.3/php-fpm/run b/7.3/php-fpm/run index ef6798a..0ea06a6 100644 --- a/7.3/php-fpm/run +++ b/7.3/php-fpm/run @@ -8,5 +8,6 @@ set -euo pipefail # -F run in foreground mode (allows S6 to supervise the service) #====================================================================================================================== -_echo "Starting PHP FastCGI Process Manager" +VERSION=$(php -r "echo PHP_VERSION;") +_echo "Starting PHP v${VERSION} - FastCGI Process Manager" php-fpm7 -F diff --git a/7.4/php-fpm/run b/7.4/php-fpm/run index ef6798a..0ea06a6 100644 --- a/7.4/php-fpm/run +++ b/7.4/php-fpm/run @@ -8,5 +8,6 @@ set -euo pipefail # -F run in foreground mode (allows S6 to supervise the service) #====================================================================================================================== -_echo "Starting PHP FastCGI Process Manager" +VERSION=$(php -r "echo PHP_VERSION;") +_echo "Starting PHP v${VERSION} - FastCGI Process Manager" php-fpm7 -F diff --git a/8.0/php-fpm/run b/8.0/php-fpm/run index 906bd93..4d199d2 100644 --- a/8.0/php-fpm/run +++ b/8.0/php-fpm/run @@ -8,5 +8,6 @@ set -euo pipefail # -F run in foreground mode (allows S6 to supervise the service) #====================================================================================================================== -_echo "Starting PHP FastCGI Process Manager" +VERSION=$(php -r "echo PHP_VERSION;") +_echo "Starting PHP v${VERSION} - FastCGI Process Manager" php-fpm8 -F From e22e1fe621c3d71547dedd3b240834eb8e15dba7 Mon Sep 17 00:00:00 2001 From: Ben Green Date: Sun, 7 Feb 2021 14:58:35 +0000 Subject: [PATCH 2/2] Updating Nginx base image version --- 7.3/Dockerfile | 2 +- 7.4/Dockerfile | 2 +- 8.0/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/7.3/Dockerfile b/7.3/Dockerfile index feafcd9..6eba710 100644 --- a/7.3/Dockerfile +++ b/7.3/Dockerfile @@ -1,4 +1,4 @@ -FROM bcgdesign/nginx:alpine-3.12-1.3.0 +FROM bcgdesign/nginx:alpine-3.12-1.3.1 LABEL maintainer="Ben Green " \ org.label-schema.name="Nginx + PHP" \ diff --git a/7.4/Dockerfile b/7.4/Dockerfile index b583819..99a6402 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -1,4 +1,4 @@ -FROM bcgdesign/nginx:alpine-3.13-1.3.0 +FROM bcgdesign/nginx:alpine-3.13-1.3.1 LABEL maintainer="Ben Green " \ org.label-schema.name="Nginx + PHP" \ diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 89706b4..b88dd7c 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM bcgdesign/nginx:alpine-3.13-1.3.0 +FROM bcgdesign/nginx:alpine-3.13-1.3.1 LABEL maintainer="Ben Green " \ org.label-schema.name="Nginx + PHP" \