v7.1.0 (#191)

Major updates * Adding support for PHP 8.3 Minor updates * Using latest base images * Don't use custom session / upload paths Documentation updates * Adding sample www-conf.json file * Improving documentation to reflect v7.x changes Development updates * Making PHP 8.3 the default in run.sh
bfren · Dec 9, 2023 · f83166b · f83166b
1 parent 53851dd
commit f83166b
Show file tree

Hide file tree

Showing 18 changed files with 68 additions and 54 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ "7.4", "8.0", "8.1", "8.2" ]
+        php: [ "7.4", "8.0", "8.1", "8.2", "8.3" ]
     runs-on: ubuntu-latest
     steps:
       -

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ "7.4", "8.0", "8.1", "8.2" ]
+        php: [ "7.4", "8.0", "8.1", "8.2", "8.3" ]
     runs-on: ubuntu-latest
     steps:
       -

diff --git a/7.4/Dockerfile b/7.4/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v2.0.4 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.1.0 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM bfren/nginx:nginx1.20-alpine3.15-6.0.4 as final
+FROM bfren/nginx:nginx1.20-alpine3.15-6.1.0 as final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"

diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v2.0.4 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.1.0 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM bfren/nginx:nginx1.22-alpine3.16-6.0.4 as final
+FROM bfren/nginx:nginx1.22-alpine3.16-6.1.0 as final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"

diff --git a/8.1/Dockerfile b/8.1/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v2.0.4 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.1.0 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM bfren/nginx:nginx1.24-alpine3.18-6.0.4 as final
+FROM bfren/nginx:nginx1.24-alpine3.18-6.1.0 as final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"

diff --git a/8.2/Dockerfile b/8.2/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v2.0.4 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.1.0 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM bfren/nginx:nginx1.24-alpine3.18-6.0.4 as final
+FROM bfren/nginx:nginx1.24-alpine3.18-6.1.0 as final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"

