From 23a1d0f62591b79b17e6aa7a7ef36f95ad81973b Mon Sep 17 00:00:00 2001 From: alexanderM91 Date: Wed, 3 Jun 2026 14:08:07 +0200 Subject: [PATCH 1/7] Update PHP version to the latest --- README.md | 8 ++++---- alpine/3.22/8.2/Dockerfile | 2 +- alpine/3.23/8.4/Dockerfile | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8492bcc5..f9ba013d 100644 --- a/README.md +++ b/README.md @@ -30,15 +30,15 @@ Extends official PHP Docker images with extensions and tools to be able to run S | Tag | PHP version | Linux distribution | Details | Dockerfile | OTEL support | |:--------------------------------------------------------------------------------------------|:------------|:-------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------|:------------:| | [spryker/php:latest](https://hub.docker.com/r/spryker/php/tags?name=latest) | 8.2.31 | Alpine 3.23 | [![](https://images.microbadger.com/badges/image/spryker/php:latest.svg)](https://microbadger.com/images/spryker/php:latest "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.2/Dockerfile) | ✖ | -| [spryker/php:8.4](https://hub.docker.com/r/spryker/php/tags?name=8.4) | 8.4.19 | Alpine 3.23 | [![](https://images.microbadger.com/badges/image/spryker/php:8.4.svg)](https://microbadger.com/images/spryker/php:8.4 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.4/Dockerfile) | ✔ | +| [spryker/php:8.4](https://hub.docker.com/r/spryker/php/tags?name=8.4) | 8.4.21 | Alpine 3.23 | [![](https://images.microbadger.com/badges/image/spryker/php:8.4.svg)](https://microbadger.com/images/spryker/php:8.4 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.4/Dockerfile) | ✔ | | [spryker/php:8.3](https://hub.docker.com/r/spryker/php/tags?name=8.3) | 8.3.31 | Alpine 3.23 | [![](https://images.microbadger.com/badges/image/spryker/php:8.3.svg)](https://microbadger.com/images/spryker/php:8.3 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.3/Dockerfile) | ✔ | | [spryker/php:8.2](https://hub.docker.com/r/spryker/php/tags?name=8.2) | 8.2.31 | Alpine 3.23 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2.svg)](https://microbadger.com/images/spryker/php:8.2 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.2/Dockerfile) | ✖ | -| [spryker/php:8.4-alpine3.23](https://hub.docker.com/r/spryker/php/tags?name=8.4-alpine3.23) | 8.4.19 | Alpine 3.23 | [![](https://images.microbadger.com/badges/image/spryker/php:8.4-alpine3.23.svg)](https://microbadger.com/images/spryker/php:8.4-alpine3.23 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.4/Dockerfile) | ✔ | +| [spryker/php:8.4-alpine3.23](https://hub.docker.com/r/spryker/php/tags?name=8.4-alpine3.23) | 8.4.21 | Alpine 3.23 | [![](https://images.microbadger.com/badges/image/spryker/php:8.4-alpine3.23.svg)](https://microbadger.com/images/spryker/php:8.4-alpine3.23 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.4/Dockerfile) | ✔ | | [spryker/php:8.3-alpine3.23](https://hub.docker.com/r/spryker/php/tags?name=8.3-alpine3.23) | 8.3.31 | Alpine 3.23 | [![](https://images.microbadger.com/badges/image/spryker/php:8.3-alpine3.23.svg)](https://microbadger.com/images/spryker/php:8.3-alpine3.23 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.3/Dockerfile) | ✔ | | [spryker/php:8.2-alpine3.23](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.23) | 8.2.31 | Alpine 3.23 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.23.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.23 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.2/Dockerfile) | ✖ | | [spryker/php:8.4-alpine3.22](https://hub.docker.com/r/spryker/php/tags?name=8.4-alpine3.22) | 8.4.21 | Alpine 3.22 | [![](https://images.microbadger.com/badges/image/spryker/php:8.4-alpine3.22.svg)](https://microbadger.com/images/spryker/php:8.4-alpine3.22 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.22/8.4/Dockerfile) | ✔ | | [spryker/php:8.3-alpine3.22](https://hub.docker.com/r/spryker/php/tags?name=8.3-alpine3.22) | 8.3.31 | Alpine 3.22 | [![](https://images.microbadger.com/badges/image/spryker/php:8.3-alpine3.22.svg)](https://microbadger.com/images/spryker/php:8.3-alpine3.22 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.22/8.3/Dockerfile) | ✔ | -| [spryker/php:8.2-alpine3.22](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.22) | 8.2.30 | Alpine 3.22 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.22.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.22 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.22/8.2/Dockerfile) | ✔ | +| [spryker/php:8.2-alpine3.22](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.22) | 8.2.31 | Alpine 3.22 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.22.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.22 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.22/8.2/Dockerfile) | ✔ | | [spryker/php:8.4-alpine3.21](https://hub.docker.com/r/spryker/php/tags?name=8.4-alpine3.21) | 8.4.15 | Alpine 3.21 | [![](https://images.microbadger.com/badges/image/spryker/php:8.4-alpine3.21.svg)](https://microbadger.com/images/spryker/php:8.4-alpine3.21 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.21/8.4/Dockerfile) | ✔ | | [spryker/php:8.3-alpine3.21](https://hub.docker.com/r/spryker/php/tags?name=8.3-alpine3.21) | 8.3.28 | Alpine 3.21 | [![](https://images.microbadger.com/badges/image/spryker/php:8.3-alpine3.21.svg)](https://microbadger.com/images/spryker/php:8.3-alpine3.21 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.21/8.3/Dockerfile) | ✔ | | [spryker/php:8.2-alpine3.21](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.21) | 8.2.29 | Alpine 3.21 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.21.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.21 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.21/8.2/Dockerfile) | ✔ | @@ -200,7 +200,7 @@ xhprof 2.3.10 stable Composer ==================== Composer version 2.9.3 2025-12-30 13:40:17 -PHP version 8.2.30 (/usr/local/bin/php) +PHP version 8.2.31 (/usr/local/bin/php) ``` ##### Run the following to get the report ```bash diff --git a/alpine/3.22/8.2/Dockerfile b/alpine/3.22/8.2/Dockerfile index 949511af..a22016f2 100644 --- a/alpine/3.22/8.2/Dockerfile +++ b/alpine/3.22/8.2/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.2.30 +ARG SPRYKER_PHP_VERSION=8.2.31 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.22 ARG TARGETPLATFORM diff --git a/alpine/3.23/8.4/Dockerfile b/alpine/3.23/8.4/Dockerfile index d462d5b6..42500bcc 100644 --- a/alpine/3.23/8.4/Dockerfile +++ b/alpine/3.23/8.4/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.4.19 +ARG SPRYKER_PHP_VERSION=8.4.21 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.23 ARG TARGETPLATFORM From 96a70540488bfacae127c1139a795ef004a3d7cf Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Wed, 3 Jun 2026 15:48:32 +0200 Subject: [PATCH 2/7] Update ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0774bc85..30c92634 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,7 @@ name: CI/CD -on: push +on: + workflow_call: concurrency: group: ${{ github.workflow }}-${{ github.ref }} From 86446f721cea2a8bc0df0849f2fc30d5fc9ca27c Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Wed, 3 Jun 2026 15:50:42 +0200 Subject: [PATCH 3/7] Update ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30c92634..6cbafa7b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,7 @@ name: CI/CD on: + push: workflow_call: concurrency: From fecd84fa64d8c23b74449301a0e8ba728fa3cc89 Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Wed, 3 Jun 2026 15:54:54 +0200 Subject: [PATCH 4/7] Update ci.yml --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6cbafa7b..0cd21ca5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,8 +1,6 @@ name: CI/CD -on: - push: - workflow_call: +on: push: concurrency: group: ${{ github.workflow }}-${{ github.ref }} From fe9b420993796fb2b76ff6d63c0a6defadb8ef89 Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Wed, 3 Jun 2026 15:55:08 +0200 Subject: [PATCH 5/7] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0cd21ca5..0774bc85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,6 @@ name: CI/CD -on: push: +on: push concurrency: group: ${{ github.workflow }}-${{ github.ref }} From 789ac4ac0fdd5f1c71370a2d9956d7f3cc292b78 Mon Sep 17 00:00:00 2001 From: Vlad Rugiubei Date: Wed, 3 Jun 2026 16:10:03 +0200 Subject: [PATCH 6/7] Fix ci & release-notes workflows --- .github/workflows/ci.yml | 9 ++++++++- .github/workflows/combined-workflow.yml | 7 +------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0774bc85..bb2cccf5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,13 @@ name: CI/CD -on: push +on: + pull_request: + branches: + - master + push: + branches-ignore: + - master + workflow_call: concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/combined-workflow.yml b/.github/workflows/combined-workflow.yml index 4fd6b646..26328988 100644 --- a/.github/workflows/combined-workflow.yml +++ b/.github/workflows/combined-workflow.yml @@ -1,9 +1,6 @@ name: "Combined CI/CD, Security Scan & Release Notes" on: - push: - branches: - - master pull_request: types: [closed] branches: @@ -26,9 +23,7 @@ jobs: # Step 3: Release Notes release-notes: needs: security-scan - if: | - github.event.pull_request.merged == true && - (always() || needs.security-scan.result == 'failure') + if: always() && github.event.pull_request.merged == true uses: ./.github/workflows/release-notes.yml secrets: inherit with: From adecab829f22c956da978c75f2b37128aa0f1fa2 Mon Sep 17 00:00:00 2001 From: Vlad Rugiubei Date: Wed, 3 Jun 2026 16:19:31 +0200 Subject: [PATCH 7/7] Fix ci & release-notes workflows --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb2cccf5..22a698ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,9 +4,6 @@ on: pull_request: branches: - master - push: - branches-ignore: - - master workflow_call: concurrency: