Skip to content

Commit 433ac70

Browse files
NoramarthNoramarth
committed
Refactor workflows to simplify and standardize tag handling:
- Remove `php-` prefix from FPM and CLI tags for consistency. - Standardize tag structure and base image references across all workflows. - Update `tags_extra` in `build-cli-dev.yml` and `build-fpm-dev.yml` for consistent naming.
1 parent 9e6dc4a commit 433ac70

4 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎.github/workflows/build-cli-dev.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ jobs:
7272
if [ "${{ matrix.want_latest_rollup }}" = "true" ]; then
7373
{
7474
echo "tags_extra<<__EXTRA__"
75-
echo "${{env.GHCR_NS}}/php:php-cli-dev"
76-
echo "docker.io/${{env.DOCKERHUB_NS}}/php:php-cli-dev" # docker.io is optional but explicit
75+
echo "${{env.GHCR_NS}}/php:cli-dev"
76+
echo "docker.io/${{env.DOCKERHUB_NS}}/php:cli-dev" # docker.io is optional but explicit
7777
echo "__EXTRA__"
7878
} >> "$GITHUB_OUTPUT"
7979
else
@@ -90,12 +90,12 @@ jobs:
9090
platforms: linux/amd64,linux/arm64
9191
build-args: |
9292
PHP_VERSION=${{ steps.vers.outputs.patch }}
93-
BASE_IMAGE=${{ env.GHCR_NS }}/php:php-${{ steps.vers.outputs.patch }}-${{ matrix.base_target }}
93+
BASE_IMAGE=${{ env.GHCR_NS }}/php:${{ steps.vers.outputs.patch }}-${{ matrix.base_target }}
9494
# Separate caches per LINE and target
9595
# ---- TAGS: rolling + immutable (patch-pinned) ----
9696
tags: |
97-
${{ env.GHCR_NS }}/php:php-${{ steps.vers.outputs.line }}-cli-dev
98-
docker.io/${{ env.DOCKERHUB_NS }}/php:php-${{ steps.vers.outputs.line }}-cli-dev
97+
${{ env.GHCR_NS }}/php:${{ steps.vers.outputs.line }}-cli-dev
98+
docker.io/${{ env.DOCKERHUB_NS }}/php:${{ steps.vers.outputs.line }}-cli-dev
9999
${{ steps.vers.outputs.tags_extra }}
100-
${{ env.GHCR_NS }}/php:php-${{ steps.vers.outputs.patch }}-${{ matrix.base_target }}
101-
docker.io/${{ env.DOCKERHUB_NS }}/php:php-${{ steps.vers.outputs.patch }}-${{ matrix.base_target }}
100+
${{ env.GHCR_NS }}/php:${{ steps.vers.outputs.patch }}-${{ matrix.base_target }}
101+
docker.io/${{ env.DOCKERHUB_NS }}/php:${{ steps.vers.outputs.patch }}-${{ matrix.base_target }}

‎.github/workflows/build-cli.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ jobs:
6363
PHP_VERSION="${PHP_VERSION:?missing}"
6464
LINE_VERSION="$(cut -d. -f1,2 <<<"$PHP_VERSION")"
6565
66-
TAGS=("php-${LINE_VERSION}-cli" "php-${PHP_VERSION}-cli")
66+
TAGS=("${LINE_VERSION}-cli" "${PHP_VERSION}-cli")
6767
if [[ "${IS_LATEST}" == "true" ]]; then
68-
TAGS=("php-cli" "${TAGS[@]}")
68+
TAGS=("cli" "${TAGS[@]}")
6969
fi
7070
7171
ARCH="${ARCH_SUFFIX}"
@@ -148,9 +148,9 @@ jobs:
148148
PHP_VERSION="${PHP_VERSION:?missing}"
149149
LINE_VERSION="$(cut -d. -f1,2 <<<"$PHP_VERSION")"
150150
151-
TAGS=("php-${LINE_VERSION}-cli" "php-${PHP_VERSION}-cli")
151+
TAGS=("${LINE_VERSION}-cli" "${PHP_VERSION}-cli")
152152
if [[ "${IS_LATEST}" == "true" ]]; then
153-
TAGS=("php-cli" "${TAGS[@]}")
153+
TAGS=("cli" "${TAGS[@]}")
154154
fi
155155
156156
ARCH="${ARCH_SUFFIX}"
@@ -228,9 +228,9 @@ jobs:
228228
PHP_VERSION="${PHP_VERSION:?missing}"
229229
LINE_VERSION="$(cut -d. -f1,2 <<<"$PHP_VERSION")"
230230
231-
TAGS=("php-${LINE_VERSION}-cli" "php-${PHP_VERSION}-cli")
231+
TAGS=("${LINE_VERSION}-cli" "${PHP_VERSION}-cli")
232232
if [[ "${IS_LATEST}" == "true" ]]; then
233-
TAGS=("php-cli" "${TAGS[@]}")
233+
TAGS=("cli" "${TAGS[@]}")
234234
fi
235235
236236
# Fully-qualified (no-arch) targets for manifest creation, both registries

