v1.4.0 (#13)

Major updates
* Updating to latest base image
* Using bcg- executables

Author: bfren

7.3/Dockerfile

@@ -1,4 +1,4 @@
-FROM bcgdesign/nginx:alpine-3.12-1.3.2
+FROM bcgdesign/nginx:alpine-3.12-1.4.1
 
 LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
     org.label-schema.name="Nginx + PHP" \

7.3/php-fpm/run

@@ -9,5 +9,5 @@ set -euo pipefail
 #======================================================================================================================
 
 VERSION=$(php -r "echo PHP_VERSION;")
-_echo "Starting PHP v${VERSION} - FastCGI Process Manager"
+bcg-echo "Starting PHP v${VERSION} - FastCGI Process Manager"
 php-fpm7 -F

7.4/Dockerfile

@@ -1,4 +1,4 @@
-FROM bcgdesign/nginx:alpine-3.13-1.3.2
+FROM bcgdesign/nginx:alpine-3.13-1.4.1
 
 LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
     org.label-schema.name="Nginx + PHP" \

7.4/php-fpm/run

@@ -9,5 +9,5 @@ set -euo pipefail
 #======================================================================================================================
 
 VERSION=$(php -r "echo PHP_VERSION;")
-_echo "Starting PHP v${VERSION} - FastCGI Process Manager"
+bcg-echo "Starting PHP v${VERSION} - FastCGI Process Manager"
 php-fpm7 -F

8.0/Dockerfile

@@ -1,4 +1,4 @@
-FROM bcgdesign/nginx:alpine-3.13-1.3.2
+FROM bcgdesign/nginx:alpine-3.13-1.4.1
 
 LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
     org.label-schema.name="Nginx + PHP" \

8.0/php-fpm/run

@@ -9,5 +9,5 @@ set -euo pipefail
 #======================================================================================================================
 
 VERSION=$(php -r "echo PHP_VERSION;")
-_echo "Starting PHP v${VERSION} - FastCGI Process Manager"
+bcg-echo "Starting PHP v${VERSION} - FastCGI Process Manager"
 php-fpm8 -F

VERSION

@@ -1 +1 @@
-1.3.2
+1.4.0

overlay/etc/cont-init.d/20-php-fpm-config

@@ -7,7 +7,7 @@ set -euo pipefail
 # Optionally override configuration
 #======================================================================================================================
 
-_echo "Setting www.conf configuration values..."
+bcg-echo "Setting www.conf configuration values..."
 
 declare -A VALUES
 VALUES["user"]="www"
@@ -17,4 +17,4 @@ VALUES["log_level"]="${PHP_FPM_LOG_LEVEL-}"
 source /etc/functions/replace.sh
 replace VALUES "${PHP_DIR}/php-fpm.d/www.conf"
 
-_done
+bcg-done

overlay/etc/cont-init.d/21-php-ini-download

@@ -9,20 +9,20 @@ set -euo pipefail
 
 DOWNLOADED="${PHP_DIR}/php.ini-${PHP_INI}.downloaded"
 if [ -e ${DOWNLOADED} ] ; then
-    _ok "php.ini already downloaded."
+    bcg-ok "php.ini already downloaded."
     exit 0
 fi
 
 if [ "${PHP_INI}" = "development" ] || [ "${PHP_INI}" = "production" ] ; then
 
     URL="https://raw.githubusercontent.com/php/php-src/master/php.ini-${PHP_INI}"
-    _echo "Downloading php.ini from ${URL}..."
+    bcg-echo "Downloading php.ini from ${URL}..."
     wget -O "${PHP_DIR}/php.ini" ${URL} \
         && touch ${DOWNLOADED}
-    _done
+    bcg-done
 
 else
 
-    _error "Unsupported PHP_INI value: '${PHP_INI}'."
+    bcg-error "Unsupported PHP_INI value: '${PHP_INI}'."
 
 fi

overlay/etc/cont-init.d/22-php-ini-config

@@ -7,7 +7,7 @@ set -euo pipefail
 # Optionally override configuration
 #======================================================================================================================
 
-_echo "Setting php.ini configuration values..."
+bcg-echo "Setting php.ini configuration values..."
 
 declare -A VALUES
 VALUES["display_errors"]="${PHP_INI_DISPLAY_ERRORS-}"
@@ -22,4 +22,4 @@ VALUES["upload_max_filesize"]="${PHP_INI_MAX_UPLOAD-}"
 source /etc/functions/replace.sh
 replace VALUES "${PHP_DIR}/php.ini"
 
-_done
+bcg-done