From e71f87331763883bb0a3b09e5d54a5fd57e73ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastian=20Molle?= Date: Mon, 12 Feb 2024 10:17:52 +0100 Subject: [PATCH] Upgrade to PHP v8.3.2 --- .build.env | 2 +- Dockerfiles/Dockerfile.in | 4 ++-- README.md | 38 +++++++++++++++++++------------------- test/tests.cli.bats | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.build.env b/.build.env index d66330a..76c6dbf 100644 --- a/.build.env +++ b/.build.env @@ -2,7 +2,7 @@ DOCKER_IMAGE_NAME=docker.io/elasticms/base-php # Default PHP Version -PHP_VERSION=8.3.1 +PHP_VERSION=8.3.2 # Default Versions NODE_VERSION=20 diff --git a/Dockerfiles/Dockerfile.in b/Dockerfiles/Dockerfile.in index d9e4029..ad52949 100644 --- a/Dockerfiles/Dockerfile.in +++ b/Dockerfiles/Dockerfile.in @@ -5,7 +5,7 @@ ARG COMPOSER_VERSION_ARG FROM composer:${COMPOSER_VERSION_ARG:-2.6.5} AS composer FROM node:${NODE_VERSION_ARG:-20}-alpine3.18 AS node -FROM php:${VERSION_ARG:-8.3.1}-fpm-alpine3.18 AS fpm-prd +FROM php:${VERSION_ARG:-8.3.2}-fpm-alpine3.18 AS fpm-prd # include(fpm-prd.m4) @@ -29,7 +29,7 @@ FROM fpm-dev AS nginx-dev # include(nginx.m4) -FROM php:${VERSION_ARG:-8.3.1}-cli-alpine3.18 AS cli-prd +FROM php:${VERSION_ARG:-8.3.2}-cli-alpine3.18 AS cli-prd # include(cli-prd.m4) diff --git a/README.md b/README.md index 3d138e9..46f3c00 100644 --- a/README.md +++ b/README.md @@ -43,49 +43,49 @@ Default value of Docker build arguments is grabbed from the [.build.env](.build. ## Example building __fpm__ variant __prd__ Docker image ```sh -make build-fpm PHP_VERSION=8.3.1 +make build-fpm PHP_VERSION=8.3.2 ``` -__Provide docker image__ : `docker.io/elasticms/base-php:8.3.1-fpm-prd` +__Provide docker image__ : `docker.io/elasticms/base-php:8.3.2-fpm-prd` ```sh -make build-fpm PHP_VERSION=8.3.1 DOCKER_IMAGE_NAME=docker.io/lambdauser/mybasephpimage +make build-fpm PHP_VERSION=8.3.2 DOCKER_IMAGE_NAME=docker.io/lambdauser/mybasephpimage ``` -__Provide docker image__ : `docker.io/lambdauser/mybasephpimage:8.3.1-fpm-prd` +__Provide docker image__ : `docker.io/lambdauser/mybasephpimage:8.3.2-fpm-prd` ## Example building __fpm__ variant __dev__ Docker image ```sh -make build-fpm-dev PHP_VERSION=8.3.1 +make build-fpm-dev PHP_VERSION=8.3.2 ``` -__Provide docker image__ : `docker.io/elasticms/base-php:8.3.1-fpm-dev` +__Provide docker image__ : `docker.io/elasticms/base-php:8.3.2-fpm-dev` ## Example building __nginx__ variant __dev__ Docker image ```sh -make build-nginx-dev PHP_VERSION=8.3.1 +make build-nginx-dev PHP_VERSION=8.3.2 ``` -__Provide docker image__ : `docker.io/elasticms/base-php:8.3.1-nginx-dev` +__Provide docker image__ : `docker.io/elasticms/base-php:8.3.2-nginx-dev` ## Example building __all__ variants Docker image ```sh -make build-all PHP_VERSION=8.3.1 +make build-all PHP_VERSION=8.3.2 ``` __Provide docker images__ : -- `docker.io/elasticms/base-php:8.3.1-fpm-prd` -- `docker.io/elasticms/base-php:8.3.1-fpm-dev` -- `docker.io/elasticms/base-php:8.3.1-apache-prd` -- `docker.io/elasticms/base-php:8.3.1-apache-dev` -- `docker.io/elasticms/base-php:8.3.1-nginx-prd` -- `docker.io/elasticms/base-php:8.3.1-nginx-dev` -- `docker.io/elasticms/base-php:8.3.1-cli-prd` -- `docker.io/elasticms/base-php:8.3.1-cli-dev` +- `docker.io/elasticms/base-php:8.3.2-fpm-prd` +- `docker.io/elasticms/base-php:8.3.2-fpm-dev` +- `docker.io/elasticms/base-php:8.3.2-apache-prd` +- `docker.io/elasticms/base-php:8.3.2-apache-dev` +- `docker.io/elasticms/base-php:8.3.2-nginx-prd` +- `docker.io/elasticms/base-php:8.3.2-nginx-dev` +- `docker.io/elasticms/base-php:8.3.2-cli-prd` +- `docker.io/elasticms/base-php:8.3.2-cli-dev` # Test ## Prerequisite @@ -101,13 +101,13 @@ make test[-fpm|-apache|-nginx|-cli|-all][-dev] PHP_VERSION=