From 946c6d130bfc2d21a847b3a6527140009f847e61 Mon Sep 17 00:00:00 2001 From: Hicham Boulahboub Date: Wed, 29 Jun 2022 15:47:49 +0200 Subject: [PATCH 1/5] Update PHP 8 flavour properly --- README.md | 8 ++++---- bin/ci.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index fb33076..a2d4eaf 100644 --- a/README.md +++ b/README.md @@ -39,10 +39,10 @@ set via environment variables and makes it easy to check external services (like * extends official docker php images * provides generic build and life cycle infrastructure for containerized PHP applications (well prepared for kubernetes) -* shipped as PHP 7.1.x, 7.2.x and 7.3.x flavor +* shipped as PHP 7.1.x, 7.2.x and 7.3.x 8.1.x flavor * there is a (build>base already run / build>base only prepared) flavor for each PHP version -* general run concept: `docker run --rm -t claranet/php:1.1.58-php7.3.13 [subsection] [subsection-args, ...]` -* overview: `docker run --rm -t claranet/php:1.1.58-php7.3.13 help` +* general run concept: `docker run --rm -t claranet/php:1.1.58-php8.1.7 [subsection] [subsection-args, ...]` +* overview: `docker run --rm -t claranet/php:1.1.58-php8.1.7 help` * supplied services - nginx - phpfpm @@ -50,7 +50,7 @@ set via environment variables and makes it easy to check external services (like Build image locally: ```sh -# generates local/claranet/php:1.1.58-php7.3.13 +# generates local/claranet/php:1.1.58-php8.1.7 ./bin/image.sh build ``` diff --git a/bin/ci.sh b/bin/ci.sh index a1f6786..1c16c0a 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -5,8 +5,8 @@ WORKDIR=$(realpath $0 | xargs dirname | xargs dirname) export VERSION=$(cat $WORKDIR/VERSION) export IMAGE_NAME="claranet/php" -FROM_IMAGE_TAGS="7.1.33-fpm-stretch 7.2.34-fpm-stretch 7.3.28-fpm-stretch" -LATEST_IMAGE="7.3.28-fpm-stretch" +FROM_IMAGE_TAGS="7.1.33-fpm-stretch 7.2.34-fpm-stretch 7.3.28-fpm-stretch 8.1.7-fpm-buster" +LATEST_IMAGE="8.1.7-fpm-buster" # Based on $GITHUB_HEAD_REF which is set fot pull requests # and $RELEASE_VERSION which holds either the branch name or tag From 280a70546aea7b15b310ac8a2db2fd33bd041633 Mon Sep 17 00:00:00 2001 From: Hicham Boulahboub Date: Wed, 29 Jun 2022 16:18:39 +0200 Subject: [PATCH 2/5] Remove 7.1 - 7.3 flavors as support is end of life --- bin/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ci.sh b/bin/ci.sh index 1c16c0a..b452fc3 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -5,7 +5,7 @@ WORKDIR=$(realpath $0 | xargs dirname | xargs dirname) export VERSION=$(cat $WORKDIR/VERSION) export IMAGE_NAME="claranet/php" -FROM_IMAGE_TAGS="7.1.33-fpm-stretch 7.2.34-fpm-stretch 7.3.28-fpm-stretch 8.1.7-fpm-buster" +FROM_IMAGE_TAGS="8.1.7-fpm-buster" LATEST_IMAGE="8.1.7-fpm-buster" # Based on $GITHUB_HEAD_REF which is set fot pull requests From 51b92fa1e83eaf1ff05477c0f4a80079e4017183 Mon Sep 17 00:00:00 2001 From: Hicham Boulahboub Date: Wed, 29 Jun 2022 16:44:56 +0200 Subject: [PATCH 3/5] Remove php 7.x flavor and update nodejs, newrelic --- CHANGELOG.md | 14 ++++++++++++++ Dockerfile | 6 +++--- README.md | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a85f965..b062dfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +# 1.1.59 (2022-06-29) + +**FIXES** +- Add flavour properly to be generated by CI +- Update docs + +**UPDATES** +- Updated nodejs to 18 +- Updated new relic agent to php5-9.21.0.311 + - Updated framework to symfony4 (previously symfony2) + +**REMOVAL** +- Remove flavor and support for PHP 7.x versions (end of life) + # 1.1.58 (2022-06-29) **UPDATES** diff --git a/Dockerfile b/Dockerfile index 792d858..e3dc13d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ ENV NGINX_SITES_AVAILABLE="/etc/nginx/sites-available" \ # NODEJS ENV ENABLE_NODEJS="true" \ - NODEJS_VERSION="14" \ + NODEJS_VERSION="18" \ ENABLE_BOWER="true" \ NPM="npm" \ NPM_BUILD_PACKAGES="" \ @@ -57,7 +57,7 @@ ENV ENABLE_NODEJS="true" \ # PHP ENV PHP="php" \ FPM="php-fpm" \ - NEWRELIC_PHP_VERSION="php5-8.0.0.204" \ + NEWRELIC_PHP_VERSION="php5-9.21.0.311" \ PHP_EXTENSIONS_STARTUP_ONLY="xdebug APCu imagick redis" \ PHP_EXTENSIONS_STARTUP_ENABLE="" \ PHP_EXTENSIONS="bcmath bz2 gd gmp intl json mbstring opcache dom curl pgsql pdo_pgsql pdo_mysql ldap soap zip xdebug-3.1.5 imagick-3.7.0 redis-5.3.7 APCu" \ @@ -86,7 +86,7 @@ ENV PHP="php" \ PHP_INI_MAX_FILE_UPLOADS="100" \ PHP_INI_SHORT_OPEN_TAG="False" \ PHP_INI_NEWRELIC_APPNAME="myapp" \ - PHP_INI_NEWRELIC_FRAMEWORK="symfony2" \ + PHP_INI_NEWRELIC_FRAMEWORK="symfony4" \ PHP_INI_NEWRELIC_LICENSE="xxx" \ BLACKFIRE_AGENT="blackfire:8707" \ CONSOLE="exec_console" \ diff --git a/README.md b/README.md index a2d4eaf..376f132 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ set via environment variables and makes it easy to check external services (like * extends official docker php images * provides generic build and life cycle infrastructure for containerized PHP applications (well prepared for kubernetes) -* shipped as PHP 7.1.x, 7.2.x and 7.3.x 8.1.x flavor +* shipped as PHP 8.1.x flavor * there is a (build>base already run / build>base only prepared) flavor for each PHP version * general run concept: `docker run --rm -t claranet/php:1.1.58-php8.1.7 [subsection] [subsection-args, ...]` * overview: `docker run --rm -t claranet/php:1.1.58-php8.1.7 help` From 2d6d65249293c794c34b0e995a779a02f0424ca7 Mon Sep 17 00:00:00 2001 From: Hicham Boulahboub Date: Wed, 29 Jun 2022 17:00:15 +0200 Subject: [PATCH 4/5] Add running github actions on push to branch --- .github/workflows/build-and-release-image.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release-image.yaml b/.github/workflows/build-and-release-image.yaml index 5795f2f..66c1fa8 100644 --- a/.github/workflows/build-and-release-image.yaml +++ b/.github/workflows/build-and-release-image.yaml @@ -5,7 +5,7 @@ on: pull_request: push: branches: - - master + - '*' tags: - '*' @@ -29,4 +29,4 @@ jobs: env: DOCKER_USER: ${{ secrets.DOCKER_USER }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - run: ./bin/ci.sh run \ No newline at end of file + run: ./bin/ci.sh run From ad03ef4fd2333514e631665805864ada32b5322d Mon Sep 17 00:00:00 2001 From: Hicham Boulahboub Date: Wed, 29 Jun 2022 17:03:23 +0200 Subject: [PATCH 5/5] Fix github actions detecting all branches --- .github/workflows/build-and-release-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release-image.yaml b/.github/workflows/build-and-release-image.yaml index 66c1fa8..91b3bb6 100644 --- a/.github/workflows/build-and-release-image.yaml +++ b/.github/workflows/build-and-release-image.yaml @@ -5,7 +5,7 @@ on: pull_request: push: branches: - - '*' + - '**' tags: - '*'