diff --git a/8.3/Dockerfile b/8.3/Dockerfile
@@ -0,0 +1,41 @@
+#======================================================================================================================
+# STAGE 0: get Nu scripts from the PHP image overlay
+#======================================================================================================================
+
+FROM alpine AS php
+
+WORKDIR /tmp
+RUN \
+    # get the Nu scripts from the PHP image overlay
+    echo "Cloning Alpine overlay." && \
+    apk add git && git clone --branch v2.1.0 https://github.com/bfren/docker-php.git && \
+    mkdir /overlay && \
+    mv docker-php/overlay/etc /overlay/
+
+
+#======================================================================================================================
+# STAGE 1: create final image
+#======================================================================================================================
+
+FROM bfren/nginx:nginx1.24-alpine3.19-6.1.0 as final
+COPY --from=php /overlay /
+
+LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
+
+ARG BF_IMAGE
+ARG BF_VERSION
+
+COPY ./overlay /
+COPY ./8.3/overlay /
+
+ENV \
+    # PHP config directory
+    BF_PHP_DIR="/etc/php83" \
+    # offical php.ini template to download
+    BF_PHP_ENV="production" \
+    # space-separated extensions to install on startup
+    BF_PHP_EXT= \
+    # PHP package prefix
+    BF_PHP_PREFIX="php83"
+
+RUN bf-install
diff --git a/8.3/NGINX_BASE b/8.3/NGINX_BASE
@@ -0,0 +1 @@
+nginx1.24-alpine3.19
diff --git a/8.3/PHP_PREFIX b/8.3/PHP_PREFIX
@@ -0,0 +1 @@
+php83
diff --git a/8.3/overlay/tmp/PHP_BUILD b/8.3/overlay/tmp/PHP_BUILD
@@ -0,0 +1 @@
+8.3.0-r0
diff --git a/8.3/overlay/tmp/PHP_REVISION b/8.3/overlay/tmp/PHP_REVISION
@@ -0,0 +1 @@
+8.3.0
diff --git a/README.md b/README.md
@@ -4,23 +4,20 @@
 
 [Docker Repository](https://hub.docker.com/r/bfren/nginx-php) - [bfren ecosystem](https://github.com/bfren/docker)
 
-Nginx plus PHP (7.4, 8.0, 8.1 and 8.2) - no SSL support etc, designed to be used behind a proxy server.  Minimal PHP packages are installed:
+Nginx plus PHP (7.4, 8.0, 8.1, 8.2 and 8.3) - no SSL support etc, designed to be used behind a proxy server.  Minimal PHP packages are installed:
 
 * `php`
 * `php-common`
 * `php-fpm`
 * `php-session`
 
-Nginx is setup by default to run PHP in FPM mode.
-
-Additionally, `bash` is installed as it is required by some of the setup scripts.
+Nginx is setup by default to run PHP in FPM mode.  To override values in www.conf map a `www-conf.json` file to root - see `www-conf-sample.json`.  Values in the php.ini file can be overridden in the same way - see [Docker PHP](https://github.com/bfren/docker-php) for more information and a sample file.
 
 ## Contents
 
 * [Ports](#ports)
 * [Volumes](#volumes)
 * [Environment Variables](#environment-variables)
-* [Helper Functions](#helper-functions)
 * [Nginx Configuration Helpers](#nginx-configuration-helpers)
 * [Licence / Copyright](#licence)
 
@@ -36,36 +33,7 @@ Additionally, `bash` is installed as it is required by some of the setup scripts
 
 ## Environment Variables
 
-### php.ini
-
-| Variable  | Values                        | Description                                                                    | Default      |
-| --------- | ----------------------------- | ------------------------------------------------------------------------------ | ------------ |
-| `PHP_INI` | 'production' or 'development' | Defines which official php.ini template to use, "production" or "development". | 'production' |
-
-The following environment variables will override values in `php.ini` (see [here](https://www.php.net/manual/en/ini.list.php)):
-
-| Variable                         | Directive              | Default Value |
-| -------------------------------- | ---------------------- | ------------- |
-| `PHP_INI_DISPLAY_ERRORS`         | display_errors         | *None*        |
-| `PHP_INI_DISPLAY_STARTUP_ERRORS` | display_startup_errors | *None*        |
-| `PHP_INI_ERROR_REPORTING`        | error_reporting        | *None*        |
-| `PHP_INI_MEMORY_LIMIT`           | memory_limit           | 256M          |
-| `PHP_INI_MAX_UPLOAD`             | upload_max_filesize    | 64M           |
-| `PHP_INI_MAX_POST`               | post_max_size          | 64M           |
-
-### FPM Configuration
-
-The following environment variables will override values in `php-fpm.d/www.conf` (see [here](https://www.php.net/manual/en/install.fpm.configuration.php)):
-
-| Variable            | Directive | Default Value |
-| ------------------- | --------- | ------------- |
-| `PHP_FPM_LOG_LEVEL` | log_level | 'notice'      |
-
-## Helper Functions
-
-| Function             | Arguments | Description                                                 |
-| -------------------- | --------- | ----------------------------------------------------------- |
-| `php-clean-sessions` | *None*    | Cleans PHP session information - the cron runs this hourly. |
+See [Docker PHP](https://github.com/bfren/docker-php) for configuration instructions.
 
 ## Nginx Configuration Helpers
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.0.5
+7.1.0
diff --git a/VERSION_MINOR b/VERSION_MINOR
@@ -1 +1 @@
-7.0
+7.1
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
@@ -4,9 +4,9 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_VERSION="6.0.5"
-PHP_BRANCH="v2.0.5"
-PHP_VERSIONS="7.4 8.0 8.1 8.2"
+BASE_VERSION="6.1.0"
+PHP_BRANCH="v2.1.0"
+PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3"
 
 for V in ${PHP_VERSIONS} ; do
 

diff --git a/overlay/php-ini.json b/overlay/php-ini.json
@@ -8,8 +8,6 @@
     "session.cookie_secure": 1,
     "session.gc_maxlifetime": "86400",
     "session.name": "bf-nginx-php-sessid",
-    "session.save_path": "/tmp/php/session",
     "session.use_strict_mode": 1,
-    "upload_max_filesize": "64M",
-    "upload_tmp_dir": "/tmp/php/upload"
+    "upload_max_filesize": "64M"
 }
diff --git a/run.sh b/run.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 IMAGE=`cat VERSION`
-PHP=${1:-8.2}
+PHP=${1:-8.3}
 
 docker buildx build \
     --load \

diff --git a/www-conf-sample.json b/www-conf-sample.json
@@ -0,0 +1,3 @@
+{
+    "clear_env": "yes"
+}