‎.github/workflows/build-fpm-dev.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ jobs:
7272
if [ "${{ matrix.want_latest_rollup }}" = "true" ]; then
7373
{
7474
echo "tags_extra<<__EXTRA__"
75-
echo "${{env.GHCR_NS}}/php:php-cli-dev"
76-
echo "docker.io/${{env.DOCKERHUB_NS}}/php:php-fpm-dev" # docker.io is optional but explicit
75+
echo "${{env.GHCR_NS}}/php:cli-dev"
76+
echo "docker.io/${{env.DOCKERHUB_NS}}/php:fpm-dev" # docker.io is optional but explicit
7777
echo "__EXTRA__"
7878
} >> "$GITHUB_OUTPUT"
7979
else
@@ -90,12 +90,12 @@ jobs:
9090
platforms: linux/amd64,linux/arm64
9191
build-args: |
9292
PHP_VERSION=${{ steps.vers.outputs.patch }}
93-
BASE_IMAGE=${{ env.GHCR_NS }}/php:php-${{ steps.vers.outputs.patch }}-${{ matrix.base_target }}
93+
BASE_IMAGE=${{ env.GHCR_NS }}/php:${{ steps.vers.outputs.patch }}-${{ matrix.base_target }}
9494
# Separate caches per LINE and target
9595
# ---- TAGS: rolling + immutable (patch-pinned) ----
9696
tags: |
9797
${{ env.GHCR_NS }}/php:php-${{ steps.vers.outputs.line }}-fpm-dev
98-
docker.io/${{ env.DOCKERHUB_NS }}/php:php-${{ steps.vers.outputs.line }}-fpm-dev
98+
docker.io/${{ env.DOCKERHUB_NS }}/php:${{ steps.vers.outputs.line }}-fpm-dev
9999
${{ steps.vers.outputs.tags_extra }}
100-
${{ env.GHCR_NS }}/php:php-${{ steps.vers.outputs.patch }}-${{ matrix.base_target }}
101-
docker.io/${{ env.DOCKERHUB_NS }}/php:php-${{ steps.vers.outputs.patch }}-${{ matrix.base_target }}
100+
${{ env.GHCR_NS }}/php:${{ steps.vers.outputs.patch }}-${{ matrix.base_target }}
101+
docker.io/${{ env.DOCKERHUB_NS }}/php:${{ steps.vers.outputs.patch }}-${{ matrix.base_target }}

‎.github/workflows/build-fpm.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ jobs:
6363
PHP_VERSION="${PHP_VERSION:?missing}"
6464
LINE_VERSION="$(cut -d. -f1,2 <<<"$PHP_VERSION")"
6565
66-
TAGS=("php-${LINE_VERSION}-fpm" "php-${PHP_VERSION}-fpm")
66+
TAGS=("${LINE_VERSION}-fpm" "${PHP_VERSION}-fpm")
6767
if [[ "${IS_LATEST}" == "true" ]]; then
68-
TAGS=("php-fpm" "${TAGS[@]}")
68+
TAGS=("fpm" "${TAGS[@]}")
6969
fi
7070
7171
ARCH="${ARCH_SUFFIX}"
@@ -148,9 +148,9 @@ jobs:
148148
PHP_VERSION="${PHP_VERSION:?missing}"
149149
LINE_VERSION="$(cut -d. -f1,2 <<<"$PHP_VERSION")"
150150
151-
TAGS=("php-${LINE_VERSION}-fpm" "php-${PHP_VERSION}-fpm")
151+
TAGS=("${LINE_VERSION}-fpm" "${PHP_VERSION}-fpm")
152152
if [[ "${IS_LATEST}" == "true" ]]; then
153-
TAGS=("php-fpm" "${TAGS[@]}")
153+
TAGS=("fpm" "${TAGS[@]}")
154154
fi
155155
156156
ARCH="${ARCH_SUFFIX}"
@@ -228,9 +228,9 @@ jobs:
228228
PHP_VERSION="${PHP_VERSION:?missing}"
229229
LINE_VERSION="$(cut -d. -f1,2 <<<"$PHP_VERSION")"
230230
231-
TAGS=("php-${LINE_VERSION}-fpm" "php-${PHP_VERSION}-fpm")
231+
TAGS=("${LINE_VERSION}-fpm" "${PHP_VERSION}-fpm")
232232
if [[ "${IS_LATEST}" == "true" ]]; then
233-
TAGS=("php-fpm" "${TAGS[@]}")
233+
TAGS=("fpm" "${TAGS[@]}")
234234
fi
235235
236236
# Fully-qualified (no-arch) targets for manifest creation, both registries

0 commit comments

Comments
 (0)