From 9e1e0c3b9d72ef9450ad2e88c7520fa165a1107f Mon Sep 17 00:00:00 2001 From: Alliballibaba Date: Tue, 8 Jul 2025 22:09:23 +0200 Subject: [PATCH 1/3] Compares docker images with latest release version. --- .github/workflows/docker.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 0b3f5aef2f..d4ec6f0cad 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -69,9 +69,10 @@ jobs: exit 0 fi - FRANKENPHP_82_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:php8.2 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")') - FRANKENPHP_83_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:php8.3 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")') - FRANKENPHP_84_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:php8.4 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")') + FRANKENPHP_LATEST_TAG=$(gh release view --repo php/frankenphp --json tagName --jq '.tagName') + FRANKENPHP_82_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:${FRANKENPHP_LATEST_TAG}-php8.2 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")') + FRANKENPHP_83_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:${FRANKENPHP_LATEST_TAG}-php8.3 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")') + FRANKENPHP_84_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:${FRANKENPHP_LATEST_TAG}-php8.4 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")') if [[ "${FRANKENPHP_82_LATEST}" == "${PHP_82_LATEST}" ]] && [[ "${FRANKENPHP_83_LATEST}" == "${PHP_83_LATEST}" ]] && [[ "${FRANKENPHP_84_LATEST}" == "${PHP_84_LATEST}" ]]; then echo skip=true >> "${GITHUB_OUTPUT}" @@ -79,7 +80,7 @@ jobs: fi { - echo ref="$(gh release view --repo dunglas/frankenphp --json tagName --jq '.tagName')" + echo ref="FRANKENPHP_LATEST_TAG" echo skip=false } >> "${GITHUB_OUTPUT}" - uses: actions/checkout@v4 From 2c77dc63d7c75925549f65a032da3c8bed89a59a Mon Sep 17 00:00:00 2001 From: Alliballibaba Date: Tue, 8 Jul 2025 22:16:09 +0200 Subject: [PATCH 2/3] Fixes variable. --- .github/workflows/docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index d4ec6f0cad..9d19c9722b 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -80,7 +80,7 @@ jobs: fi { - echo ref="FRANKENPHP_LATEST_TAG" + echo ref="${FRANKENPHP_LATEST_TAG}" echo skip=false } >> "${GITHUB_OUTPUT}" - uses: actions/checkout@v4 From 50fb72f4383cbc6f5f6ad474cefdee98a30637cd Mon Sep 17 00:00:00 2001 From: Alliballibaba Date: Tue, 8 Jul 2025 22:24:42 +0200 Subject: [PATCH 3/3] Makes linter happy --- .github/workflows/docker.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 9d19c9722b..f496a35034 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -70,9 +70,9 @@ jobs: fi FRANKENPHP_LATEST_TAG=$(gh release view --repo php/frankenphp --json tagName --jq '.tagName') - FRANKENPHP_82_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:${FRANKENPHP_LATEST_TAG}-php8.2 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")') - FRANKENPHP_83_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:${FRANKENPHP_LATEST_TAG}-php8.3 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")') - FRANKENPHP_84_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:${FRANKENPHP_LATEST_TAG}-php8.4 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")') + FRANKENPHP_82_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:"${FRANKENPHP_LATEST_TAG}"-php8.2 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")') + FRANKENPHP_83_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:"${FRANKENPHP_LATEST_TAG}"-php8.3 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")') + FRANKENPHP_84_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:"${FRANKENPHP_LATEST_TAG}"-php8.4 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")') if [[ "${FRANKENPHP_82_LATEST}" == "${PHP_82_LATEST}" ]] && [[ "${FRANKENPHP_83_LATEST}" == "${PHP_83_LATEST}" ]] && [[ "${FRANKENPHP_84_LATEST}" == "${PHP_84_LATEST}" ]]; then echo skip=true >> "${GITHUB_OUTPUT}"