Compare commits

..
Author SHA1 Message Date
shadowdaoandClaude Sonnet 5.5 8644d8e38c ci: address Opus review of the arm64 policy PR
- job timeouts 130 (cac, cac-fpm) / 80 (shared-httpd) so the retry fits; test pins the budget
- verify-image-arch.py: bounded docker calls, pull retried 3x, exit 4 'could not pull' (not an
  arch verdict), pulled image removed afterwards
- ARM64_DIGEST only taken from the first attempt when it succeeded
- comments/docs: max-parallel is per-job and unverified; guard also fires on skipped/cancelled

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-19 21:10:08 -08:00
shadowdaoandClaude Sonnet 5.5 b9974d1914 ci: arm64 policy - serialise legs, one retry, never drop an existing arm64, ELF check before publish
- max-parallel: 2 on the cac / cac-fpm matrices (8 concurrent QEMU legs failed on 2026-11-19)
- ONE retry of a failed arm64 leg (90 s pause) in cac, cac-fpm, shared-httpd
- assemble-multiarch-index.sh: --guard-existing-arm64 (fail instead of replacing a multi-arch
  tag by amd64-only; dispatch input allow_amd64_only overrides) and --verify-bin (ELF machine
  type of amd64 and arm64 before any tag is written)
- tests: assemble-guard.test.sh, wiring tests; docs/arm64-publish-policy.md

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-19 21:05:57 -08:00
9 changed files with 122 additions and 417 deletions

No files matched your search

+42 -154
View File
@@ -1,10 +1,9 @@
name: Attach arm64 to an existing tag name: Attach arm64 to an existing tag
run-name: attach arm64 to ${{ github.event.inputs.image }}:${{ github.event.inputs.phpver && format('php{0}', github.event.inputs.phpver) || 'latest' }} run-name: attach arm64 to ${{ github.event.inputs.image }}:php${{ github.event.inputs.phpver }}
# Manual only (never on push): publishes an arm64 image for an EXISTING tag of cac, cac-fpm, # Manual only (never on push): publishes an arm64 image for an EXISTING tag of cac or cac-fpm
# cac-lsphp, cac-litespeed (php<phpver>) or shared-ols (:latest)
# and merges it with the tag's CURRENT amd64 manifest into a new index. The amd64 image is # and merges it with the tag's CURRENT amd64 manifest into a new index. The amd64 image is
# NOT rebuilt and NOT touched: its manifest digest (and config, layers, attestation) stay # NOT rebuilt and NOT touched: its manifest digest (and config, layers, attestation) stay
# byte-identical (with force=true the old arm64 is replaced and the amd64 attestation entry is not carried); only the tag's index digest changes. Use it to restore an arm64 entry that a # byte-identical; only the tag's index digest changes. Use it to restore an arm64 entry that a
# later amd64-only publish dropped (the arm64 leg of build-push.yaml is best effort). # later amd64-only publish dropped (the arm64 leg of build-push.yaml is best effort).
# #
# One leg per run (image + phpver), and runs are serialised (concurrency group below), because # One leg per run (image + phpver), and runs are serialised (concurrency group below), because
@@ -15,13 +14,12 @@ on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
image: image:
description: 'cac, cac-fpm, cac-lsphp, cac-litespeed or shared-ols' description: 'cac or cac-fpm'
required: true required: true
type: string type: string
phpver: phpver:
description: 'PHP version without dots (tag = php<phpver>): 82-86 for cac and cac-fpm, 82-85 for cac-lsphp and cac-litespeed. Leave empty for shared-ols (tag = latest).' description: 'PHP version without dots: 82, 83, 84, 85 or 86 (tag = php<phpver>)'
required: false required: true
default: ''
type: string type: string
force: force:
description: 'true = replace an arm64 entry the tag already has (default: refuse)' description: 'true = replace an arm64 entry the tag already has (default: refuse)'
@@ -35,17 +33,13 @@ concurrency:
jobs: jobs:
Attach-arm64: Attach-arm64:
# Only from trunk: the arm64 is built from the dispatched ref's Dockerfile.
if: github.ref == 'refs/heads/trunk'
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 90 timeout-minutes: 90
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0 uses: actions/checkout@v4
# Inputs reach the shell via env only, and are regex-checked before use. # Inputs reach the shell via env only, and are regex-checked before use.
# family=rpm: AlmaLinux images (cac, cac-fpm). family=ols: the LiteSpeed family, built FROM
# litespeedtech/openlitespeed (cac-lsphp, cac-litespeed, shared-ols).
- name: Validate inputs - name: Validate inputs
id: v id: v
env: env:
@@ -54,44 +48,49 @@ jobs:
IN_FORCE: ${{ github.event.inputs.force }} IN_FORCE: ${{ github.event.inputs.force }}
run: | run: |
set -euo pipefail set -euo pipefail
phpre='^8[2-6]$'; family=rpm; tag="php${IN_PHPVER}"; basephp="${IN_PHPVER}"
case "$IN_IMAGE" in case "$IN_IMAGE" in
cac) dockerfile=Dockerfile; bins="/usr/sbin/httpd /usr/bin/php" ;; cac) dockerfile=Dockerfile; bins="/usr/sbin/httpd /usr/bin/php" ;;
cac-fpm) dockerfile=Dockerfile.fpm; bins="/usr/sbin/php-fpm /usr/bin/php" ;; cac-fpm) dockerfile=Dockerfile.fpm; bins="/usr/sbin/php-fpm /usr/bin/php" ;;
cac-lsphp|cac-litespeed) *) echo "::error::image must be cac or cac-fpm"; exit 1 ;;
family=ols; phpre='^8[2-5]$'; dockerfile="Dockerfile.${IN_IMAGE#cac-}"
bins="/usr/local/lsws/bin/openlitespeed /usr/local/lsws/lsphp${IN_PHPVER}/bin/lsphp" ;;
shared-ols)
family=ols; dockerfile=Dockerfile.shared-ols; tag=latest; basephp=83; phpre='^(83)?$'
bins="/usr/local/lsws/bin/openlitespeed" ;;
*) echo "::error::image must be cac, cac-fpm, cac-lsphp, cac-litespeed or shared-ols"; exit 1 ;;
esac esac
[[ "$IN_PHPVER" =~ $phpre ]] || { echo "::error::phpver '${IN_PHPVER}' is not valid for ${IN_IMAGE} (pattern $phpre)"; exit 1; } [[ "$IN_PHPVER" =~ ^8[2-6]$ ]] || { echo "::error::phpver must be one of 82 83 84 85 86"; exit 1; }
case "${IN_FORCE:-false}" in true|false) ;; *) echo "::error::force must be true or false"; exit 1 ;; esac case "${IN_FORCE:-false}" in true|false) ;; *) echo "::error::force must be true or false"; exit 1 ;; esac
{ {
echo "repo=repo.anhonesthost.net/cloud-hosting-platform/${IN_IMAGE}" echo "repo=repo.anhonesthost.net/cloud-hosting-platform/${IN_IMAGE}"
echo "tag=${tag}" echo "tag=php${IN_PHPVER}"
echo "image=${IN_IMAGE}" echo "image=${IN_IMAGE}"
echo "phpver=${basephp}" echo "phpver=${IN_PHPVER}"
echo "family=${family}"
echo "dockerfile=${dockerfile}" echo "dockerfile=${dockerfile}"
echo "bins=${bins}" echo "bins=${bins}"
echo "force=${IN_FORCE:-false}" echo "force=${IN_FORCE:-false}"
} >> "$GITHUB_OUTPUT" } >> "$GITHUB_OUTPUT"
echo "attach arm64 to ${IN_IMAGE}:${tag} (family=${family}, force=${IN_FORCE:-false})" echo "attach arm64 to ${IN_IMAGE}:php${IN_PHPVER} (force=${IN_FORCE:-false})"
- name: Login to Gitea - name: Login to Gitea
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 uses: docker/login-action@v3
with: with:
registry: repo.anhonesthost.net registry: repo.anhonesthost.net
username: ${{ secrets.CI_USER }} username: ${{ secrets.CI_USER }}
password: ${{ secrets.CI_TOKEN }} password: ${{ secrets.CI_TOKEN }}
# Cheap pre-check BEFORE the 10-20 minute build: tag exists, has exactly one amd64 entry,
# and has no arm64 entry yet (exit 3 otherwise). Writes nothing. The index digest read here
# is handed to the final step, which refuses if the tag moved in between.
- name: Plan (read the tag, no writes)
id: plan
env:
REPO: ${{ steps.v.outputs.repo }}
TAG: ${{ steps.v.outputs.tag }}
FORCE: ${{ steps.v.outputs.force }}
run: |
set -euo pipefail
f=(); [ "$FORCE" = true ] && f=(--force)
scripts/attach-arm64-index.sh --repo "$REPO" --tag "$TAG" --plan-only "${f[@]}"
- name: Resolve base image digest (Docker Hub, direct) - name: Resolve base image digest (Docker Hub, direct)
id: base id: base
env: env:
# OLS family: same pin as build-push.yaml (OLS_VERSION 1.8.4; shared-ols uses the lsphp83 tag). BASE_TAG: almalinux/10-base:latest
BASE_TAG: ${{ steps.v.outputs.family == 'ols' && format('litespeedtech/openlitespeed:1.8.4-lsphp{0}', steps.v.outputs.phpver) || 'almalinux/10-base:latest' }}
run: | run: |
set -uo pipefail set -uo pipefail
if ref=$(.gitea/scripts/resolve-base-image.sh "$BASE_TAG") && [[ "$ref" =~ ^[a-z0-9][a-z0-9._/-]*@sha256:[0-9a-f]{64}$ ]]; then if ref=$(.gitea/scripts/resolve-base-image.sh "$BASE_TAG") && [[ "$ref" =~ ^[a-z0-9][a-z0-9._/-]*@sha256:[0-9a-f]{64}$ ]]; then
@@ -117,13 +116,13 @@ jobs:
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT" echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0 uses: docker/setup-qemu-action@v3
with: with:
platforms: arm64 platforms: arm64
- name: Set up Docker Buildx (Docker Hub via pkg-cache mirror) - name: Set up Docker Buildx (Docker Hub via pkg-cache mirror)
if: steps.pkgcache.outputs.mirror != '' if: steps.pkgcache.outputs.mirror != ''
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 uses: docker/setup-buildx-action@v3
with: with:
buildkitd-config-inline: | buildkitd-config-inline: |
[registry."docker.io"] [registry."docker.io"]
@@ -133,22 +132,7 @@ jobs:
- name: Set up Docker Buildx - name: Set up Docker Buildx
if: steps.pkgcache.outputs.mirror == '' if: steps.pkgcache.outputs.mirror == ''
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 uses: docker/setup-buildx-action@v3
# (needs the buildx plugin, hence after the Buildx setup) Cheap pre-check BEFORE the long build: tag exists, has exactly one amd64 entry,
# and has no arm64 entry yet (exit 3 otherwise). Writes nothing. The index digest read here
# is handed to the final step, which refuses if the tag moved in between.
- name: Plan (read the tag, no writes)
id: plan
env:
REPO: ${{ steps.v.outputs.repo }}
TAG: ${{ steps.v.outputs.tag }}
FORCE: ${{ steps.v.outputs.force }}
run: |
set -euo pipefail
docker buildx version
f=(); [ "$FORCE" = true ] && f=(--force)
scripts/attach-arm64-index.sh --repo "$REPO" --tag "$TAG" --plan-only "${f[@]}"
- name: Cache-bust value - name: Cache-bust value
id: bust id: bust
@@ -158,7 +142,6 @@ jobs:
# Same php.net floor as the normal build: the Dockerfile fails on anything older. # Same php.net floor as the normal build: the Dockerfile fails on anything older.
- name: Resolve current PHP release from php.net - name: Resolve current PHP release from php.net
if: steps.v.outputs.family == 'rpm'
id: phpmin id: phpmin
env: env:
PHPVER: ${{ steps.v.outputs.tag }} PHPVER: ${{ steps.v.outputs.tag }}
@@ -171,57 +154,21 @@ jobs:
echo "php.net current ${branch}: ${min}" echo "php.net current ${branch}: ${min}"
echo "min=${min}" >> "$GITHUB_OUTPUT" echo "min=${min}" >> "$GITHUB_OUTPUT"
# OLS family (cac-lsphp, cac-litespeed): the arm64 image is built from the LiteSpeed PACKAGED
# lsphp (apt noble arm64), not from php.net source: LiteSpeed now ships the same PHP release
# the amd64 php.net-source images carry, so version, extensions and ini defaults are equal; the
# parity step below PROVES that against the existing amd64 image and refuses otherwise.
# EXPECT_* come from the arm64 index (the amd64 index may differ by hours). docs/arm64-ols-family.md
- name: Resolve build args
id: args
env:
FAMILY: ${{ steps.v.outputs.family }}
IMAGE: ${{ steps.v.outputs.image }}
PHPVER: ${{ steps.v.outputs.phpver }}
BASE_IMAGE: ${{ steps.base.outputs.image }}
PKG_CACHE: ${{ steps.pkgcache.outputs.url }}
BUST: ${{ steps.bust.outputs.value }}
PHPMIN: ${{ steps.phpmin.outputs.min }}
run: |
set -euo pipefail
{
echo "list<<ARGS_EOF"
echo "PHPVER=${PHPVER}"
echo "BASE_IMAGE=${BASE_IMAGE}"
echo "PKG_CACHE=${PKG_CACHE}"
if [ "$FAMILY" = rpm ]; then
echo "CACHE_BUST=${BUST}"
echo "EXPECT_PHP_MIN=${PHPMIN}"
else
echo "OLS_VERSION=1.8.4"
if [ "$IMAGE" != shared-ols ]; then
pkg=$(./scripts/lsphp-repo-version.sh "${PHPVER}" arm64)
[[ "$pkg" =~ ^[0-9][0-9A-Za-z.+~:-]*$ ]] || { echo "::error::no/malformed lsphp${PHPVER} arm64 package version '${pkg}'" >&2; exit 1; }
php="${pkg%%-*}"
[[ "$php" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || { echo "::error::malformed PHP version '${php}'" >&2; exit 1; }
echo "CACHE_BUST=${BUST}"
echo "EXPECT_LSPHP_PKG=${pkg}"
echo "EXPECT_PHP_VERSION=${php}"
echo "lsphp${PHPVER} arm64 package ${pkg}" >&2
fi
fi
echo "ARGS_EOF"
} >> "$GITHUB_OUTPUT"
# arm64 only, pushed UNTAGGED by digest. Required here (this run exists only for it): a # arm64 only, pushed UNTAGGED by digest. Required here (this run exists only for it): a
# failure fails the run and the tag is not touched. # failure fails the run and the tag is not touched.
- name: Build arm64 (push by digest) - name: Build arm64 (push by digest)
id: arm64 id: arm64
timeout-minutes: 60 timeout-minutes: 60
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 uses: docker/build-push-action@v6
with: with:
file: ./${{ steps.v.outputs.dockerfile }} file: ./${{ steps.v.outputs.dockerfile }}
platforms: linux/arm64 platforms: linux/arm64
build-args: ${{ steps.args.outputs.list }} build-args: |
PHPVER=${{ steps.v.outputs.phpver }}
CACHE_BUST=${{ steps.bust.outputs.value }}
BASE_IMAGE=${{ steps.base.outputs.image }}
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
EXPECT_PHP_MIN=${{ steps.phpmin.outputs.min }}
outputs: type=image,name=repo.anhonesthost.net/cloud-hosting-platform/${{ steps.v.outputs.image }},push-by-digest=true,name-canonical=true,push=true outputs: type=image,name=repo.anhonesthost.net/cloud-hosting-platform/${{ steps.v.outputs.image }},push-by-digest=true,name-canonical=true,push=true
# The arm64 entry must contain AArch64 binaries and the existing amd64 entry x86-64 ones: # The arm64 entry must contain AArch64 binaries and the existing amd64 entry x86-64 ones:
@@ -232,83 +179,27 @@ jobs:
TAG: ${{ steps.v.outputs.tag }} TAG: ${{ steps.v.outputs.tag }}
BINS: ${{ steps.v.outputs.bins }} BINS: ${{ steps.v.outputs.bins }}
ARM64_DIGEST: ${{ steps.arm64.outputs.digest }} ARM64_DIGEST: ${{ steps.arm64.outputs.digest }}
AMD64: ${{ steps.plan.outputs.amd64 }}
run: | run: |
set -euo pipefail set -euo pipefail
[[ "$AMD64" =~ ^sha256:[0-9a-f]{64}$ ]] || { echo "::error::no planned amd64 digest"; exit 1; }
[[ "$ARM64_DIGEST" =~ ^sha256:[0-9a-f]{64}$ ]] || { echo "::error::no arm64 digest from the build"; exit 1; } [[ "$ARM64_DIGEST" =~ ^sha256:[0-9a-f]{64}$ ]] || { echo "::error::no arm64 digest from the build"; exit 1; }
bins=(); for b in $BINS; do bins+=(--bin "$b"); done bins=(); for b in $BINS; do bins+=(--bin "$b"); done
python3 -I scripts/verify-image-arch.py --image "$REPO@$ARM64_DIGEST" --platform linux/arm64 "${bins[@]}" python3 -I scripts/verify-image-arch.py --image "$REPO@$ARM64_DIGEST" --platform linux/arm64 "${bins[@]}"
python3 -I scripts/verify-image-arch.py --image "$REPO@$AMD64" --platform linux/amd64 "${bins[@]}" python3 -I scripts/verify-image-arch.py --image "$REPO:$TAG" --platform linux/amd64 "${bins[@]}"
# The new arm64 was built now, the amd64 entry earlier: refuse a version skew between them. # The new arm64 was built now, the amd64 entry earlier: refuse a PHP version skew between them.
- name: PHP version parity (amd64 native, arm64 under QEMU) - name: PHP version parity (amd64 native, arm64 under QEMU)
if: steps.v.outputs.family == 'rpm'
env: env:
REPO: ${{ steps.v.outputs.repo }} REPO: ${{ steps.v.outputs.repo }}
TAG: ${{ steps.v.outputs.tag }} TAG: ${{ steps.v.outputs.tag }}
ARM64_DIGEST: ${{ steps.arm64.outputs.digest }} ARM64_DIGEST: ${{ steps.arm64.outputs.digest }}
AMD64: ${{ steps.plan.outputs.amd64 }}
run: | run: |
set -euo pipefail set -euo pipefail
want=$(docker run --rm --platform linux/amd64 --entrypoint php "$REPO@$AMD64" -r 'echo PHP_VERSION;') want=$(docker run --rm --platform linux/amd64 --entrypoint php "$REPO:$TAG" -r 'echo PHP_VERSION;')
# `docker run` of an arm64 image fails on this runner ("exec format error": no binfmt for the got=$(docker run --rm --platform linux/arm64 --entrypoint php "$REPO@$ARM64_DIGEST" -r 'echo PHP_VERSION;')
# daemon), but BuildKit runs arm64 RUN steps under QEMU (that is how the image was built):
# run php in a throwaway build and export just the version file.
out=$(mktemp -d); ctx=$(mktemp -d)
printf 'FROM %s@%s AS src\nRUN php -r '"'"'echo PHP_VERSION;'"'"' > /pv\nFROM scratch\nCOPY --from=src /pv /pv\n' "$REPO" "$ARM64_DIGEST" |
docker buildx build --platform linux/arm64 --output "type=local,dest=$out" -f - "$ctx"
got=$(cat "$out/pv")
echo "amd64 (existing tag) PHP ${want}; new arm64 PHP ${got}" echo "amd64 (existing tag) PHP ${want}; new arm64 PHP ${got}"
[[ "$want" =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]] || { echo "::error::cannot read the amd64 PHP version"; exit 1; } [[ "$want" =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]] || { echo "::error::cannot read the amd64 PHP version"; exit 1; }
[ "$want" = "$got" ] || { echo "::error::PHP version differs between the existing amd64 (${want}) and the new arm64 (${got}); not attaching. The amd64 image needs a rebuild first."; exit 1; } [ "$want" = "$got" ] || { echo "::error::PHP version differs between the existing amd64 (${want}) and the new arm64 (${got}); not attaching. The amd64 image needs a rebuild first."; exit 1; }
# OLS family: the arm64 (packaged lsphp / OLS from the LiteSpeed repo and base image) must be
# observably the SAME PHP as the existing amd64 image (php.net-source or packaged): identical
# PHP_VERSION, SAPI, loaded extensions + versions and EVERY ini value, both with the image's
# config and with `-n` (compiled-in defaults). scripts/arm64-parity-probe.php runs natively on
# amd64 and under QEMU (a throwaway BuildKit RUN) on arm64; any difference prints as a diff
# and fails the run before the tag is touched. shared-ols runs no PHP: openlitespeed -v only.
- name: "Parity - same PHP / OLS as the existing amd64 image"
if: steps.v.outputs.family == 'ols'
env:
REPO: ${{ steps.v.outputs.repo }}
IMAGE: ${{ steps.v.outputs.image }}
PHPVER: ${{ steps.v.outputs.phpver }}
ARM64_DIGEST: ${{ steps.arm64.outputs.digest }}
AMD64: ${{ steps.plan.outputs.amd64 }}
run: |
set -euo pipefail
work=$(mktemp -d); mkdir -p "$work/ctx" "$work/out" "$work/amd"
cp scripts/arm64-parity-probe.php "$work/ctx/probe.php"
# OpenLiteSpeed: same release and module versions. The "(BUILD built: <date>)" stamp is LiteSpeed's
# own per-arch build time (differs by design), so it is stripped before comparing.
olsv='/usr/local/lsws/bin/openlitespeed -v 2>&1 | sed "s/ (BUILD built:.*)//"'
docker run --rm --platform linux/amd64 --entrypoint sh "$REPO@$AMD64" -c "$olsv" > "$work/amd/ols.txt"
printf 'FROM %s@%s AS src\nRUN (%s) > /ols.txt\nFROM scratch\nCOPY --from=src /ols.txt /ols.txt\n' "$REPO" "$ARM64_DIGEST" "$olsv" |
docker buildx build --platform linux/arm64 --output "type=local,dest=$work/out" -f - "$work/ctx"
echo "amd64 OLS: $(head -1 "$work/amd/ols.txt"); arm64 OLS: $(head -1 "$work/out/ols.txt")"
grep -q '^LiteSpeed/' "$work/amd/ols.txt" || { echo "::error::cannot read the amd64 openlitespeed version"; exit 1; }
diff -u "$work/amd/ols.txt" "$work/out/ols.txt" || { echo "::error::openlitespeed version/modules differ between amd64 and arm64; not attaching"; exit 1; }
[ "$IMAGE" != shared-ols ] || { echo "parity OK: OpenLiteSpeed version and modules identical (shared-ols runs no PHP)"; exit 0; }
ls_bin="/usr/local/lsws/lsphp${PHPVER}/bin/lsphp"
for mode in cfg n; do
flag=""; [ "$mode" = n ] && flag="-n"
# probe piped over stdin (not a bind mount: the job's docker daemon cannot see the workspace)
docker run --rm -i --platform linux/amd64 --entrypoint sh "$REPO@$AMD64" -c "cat > /tmp/probe.php; $ls_bin $flag /tmp/probe.php" < "$work/ctx/probe.php" > "$work/amd/$mode.txt"
done
# the same two runs on arm64, inside one BuildKit build (no binfmt for `docker run` here)
printf 'FROM %s@%s AS src\nCOPY probe.php /probe.php\nRUN %s /probe.php > /cfg.txt && %s -n /probe.php > /n.txt\nFROM scratch\nCOPY --from=src /cfg.txt /n.txt /\n' "$REPO" "$ARM64_DIGEST" "$ls_bin" "$ls_bin" |
docker buildx build --platform linux/arm64 --output "type=local,dest=$work/out" -f - "$work/ctx"
rc=0
for mode in cfg n; do
echo "== $mode: $(head -1 "$work/amd/$mode.txt") (amd64) vs $(head -1 "$work/out/$mode.txt") (arm64); $(grep -c '^ext ' "$work/amd/$mode.txt") / $(grep -c '^ext ' "$work/out/$mode.txt") extensions, $(grep -c '^ini ' "$work/amd/$mode.txt") / $(grep -c '^ini ' "$work/out/$mode.txt") ini values"
grep -q '^PHP_VERSION=[0-9]' "$work/amd/$mode.txt" || { echo "::error::cannot read the amd64 probe output ($mode)"; exit 1; }
diff -u "$work/amd/$mode.txt" "$work/out/$mode.txt" || rc=1
done
[ "$rc" = 0 ] || { echo "::error::the new arm64 is not the same PHP as the existing amd64 image (diff above); not attaching. Rebuild amd64 or fix the arm64 build first."; exit 1; }
echo "parity OK: version, SAPI, extensions and every ini value identical"
# Re-creates the tag index: existing amd64 entries by digest + the new arm64. Aborts if the # Re-creates the tag index: existing amd64 entries by digest + the new arm64. Aborts if the
# tag moved since the plan; verifies the amd64 manifest digest is unchanged afterwards. # tag moved since the plan; verifies the amd64 manifest digest is unchanged afterwards.
- name: Attach (create the new index) - name: Attach (create the new index)
@@ -320,10 +211,7 @@ jobs:
ARM64_DIGEST: ${{ steps.arm64.outputs.digest }} ARM64_DIGEST: ${{ steps.arm64.outputs.digest }}
run: | run: |
set -euo pipefail set -euo pipefail
[[ "$BEFORE" =~ ^sha256:[0-9a-f]{64}$ ]] || { echo "::error::no plan digest"; exit 1; }
f=(); [ "$FORCE" = true ] && f=(--force) f=(); [ "$FORCE" = true ] && f=(--force)
# :latest tracks php85 in the normal build; keep that alias equal if (and only if) it is one.
[ "$TAG" = php85 ] && f+=(--follow-tag latest)
scripts/attach-arm64-index.sh --repo "$REPO" --tag "$TAG" \ scripts/attach-arm64-index.sh --repo "$REPO" --tag "$TAG" \
--arm64 "$ARM64_DIGEST" --expect-index "$BEFORE" "${f[@]}" --arm64 "$ARM64_DIGEST" --expect-index "$BEFORE" "${f[@]}"
docker buildx imagetools inspect "$REPO:$TAG" docker buildx imagetools inspect "$REPO:$TAG"
+44 -44
View File
@@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0 uses: actions/checkout@v4
# Runner images differ on whether they are root and whether sudo exists. # Runner images differ on whether they are root and whether sudo exists.
- name: Install shellcheck - name: Install shellcheck
@@ -152,7 +152,7 @@ jobs:
shared_ols: ${{ steps.plan.outputs.shared_ols }} shared_ols: ${{ steps.plan.outputs.shared_ols }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0 uses: actions/checkout@v4
- name: Plan legs - name: Plan legs
id: plan id: plan
@@ -179,7 +179,7 @@ jobs:
phpver: ${{ fromJSON(needs.plan.outputs.cac) }} phpver: ${{ fromJSON(needs.plan.outputs.cac) }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0 uses: actions/checkout@v4
# Base image pinned by DIGEST, looked up directly at Docker Hub (never via # Base image pinned by DIGEST, looked up directly at Docker Hub (never via
# the pkg-cache mirror), so the mirror can only serve content-addressed # the pkg-cache mirror), so the mirror can only serve content-addressed
@@ -221,7 +221,7 @@ jobs:
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT" echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0 uses: docker/setup-qemu-action@v3
with: with:
platforms: arm64 platforms: arm64
@@ -230,7 +230,7 @@ jobs:
# back to Docker Hub if the mirror stops answering mid-run. # back to Docker Hub if the mirror stops answering mid-run.
- name: Set up Docker Buildx (Docker Hub via pkg-cache mirror) - name: Set up Docker Buildx (Docker Hub via pkg-cache mirror)
if: steps.pkgcache.outputs.mirror != '' if: steps.pkgcache.outputs.mirror != ''
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 uses: docker/setup-buildx-action@v3
with: with:
buildkitd-config-inline: | buildkitd-config-inline: |
[registry."docker.io"] [registry."docker.io"]
@@ -240,7 +240,7 @@ jobs:
- name: Set up Docker Buildx - name: Set up Docker Buildx
if: steps.pkgcache.outputs.mirror == '' if: steps.pkgcache.outputs.mirror == ''
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 uses: docker/setup-buildx-action@v3
# Per-run cache-bust value. Each job's buildx builder is created fresh by # Per-run cache-bust value. Each job's buildx builder is created fresh by
# setup-buildx-action (no cache-from/cache-to here), so today nothing is # setup-buildx-action (no cache-from/cache-to here), so today nothing is
@@ -272,7 +272,7 @@ jobs:
echo "min=${min}" >> "$GITHUB_OUTPUT" echo "min=${min}" >> "$GITHUB_OUTPUT"
- name: Login to Gitea - name: Login to Gitea
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 uses: docker/login-action@v3
with: with:
registry: repo.anhonesthost.net registry: repo.anhonesthost.net
username: ${{ secrets.CI_USER }} username: ${{ secrets.CI_USER }}
@@ -283,7 +283,7 @@ jobs:
# created by the assemble step below. # created by the assemble step below.
- name: Build amd64 (push by digest) - name: Build amd64 (push by digest)
id: amd64 id: amd64
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 uses: docker/build-push-action@v6
with: with:
platforms: linux/amd64 platforms: linux/amd64
build-args: | build-args: |
@@ -303,7 +303,7 @@ jobs:
id: arm64 id: arm64
continue-on-error: true continue-on-error: true
timeout-minutes: 45 timeout-minutes: 45
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 uses: docker/build-push-action@v6
with: with:
platforms: linux/arm64 platforms: linux/arm64
build-args: | build-args: |
@@ -324,7 +324,7 @@ jobs:
if: steps.arm64.outcome == 'failure' if: steps.arm64.outcome == 'failure'
continue-on-error: true continue-on-error: true
timeout-minutes: 45 timeout-minutes: 45
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 uses: docker/build-push-action@v6
with: with:
platforms: linux/arm64 platforms: linux/arm64
build-args: | build-args: |
@@ -375,7 +375,7 @@ jobs:
phpver: ${{ fromJSON(needs.plan.outputs.cac_fpm) }} phpver: ${{ fromJSON(needs.plan.outputs.cac_fpm) }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0 uses: actions/checkout@v4
# Base image pinned by DIGEST, looked up directly at Docker Hub (never via # Base image pinned by DIGEST, looked up directly at Docker Hub (never via
# the pkg-cache mirror), so the mirror can only serve content-addressed # the pkg-cache mirror), so the mirror can only serve content-addressed
@@ -417,7 +417,7 @@ jobs:
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT" echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0 uses: docker/setup-qemu-action@v3
with: with:
platforms: arm64 platforms: arm64
@@ -426,7 +426,7 @@ jobs:
# back to Docker Hub if the mirror stops answering mid-run. # back to Docker Hub if the mirror stops answering mid-run.
- name: Set up Docker Buildx (Docker Hub via pkg-cache mirror) - name: Set up Docker Buildx (Docker Hub via pkg-cache mirror)
if: steps.pkgcache.outputs.mirror != '' if: steps.pkgcache.outputs.mirror != ''
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 uses: docker/setup-buildx-action@v3
with: with:
buildkitd-config-inline: | buildkitd-config-inline: |
[registry."docker.io"] [registry."docker.io"]
@@ -436,7 +436,7 @@ jobs:
- name: Set up Docker Buildx - name: Set up Docker Buildx
if: steps.pkgcache.outputs.mirror == '' if: steps.pkgcache.outputs.mirror == ''
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 uses: docker/setup-buildx-action@v3
# Per-run cache-bust value. Each job's buildx builder is created fresh by # Per-run cache-bust value. Each job's buildx builder is created fresh by
# setup-buildx-action (no cache-from/cache-to here), so today nothing is # setup-buildx-action (no cache-from/cache-to here), so today nothing is
@@ -468,7 +468,7 @@ jobs:
echo "min=${min}" >> "$GITHUB_OUTPUT" echo "min=${min}" >> "$GITHUB_OUTPUT"
- name: Login to Gitea - name: Login to Gitea
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 uses: docker/login-action@v3
with: with:
registry: repo.anhonesthost.net registry: repo.anhonesthost.net
username: ${{ secrets.CI_USER }} username: ${{ secrets.CI_USER }}
@@ -479,7 +479,7 @@ jobs:
# created by the assemble step below. # created by the assemble step below.
- name: Build amd64 (push by digest) - name: Build amd64 (push by digest)
id: amd64 id: amd64
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 uses: docker/build-push-action@v6
with: with:
file: ./Dockerfile.fpm file: ./Dockerfile.fpm
platforms: linux/amd64 platforms: linux/amd64
@@ -500,7 +500,7 @@ jobs:
id: arm64 id: arm64
continue-on-error: true continue-on-error: true
timeout-minutes: 45 timeout-minutes: 45
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 uses: docker/build-push-action@v6
with: with:
file: ./Dockerfile.fpm file: ./Dockerfile.fpm
platforms: linux/arm64 platforms: linux/arm64
@@ -522,7 +522,7 @@ jobs:
if: steps.arm64.outcome == 'failure' if: steps.arm64.outcome == 'failure'
continue-on-error: true continue-on-error: true
timeout-minutes: 45 timeout-minutes: 45
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 uses: docker/build-push-action@v6
with: with:
file: ./Dockerfile.fpm file: ./Dockerfile.fpm
platforms: linux/arm64 platforms: linux/arm64
@@ -575,7 +575,7 @@ jobs:
phpver: ${{ fromJSON(needs.plan.outputs.cac_litespeed) }} phpver: ${{ fromJSON(needs.plan.outputs.cac_litespeed) }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0 uses: actions/checkout@v4
# Base image pinned by DIGEST, looked up directly at Docker Hub (never via # Base image pinned by DIGEST, looked up directly at Docker Hub (never via
# the pkg-cache mirror), so the mirror can only serve content-addressed # the pkg-cache mirror), so the mirror can only serve content-addressed
@@ -617,14 +617,14 @@ jobs:
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT" echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0 uses: docker/setup-qemu-action@v3
# BuildKit (docker-container driver) ignores dockerd's registry-mirrors, # BuildKit (docker-container driver) ignores dockerd's registry-mirrors,
# so the mirror is configured on the builder; BuildKit itself still falls # so the mirror is configured on the builder; BuildKit itself still falls
# back to Docker Hub if the mirror stops answering mid-run. # back to Docker Hub if the mirror stops answering mid-run.
- name: Set up Docker Buildx (Docker Hub via pkg-cache mirror) - name: Set up Docker Buildx (Docker Hub via pkg-cache mirror)
if: steps.pkgcache.outputs.mirror != '' if: steps.pkgcache.outputs.mirror != ''
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 uses: docker/setup-buildx-action@v3
with: with:
buildkitd-config-inline: | buildkitd-config-inline: |
[registry."docker.io"] [registry."docker.io"]
@@ -634,7 +634,7 @@ jobs:
- name: Set up Docker Buildx - name: Set up Docker Buildx
if: steps.pkgcache.outputs.mirror == '' if: steps.pkgcache.outputs.mirror == ''
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 uses: docker/setup-buildx-action@v3
# Per-run cache-bust value. Each job's buildx builder is created fresh by # Per-run cache-bust value. Each job's buildx builder is created fresh by
# setup-buildx-action (no cache-from/cache-to here), so today nothing is # setup-buildx-action (no cache-from/cache-to here), so today nothing is
@@ -668,7 +668,7 @@ jobs:
echo "php=${php}" >> "$GITHUB_OUTPUT" echo "php=${php}" >> "$GITHUB_OUTPUT"
- name: Login to Gitea - name: Login to Gitea
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 uses: docker/login-action@v3
with: with:
registry: repo.anhonesthost.net registry: repo.anhonesthost.net
username: ${{ secrets.CI_USER }} username: ${{ secrets.CI_USER }}
@@ -692,7 +692,7 @@ jobs:
./scripts/php-emergency-guard.sh "$ref" "$NEW_PHP" ./scripts/php-emergency-guard.sh "$ref" "$NEW_PHP"
- name: Build and Push LiteSpeed Image - name: Build and Push LiteSpeed Image
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 uses: docker/build-push-action@v6
with: with:
file: ./Dockerfile.litespeed file: ./Dockerfile.litespeed
platforms: linux/amd64 platforms: linux/amd64
@@ -733,7 +733,7 @@ jobs:
phpver: ${{ fromJSON(needs.plan.outputs.cac_lsphp) }} phpver: ${{ fromJSON(needs.plan.outputs.cac_lsphp) }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0 uses: actions/checkout@v4
# Base image pinned by DIGEST, looked up directly at Docker Hub (never via # Base image pinned by DIGEST, looked up directly at Docker Hub (never via
# the pkg-cache mirror), so the mirror can only serve content-addressed # the pkg-cache mirror), so the mirror can only serve content-addressed
@@ -775,14 +775,14 @@ jobs:
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT" echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0 uses: docker/setup-qemu-action@v3
# BuildKit (docker-container driver) ignores dockerd's registry-mirrors, # BuildKit (docker-container driver) ignores dockerd's registry-mirrors,
# so the mirror is configured on the builder; BuildKit itself still falls # so the mirror is configured on the builder; BuildKit itself still falls
# back to Docker Hub if the mirror stops answering mid-run. # back to Docker Hub if the mirror stops answering mid-run.
- name: Set up Docker Buildx (Docker Hub via pkg-cache mirror) - name: Set up Docker Buildx (Docker Hub via pkg-cache mirror)
if: steps.pkgcache.outputs.mirror != '' if: steps.pkgcache.outputs.mirror != ''
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 uses: docker/setup-buildx-action@v3
with: with:
buildkitd-config-inline: | buildkitd-config-inline: |
[registry."docker.io"] [registry."docker.io"]
@@ -792,7 +792,7 @@ jobs:
- name: Set up Docker Buildx - name: Set up Docker Buildx
if: steps.pkgcache.outputs.mirror == '' if: steps.pkgcache.outputs.mirror == ''
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 uses: docker/setup-buildx-action@v3
# Per-run cache-bust value. Each job's buildx builder is created fresh by # Per-run cache-bust value. Each job's buildx builder is created fresh by
# setup-buildx-action (no cache-from/cache-to here), so today nothing is # setup-buildx-action (no cache-from/cache-to here), so today nothing is
@@ -826,7 +826,7 @@ jobs:
echo "php=${php}" >> "$GITHUB_OUTPUT" echo "php=${php}" >> "$GITHUB_OUTPUT"
- name: Login to Gitea - name: Login to Gitea
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 uses: docker/login-action@v3
with: with:
registry: repo.anhonesthost.net registry: repo.anhonesthost.net
username: ${{ secrets.CI_USER }} username: ${{ secrets.CI_USER }}
@@ -850,7 +850,7 @@ jobs:
./scripts/php-emergency-guard.sh "$ref" "$NEW_PHP" ./scripts/php-emergency-guard.sh "$ref" "$NEW_PHP"
- name: Build and Push lsphp Image - name: Build and Push lsphp Image
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 uses: docker/build-push-action@v6
with: with:
file: ./Dockerfile.lsphp file: ./Dockerfile.lsphp
platforms: linux/amd64 platforms: linux/amd64
@@ -876,7 +876,7 @@ jobs:
timeout-minutes: 80 timeout-minutes: 80
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0 uses: actions/checkout@v4
# Base image pinned by DIGEST, looked up directly at Docker Hub (never via # Base image pinned by DIGEST, looked up directly at Docker Hub (never via
# the pkg-cache mirror), so the mirror can only serve content-addressed # the pkg-cache mirror), so the mirror can only serve content-addressed
@@ -918,7 +918,7 @@ jobs:
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT" echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0 uses: docker/setup-qemu-action@v3
with: with:
platforms: arm64 platforms: arm64
@@ -927,7 +927,7 @@ jobs:
# back to Docker Hub if the mirror stops answering mid-run. # back to Docker Hub if the mirror stops answering mid-run.
- name: Set up Docker Buildx (Docker Hub via pkg-cache mirror) - name: Set up Docker Buildx (Docker Hub via pkg-cache mirror)
if: steps.pkgcache.outputs.mirror != '' if: steps.pkgcache.outputs.mirror != ''
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 uses: docker/setup-buildx-action@v3
with: with:
buildkitd-config-inline: | buildkitd-config-inline: |
[registry."docker.io"] [registry."docker.io"]
@@ -937,10 +937,10 @@ jobs:
- name: Set up Docker Buildx - name: Set up Docker Buildx
if: steps.pkgcache.outputs.mirror == '' if: steps.pkgcache.outputs.mirror == ''
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 uses: docker/setup-buildx-action@v3
- name: Login to Gitea - name: Login to Gitea
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 uses: docker/login-action@v3
with: with:
registry: repo.anhonesthost.net registry: repo.anhonesthost.net
username: ${{ secrets.CI_USER }} username: ${{ secrets.CI_USER }}
@@ -951,7 +951,7 @@ jobs:
# created by the assemble step below. # created by the assemble step below.
- name: Build amd64 (push by digest) - name: Build amd64 (push by digest)
id: amd64 id: amd64
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 uses: docker/build-push-action@v6
with: with:
file: ./Dockerfile.shared-httpd file: ./Dockerfile.shared-httpd
platforms: linux/amd64 platforms: linux/amd64
@@ -969,7 +969,7 @@ jobs:
id: arm64 id: arm64
continue-on-error: true continue-on-error: true
timeout-minutes: 25 timeout-minutes: 25
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 uses: docker/build-push-action@v6
with: with:
file: ./Dockerfile.shared-httpd file: ./Dockerfile.shared-httpd
platforms: linux/arm64 platforms: linux/arm64
@@ -988,7 +988,7 @@ jobs:
if: steps.arm64.outcome == 'failure' if: steps.arm64.outcome == 'failure'
continue-on-error: true continue-on-error: true
timeout-minutes: 25 timeout-minutes: 25
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 uses: docker/build-push-action@v6
with: with:
file: ./Dockerfile.shared-httpd file: ./Dockerfile.shared-httpd
platforms: linux/arm64 platforms: linux/arm64
@@ -1024,7 +1024,7 @@ jobs:
PHPVER: "83" PHPVER: "83"
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0 uses: actions/checkout@v4
# Base image pinned by DIGEST, looked up directly at Docker Hub (never via # Base image pinned by DIGEST, looked up directly at Docker Hub (never via
# the pkg-cache mirror), so the mirror can only serve content-addressed # the pkg-cache mirror), so the mirror can only serve content-addressed
@@ -1066,14 +1066,14 @@ jobs:
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT" echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0 uses: docker/setup-qemu-action@v3
# BuildKit (docker-container driver) ignores dockerd's registry-mirrors, # BuildKit (docker-container driver) ignores dockerd's registry-mirrors,
# so the mirror is configured on the builder; BuildKit itself still falls # so the mirror is configured on the builder; BuildKit itself still falls
# back to Docker Hub if the mirror stops answering mid-run. # back to Docker Hub if the mirror stops answering mid-run.
- name: Set up Docker Buildx (Docker Hub via pkg-cache mirror) - name: Set up Docker Buildx (Docker Hub via pkg-cache mirror)
if: steps.pkgcache.outputs.mirror != '' if: steps.pkgcache.outputs.mirror != ''
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 uses: docker/setup-buildx-action@v3
with: with:
buildkitd-config-inline: | buildkitd-config-inline: |
[registry."docker.io"] [registry."docker.io"]
@@ -1083,17 +1083,17 @@ jobs:
- name: Set up Docker Buildx - name: Set up Docker Buildx
if: steps.pkgcache.outputs.mirror == '' if: steps.pkgcache.outputs.mirror == ''
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 uses: docker/setup-buildx-action@v3
- name: Login to Gitea - name: Login to Gitea
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 uses: docker/login-action@v3
with: with:
registry: repo.anhonesthost.net registry: repo.anhonesthost.net
username: ${{ secrets.CI_USER }} username: ${{ secrets.CI_USER }}
password: ${{ secrets.CI_TOKEN }} password: ${{ secrets.CI_TOKEN }}
- name: Build and Push Shared OLS Image - name: Build and Push Shared OLS Image
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 uses: docker/build-push-action@v6
with: with:
file: ./Dockerfile.shared-ols file: ./Dockerfile.shared-ols
platforms: linux/amd64 platforms: linux/amd64
+6 -6
View File
@@ -98,7 +98,7 @@ jobs:
- name: Checkout - name: Checkout
if: steps.t.outputs.skip == '0' if: steps.t.outputs.skip == '0'
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0 uses: actions/checkout@v4
# sha256 of php-X.Y.Z.tar.xz from php.net's own releases JSON. The build # sha256 of php-X.Y.Z.tar.xz from php.net's own releases JSON. The build
# re-verifies it AND the OpenPGP signature; this step only refuses early # re-verifies it AND the OpenPGP signature; this step only refuses early
@@ -135,17 +135,17 @@ jobs:
- name: Set up Docker Buildx - name: Set up Docker Buildx
if: steps.t.outputs.skip == '0' if: steps.t.outputs.skip == '0'
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 uses: docker/setup-buildx-action@v3
- name: Set up QEMU (arm64) - name: Set up QEMU (arm64)
if: steps.t.outputs.skip == '0' && steps.t.outputs.arm == 'true' if: steps.t.outputs.skip == '0' && steps.t.outputs.arm == 'true'
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0 uses: docker/setup-qemu-action@v3
with: with:
platforms: arm64 platforms: arm64
- name: Login to Gitea - name: Login to Gitea
if: steps.t.outputs.skip == '0' if: steps.t.outputs.skip == '0'
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 uses: docker/login-action@v3
with: with:
registry: repo.anhonesthost.net registry: repo.anhonesthost.net
username: ${{ secrets.CI_USER }} username: ${{ secrets.CI_USER }}
@@ -155,7 +155,7 @@ jobs:
- name: Build amd64 (push by digest) - name: Build amd64 (push by digest)
if: steps.t.outputs.skip == '0' if: steps.t.outputs.skip == '0'
id: amd64 id: amd64
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 uses: docker/build-push-action@v6
with: with:
file: ${{ steps.t.outputs.dockerfile }} file: ${{ steps.t.outputs.dockerfile }}
platforms: linux/amd64 platforms: linux/amd64
@@ -176,7 +176,7 @@ jobs:
id: arm64 id: arm64
continue-on-error: true continue-on-error: true
timeout-minutes: 120 timeout-minutes: 120
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 uses: docker/build-push-action@v6
with: with:
file: ${{ steps.t.outputs.dockerfile }} file: ${{ steps.t.outputs.dockerfile }}
platforms: linux/arm64 platforms: linux/arm64
+3 -19
View File
@@ -108,27 +108,11 @@ ARG PKG_CACHE=
COPY ./scripts/pkg-cache-repos.sh /usr/local/sbin/pkg-cache-repos.sh COPY ./scripts/pkg-cache-repos.sh /usr/local/sbin/pkg-cache-repos.sh
COPY ./keys/pkg-cache/ /usr/local/share/pkg-cache/ COPY ./keys/pkg-cache/ /usr/local/share/pkg-cache/
COPY ./scripts/lsphp-apt-upgrade.sh /usr/local/sbin/lsphp-apt-upgrade.sh COPY ./scripts/lsphp-apt-upgrade.sh /usr/local/sbin/lsphp-apt-upgrade.sh
## arm64 under BuildKit's QEMU emulator: LiteSpeed ships 0-byte postinst/prerm scripts in
## lsphpNN-dev. A native kernel (and QEMU via binfmt) answers ENOEXEC and dpkg's execvp falls back
## to /bin/sh, but the emulator wrapper execs the file itself and dies with "Error while loading
## ...postinst: Exec format error", so dpkg --configure fails. Only if the first install fails,
## give every empty maintainer script a shebang (no behaviour change: they were empty) and finish
## the configure, then re-run the same install so every check in it still runs. amd64 and QEMU
## setups that handle this never take the branch.
RUN set -e; \ RUN set -e; \
/usr/local/sbin/pkg-cache-repos.sh apt; \ /usr/local/sbin/pkg-cache-repos.sh apt; \
install_dev() { \ /usr/local/sbin/lsphp-apt-upgrade.sh --no-os-upgrade "${PHPVER}" \
/usr/local/sbin/lsphp-apt-upgrade.sh --no-os-upgrade "${PHPVER}" \ build-essential autoconf pkg-config \
build-essential autoconf pkg-config \ lsphp${PHPVER}-dev; \
lsphp${PHPVER}-dev; \
}; \
if ! install_dev; then \
echo "install of lsphp${PHPVER}-dev failed: repairing empty maintainer scripts, then retrying once" >&2; \
find /var/lib/dpkg/info -type f \( -name '*.preinst' -o -name '*.postinst' -o -name '*.prerm' -o -name '*.postrm' \) -size 0 \
-exec sh -c 'printf "#!/bin/sh\nexit 0\n" > "$1"' _ {} \; ; \
dpkg --configure -a; \
install_dev; \
fi; \
/usr/local/sbin/pkg-cache-repos.sh restore; \ /usr/local/sbin/pkg-cache-repos.sh restore; \
RTV=$(dpkg-query -W -f='${Version}' lsphp${PHPVER}); \ RTV=$(dpkg-query -W -f='${Version}' lsphp${PHPVER}); \
DEVV=$(dpkg-query -W -f='${Version}' lsphp${PHPVER}-dev); \ DEVV=$(dpkg-query -W -f='${Version}' lsphp${PHPVER}-dev); \
-46
View File
@@ -1,46 +0,0 @@
# arm64 for the LiteSpeed family (cac-lsphp, cac-litespeed, shared-ols)
`arm64-attach.yaml` (manual dispatch, trunk only) attaches an arm64 image to an EXISTING tag
without rebuilding or touching the amd64 image. Inputs: `image` = cac-lsphp | cac-litespeed |
shared-ols, `phpver` = 82..85 (empty for shared-ols, whose tag is `latest`).
## How the arm64 image is built
Same Dockerfile (`Dockerfile.lsphp`, `Dockerfile.litespeed`, `Dockerfile.shared-ols`), same
`OLS_VERSION=1.8.4` base (`litespeedtech/openlitespeed:1.8.4-lsphpNN`, which has an arm64 variant),
built under QEMU on the x86 runner and pushed by digest, then merged into the tag's index.
The published amd64 tags were built from php.net source (`org.whp.lsphp-source=php.net`, emergency
path, docs/lsphp-source-emergency.md). The arm64 image is built from the PACKAGED lsphp (LiteSpeed
apt, noble arm64), not from source, because:
* LiteSpeed now ships the same PHP release for both architectures (8.2.36, 8.3.37, 8.4.28, 8.5.13,
all `-1+noble`), so the PHP version is identical to the amd64 image;
* compiling PHP under QEMU is slow and the source path's gates compare against a packaged lsphp
that is no longer older than the source one;
* the result is checked, not assumed: the workflow runs `scripts/arm64-parity-probe.php` natively in
the existing amd64 image and under QEMU in the new arm64 image and FAILS the run (tag untouched)
on any difference in PHP_VERSION, SAPI, the loaded extension list and versions, or any of the
~350 ini values (with the image's config and with `-n`). It also compares the OpenLiteSpeed
version and module versions (LiteSpeed's per-arch "BUILD built:" stamp is ignored).
Measured 2026-11-20 on cac-lsphp:php85: 418 lines identical.
`EXPECT_LSPHP_PKG` / `EXPECT_PHP_VERSION` come from the arm64 repo index
(`scripts/lsphp-repo-version.sh PHPVER arm64`), not the amd64 one.
Labels differ by design: the arm64 image says `org.whp.lsphp-source=litespeed-apt` and its own
package version. `php-emergency-guard.sh` reads the amd64 child only, so it is unaffected.
## Other guards (same as cac / cac-fpm)
plan pre-check (tag exists, one amd64 entry, no arm64 yet unless `force=true`), ELF machine check of
both platforms (openlitespeed + lsphp), tag-moved check, amd64 manifest digest verified unchanged
after the attach, runs serialised (concurrency group `arm64-attach`). `latest` is re-pointed only
if it was an exact alias of php85.
## Maintenance caveat
`build-push.yaml` and `lsphp-source-emergency.yaml` (without `build_arm64`) still publish these
tags amd64-only. A rebuild therefore replaces the tag with an index without arm64: re-run the
attach for that tag afterwards (the plan step refuses nothing in that case, the tag simply has no
arm64 entry again). Wiring an arm64 leg into those jobs is the permanent fix.
-22
View File
@@ -1,22 +0,0 @@
<?php
// arm64-parity-probe.php - facts that must be IDENTICAL between the existing amd64 image and the
// arm64 image attached to the same tag (version, SAPI, loaded extensions + versions, every ini
// value). Run twice by arm64-attach.yaml: `lsphp probe.php` (image config) and
// `lsphp -n probe.php` (compiled-in defaults only, e.g. session.upload_progress.enabled).
// Output is plain text so a failed parity check prints a readable diff. No timestamps/paths of
// the build host: only things a customer's PHP can observe.
echo 'PHP_VERSION=', PHP_VERSION, "\n";
echo 'PHP_VERSION_ID=', PHP_VERSION_ID, "\n";
echo 'SAPI=', php_sapi_name(), "\n";
echo 'ZTS=', (PHP_ZTS ? 1 : 0), ' DEBUG=', (PHP_DEBUG ? 1 : 0), ' INT_SIZE=', PHP_INT_SIZE, "\n";
echo 'EXTENSION_DIR=', ini_get('extension_dir'), "\n";
$ext = get_loaded_extensions();
sort($ext, SORT_STRING);
foreach ($ext as $e) {
echo 'ext ', $e, ' ', (phpversion($e) ?: '-'), "\n";
}
$ini = ini_get_all(null, false);
ksort($ini, SORT_STRING);
foreach ($ini as $k => $v) {
echo 'ini ', $k, '=', var_export($v, true), "\n";
}
+9 -49
View File
@@ -7,7 +7,7 @@
# manifest) are carried over by digest, the new arm64 (pushed by digest, never tagged) is added. # manifest) are carried over by digest, the new arm64 (pushed by digest, never tagged) is added.
# #
# attach-arm64-index.sh --repo <registry/path> --tag <tag> --arm64 sha256:<digest> \ # attach-arm64-index.sh --repo <registry/path> --tag <tag> --arm64 sha256:<digest> \
# [--expect-index sha256:<digest>] [--force] [--follow-tag <tag>] [--builder <buildx builder>] # [--expect-index sha256:<digest>] [--force] [--builder <buildx builder>]
# attach-arm64-index.sh --repo <registry/path> --tag <tag> --plan-only [--force] (no --arm64 needed) # attach-arm64-index.sh --repo <registry/path> --tag <tag> --plan-only [--force] (no --arm64 needed)
# #
# Rules (all enforced here so the workflow stays thin and these are testable): # Rules (all enforced here so the workflow stays thin and these are testable):
@@ -20,14 +20,8 @@
# index derived from an older one. # index derived from an older one.
# * The new arm64 digest must inspect as linux/arm64 and differ from the amd64 digest. # * The new arm64 digest must inspect as linux/arm64 and differ from the amd64 digest.
# * After the create the tag is re-read: its linux/amd64 manifest digest MUST be identical to the # * After the create the tag is re-read: its linux/amd64 manifest digest MUST be identical to the
# one before and an arm64 entry MUST be present. Otherwise exit 1. The previous index is # one before and an arm64 entry MUST be present. Otherwise the previous index is re-created
# re-created ONLY if our create lost the amd64 entry; a tag that now has a different amd64 (a # (best effort) and the script exits 1.
# concurrent publish) is never rolled back. Residual window: registry has no conditional PUT,
# so a publish landing between the last read and the create is still overwritten: do not run
# this while build-push runs for the same family.
# * --follow-tag T (e.g. latest for php85): if <repo>:T currently has the very same index digest as
# <tag> had BEFORE the attach (i.e. it is an alias of it), it is re-pointed to the new index so
# the alias keeps equalling the tag. If it differs it is left alone (warning). Never created.
# * --plan-only: run every check above, print the plan, create nothing (an already multi-arch # * --plan-only: run every check above, print the plan, create nothing (an already multi-arch
# tag still exits 3, so a pre-check step fails before an expensive build). # tag still exits 3, so a pre-check step fails before an expensive build).
# #
@@ -37,7 +31,7 @@
set -euo pipefail set -euo pipefail
IMAGETOOLS=${IMAGETOOLS:-docker buildx imagetools} IMAGETOOLS=${IMAGETOOLS:-docker buildx imagetools}
repo=""; tag=""; arm64=""; expect=""; force=0; plan_only=0; builder=""; follow="" repo=""; tag=""; arm64=""; expect=""; force=0; plan_only=0; builder=""
die() { echo "attach-arm64-index: $1" >&2; exit "${2:-1}"; } die() { echo "attach-arm64-index: $1" >&2; exit "${2:-1}"; }
note() { echo "attach-arm64-index: $*"; } note() { echo "attach-arm64-index: $*"; }
@@ -50,7 +44,6 @@ while [ $# -gt 0 ]; do
--expect-index) expect=${2-}; shift 2 ;; --expect-index) expect=${2-}; shift 2 ;;
--force) force=1; shift ;; --force) force=1; shift ;;
--plan-only) plan_only=1; shift ;; --plan-only) plan_only=1; shift ;;
--follow-tag) follow=${2-}; shift 2 ;;
--builder) builder=${2-}; shift 2 ;; --builder) builder=${2-}; shift 2 ;;
*) die "unknown argument: $1" 2 ;; *) die "unknown argument: $1" 2 ;;
esac esac
@@ -62,25 +55,15 @@ dre='^sha256:[0-9a-f]{64}$'
if [ "$plan_only" = 1 ] && [ -z "$arm64" ]; then :; else if [ "$plan_only" = 1 ] && [ -z "$arm64" ]; then :; else
[[ $arm64 =~ $dre ]] || die "--arm64 digest missing or malformed ('$arm64')" 2 [[ $arm64 =~ $dre ]] || die "--arm64 digest missing or malformed ('$arm64')" 2
fi fi
if [ -n "$follow" ]; then
[[ $follow =~ ^[A-Za-z0-9_][A-Za-z0-9_.-]{0,127}$ ]] || die "bad --follow-tag '$follow'" 2
[ "$follow" != "$tag" ] || die "--follow-tag equals --tag" 2
fi
if [ -n "$expect" ]; then [[ $expect =~ $dre ]] || die "bad --expect-index '$expect'" 2; fi if [ -n "$expect" ]; then [[ $expect =~ $dre ]] || die "bad --expect-index '$expect'" 2; fi
if [ "$plan_only" != 1 ] && [ -z "$expect" ]; then die "--expect-index is required (the digest the plan step read)" 2; fi
bflag=(); [ -n "$builder" ] && bflag=(--builder "$builder") bflag=(); [ -n "$builder" ] && bflag=(--builder "$builder")
# shellcheck disable=SC2086 # shellcheck disable=SC2086
it() { $IMAGETOOLS "$1" "${bflag[@]}" "${@:2}"; } it() { $IMAGETOOLS "$1" "${bflag[@]}" "${@:2}"; }
# tag_digest <ref>: manifest (index) digest of a ref = sha256 of its raw manifest bytes; empty on # tag_digest <ref>: manifest (index) digest of a ref; empty on failure.
# failure. (Not `--format {{.Manifest.Digest}}`: the CI runner's buildx 0.13.1 ignores it.)
tag_digest() { tag_digest() {
local h it inspect "$1" --format '{{.Manifest.Digest}}' 2>/dev/null | tail -n 1 | tr -d '[:space:]' || true
h=$(it inspect --raw "$1" 2>/dev/null | sha256sum | cut -d' ' -f1) || return 0
# sha256 of empty input means the inspect produced nothing
[ "$h" = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 ] && return 0
echo "sha256:$h"
} }
# arch_of <ref>: image config architecture; empty on failure. # arch_of <ref>: image config architecture; empty on failure.
arch_of() { arch_of() {
@@ -160,7 +143,7 @@ if [ "$plan_only" = 1 ]; then emit "platforms=plan-only"; exit 0; fi
# unless the arm64 entry is being replaced (--force): then only the amd64 manifest is carried over. # unless the arm64 entry is being replaced (--force): then only the amd64 manifest is carried over.
if [ "$kind" = index ] && [ -z "$had_arm64" ]; then src_old="$repo@$before_index"; else src_old="$repo@$amd64"; fi if [ "$kind" = index ] && [ -z "$had_arm64" ]; then src_old="$repo@$before_index"; else src_old="$repo@$amd64"; fi
note "creating $ref from $src_old + $repo@$arm64" note "creating $ref from $src_old + $repo@$arm64"
it create -t "$ref" "$src_old" "$repo@$arm64" || { echo "::error::attach-arm64-index: create failed; tag state unverified (was $before_index)" >&2; exit 1; } it create -t "$ref" "$src_old" "$repo@$arm64"
read_tag "$ref" read_tag "$ref"
after_index=$g_digest after_index=$g_digest
@@ -169,34 +152,11 @@ ok=1
[ "$g_amd64" = "$amd64" ] || ok=0 [ "$g_amd64" = "$amd64" ] || ok=0
[ "$(wc -w <<<"$g_arm64")" -eq 1 ] || ok=0 [ "$(wc -w <<<"$g_arm64")" -eq 1 ] || ok=0
if [ "$ok" != 1 ]; then if [ "$ok" != 1 ]; then
echo "::error::attach-arm64-index: $ref after create: kind=$g_kind amd64='$g_amd64' arm64='$g_arm64' (want amd64 $amd64 unchanged + one arm64)" >&2 echo "::error::attach-arm64-index: $ref after create: kind=$g_kind amd64='$g_amd64' arm64='$g_arm64' (want amd64 $amd64 unchanged + one arm64); restoring $before_index" >&2
# Restore ONLY when our create demonstrably lost the amd64 entry. If the tag now carries a if [ "$kind" = index ]; then
# different amd64 (a build-push published meanwhile) it is newer than anything we hold: never
# roll it back.
if [ "$kind" = index ] && [ -z "$g_amd64" ]; then
echo "::error::attach-arm64-index: amd64 entry lost; restoring $before_index" >&2
it create -t "$ref" "$repo@$before_index" || echo "::error::attach-arm64-index: RESTORE FAILED, $ref needs manual repair (previous index $before_index)" >&2 it create -t "$ref" "$repo@$before_index" || echo "::error::attach-arm64-index: RESTORE FAILED, $ref needs manual repair (previous index $before_index)" >&2
if [ "$(tag_digest "$ref")" = "$before_index" ]; then echo "attach-arm64-index: restored $before_index" >&2
else echo "::error::attach-arm64-index: after restore $ref is NOT $before_index; manual repair needed" >&2; fi
elif [ "$g_amd64" != "$amd64" ]; then
echo "::error::attach-arm64-index: $ref moved to a different amd64 ($g_amd64) while attaching; NOT restoring (it is newer). Re-check the tag and re-run." >&2
else
echo "::error::attach-arm64-index: tag state unexpected; NOT restoring automatically. Previous index was $before_index." >&2
fi fi
exit 1 exit 1
fi fi
note "$ref now index=$after_index (was $before_index); amd64 manifest unchanged $amd64; arm64=$g_arm64" note "$ref now index=$after_index (was $before_index); amd64 manifest unchanged $amd64; arm64=$g_arm64"
emit "after_index=$after_index"; emit "platforms=linux/amd64,linux/arm64" emit "after_index=$after_index"; emit "platforms=linux/amd64,linux/arm64"
# Alias tag (e.g. latest == php85): re-point only if it was an exact alias of the tag before.
if [ -n "$follow" ]; then
fdig=$(tag_digest "$repo:$follow")
if [ "$fdig" = "$before_index" ]; then
note "$repo:$follow was an alias of $tag ($before_index): re-pointing it to $after_index"
it create -t "$repo:$follow" "$repo@$after_index"
[ "$(tag_digest "$repo:$follow")" = "$after_index" ] || die "$repo:$follow does not equal $after_index after the re-point"
emit "followed_tag=$follow"
else
echo "::warning::attach-arm64-index: $repo:$follow is '${fdig:-missing}', not an alias of $tag ($before_index): left untouched"
fi
fi
+13 -68
View File
@@ -37,7 +37,7 @@ if cmd == 'inspect':
raw = '--raw' in rest raw = '--raw' in rest
ref = [a for a in rest if not a.startswith('--') and not a.startswith('{{')][0] if not raw else rest[rest.index('--raw') + 1] ref = [a for a in rest if not a.startswith('--') and not a.startswith('{{')][0] if not raw else rest[rest.index('--raw') + 1]
if raw: if raw:
sys.stdout.write(json.dumps(resolve(ref)[1], sort_keys=True)) print(json.dumps(resolve(ref)[1]))
elif '{{.Manifest.Digest}}' in rest: elif '{{.Manifest.Digest}}' in rest:
print(resolve(ref)[0]) print(resolve(ref)[0])
elif '{{json .Image}}' in rest: elif '{{json .Image}}' in rest:
@@ -95,7 +95,6 @@ for t, c in list(tags.items()):
json.dump(tags, open(S + '/tags.json', 'w')); json.dump(blobs, open(S + '/blobs.json', 'w')); json.dump(arch, open(S + '/arch.json', 'w')) json.dump(tags, open(S + '/tags.json', 'w')); json.dump(blobs, open(S + '/blobs.json', 'w')); json.dump(arch, open(S + '/arch.json', 'w'))
PY PY
} }
EXP=sha256:$(printf '0%.0s' {1..64})
tagdig() { python3 -I -c ' tagdig() { python3 -I -c '
import json,hashlib,sys import json,hashlib,sys
t=json.load(open(sys.argv[1]))[sys.argv[2]] t=json.load(open(sys.argv[1]))[sys.argv[2]]
@@ -110,7 +109,6 @@ creates() { grep -c '^create' "$T/st/log" || true; }
# ---- happy path: amd64-only tag + new arm64 -> index with amd64 UNCHANGED + arm64 # ---- happy path: amd64-only tag + new arm64 -> index with amd64 UNCHANGED + arm64
mk amd64only; before=$(tagdig) mk amd64only; before=$(tagdig)
chk "attach to amd64-only tag -> rc 0" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$before")" 0 chk "attach to amd64-only tag -> rc 0" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$before")" 0
chk " amd64 manifest digest unchanged, arm64 added" "$(plats)" "amd64=$A arm64=$B" chk " amd64 manifest digest unchanged, arm64 added" "$(plats)" "amd64=$A arm64=$B"
chk " amd64 attestation carried over" "$(python3 -I -c 'import json,sys;print(sum(1 for m in json.load(open(sys.argv[1]))[sys.argv[2]]["manifests"] if m["digest"]==sys.argv[3]))' "$T/st/tags.json" "$R:php82" "$AT")" 1 chk " amd64 attestation carried over" "$(python3 -I -c 'import json,sys;print(sum(1 for m in json.load(open(sys.argv[1]))[sys.argv[2]]["manifests"] if m["digest"]==sys.argv[3]))' "$T/st/tags.json" "$R:php82" "$AT")" 1
chk " exactly one create, from the old index + the arm64 digest" "$(grep -c "^create -t $R:php82 $R@$before $R@$B\$" "$T/st/log")" 1 chk " exactly one create, from the old index + the arm64 digest" "$(grep -c "^create -t $R:php82 $R@$before $R@$B\$" "$T/st/log")" 1
@@ -119,11 +117,11 @@ chk " prints before/after/amd64" "$(grep -c "^before_index=$before\$\|^amd64=$A
# ---- already multi-arch: refuse (3), nothing written # ---- already multi-arch: refuse (3), nothing written
mk both; before=$(tagdig) mk both; before=$(tagdig)
chk "tag already has arm64 -> rc 3" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$before")" 3 chk "tag already has arm64 -> rc 3" "$(run --repo $R --tag php82 --arm64 "$B")" 3
chk " no create" "$(creates)" 0 chk " no create" "$(creates)" 0
chk " tag untouched" "$(tagdig)" "$before" chk " tag untouched" "$(tagdig)" "$before"
# ---- --force replaces the arm64 entry, amd64 manifest untouched # ---- --force replaces the arm64 entry, amd64 manifest untouched
chk "--force on multi-arch -> rc 0" "$(run --repo $R --tag php82 --arm64 "$B" --force --expect-index "$(tagdig)")" 0 chk "--force on multi-arch -> rc 0" "$(run --repo $R --tag php82 --arm64 "$B" --force)" 0
chk " arm64 replaced, amd64 same" "$(plats)" "amd64=$A arm64=$B" chk " arm64 replaced, amd64 same" "$(plats)" "amd64=$A arm64=$B"
chk " create used the amd64 child only (old arm64 not a source)" "$(grep -c "^create -t $R:php82 $R@$A $R@$B\$" "$T/st/log")" 1 chk " create used the amd64 child only (old arm64 not a source)" "$(grep -c "^create -t $R:php82 $R@$A $R@$B\$" "$T/st/log")" 1
@@ -139,9 +137,9 @@ chk "--plan-only on multi-arch tag still refuses (3)" "$(run --repo $R --tag php
# ---- bad inputs / bad tags # ---- bad inputs / bad tags
mk amd64only mk amd64only
chk "arm64 digest that is not arm64 -> rc 1" "$(run --repo $R --tag php82 --arm64 "$C" --expect-index "$EXP")" 1 chk "arm64 digest that is not arm64 -> rc 1" "$(run --repo $R --tag php82 --arm64 "$C")" 1
chk "arm64 digest == amd64 digest -> rc 1" "$(run --repo $R --tag php82 --arm64 "$A" --expect-index "$EXP")" 1 chk "arm64 digest == amd64 digest -> rc 1" "$(run --repo $R --tag php82 --arm64 "$A")" 1
chk "arm64 digest unknown to registry -> rc 1" "$(run --repo $R --tag php82 --arm64 "$(d 7)" --expect-index "$EXP")" 1 chk "arm64 digest unknown to registry -> rc 1" "$(run --repo $R --tag php82 --arm64 "$(d 7)")" 1
chk "malformed --arm64 -> rc 2" "$(run --repo $R --tag php82 --arm64 nope)" 2 chk "malformed --arm64 -> rc 2" "$(run --repo $R --tag php82 --arm64 nope)" 2
chk "--arm64 missing without --plan-only -> rc 2" "$(run --repo $R --tag php82)" 2 chk "--arm64 missing without --plan-only -> rc 2" "$(run --repo $R --tag php82)" 2
chk "malformed --expect-index -> rc 2" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index x)" 2 chk "malformed --expect-index -> rc 2" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index x)" 2
@@ -149,82 +147,29 @@ chk "bad tag (injection) -> rc 2" "$(run --repo $R --tag 'a b;c' --arm64 "$B")"
chk "unknown argument -> rc 2" "$(run --repo $R --tag php82 --arm64 "$B" --bogus)" 2 chk "unknown argument -> rc 2" "$(run --repo $R --tag php82 --arm64 "$B" --bogus)" 2
chk " none of those created anything" "$(creates)" 0 chk " none of those created anything" "$(creates)" 0
mk missing mk missing
chk "missing tag -> rc 1" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$EXP")" 1 chk "missing tag -> rc 1" "$(run --repo $R --tag php82 --arm64 "$B")" 1
mk noamd mk noamd
chk "tag without amd64 -> rc 1" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$EXP")" 1 chk "tag without amd64 -> rc 1" "$(run --repo $R --tag php82 --arm64 "$B")" 1
mk twoamd mk twoamd
chk "tag with two amd64 entries -> rc 1" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$EXP")" 1 chk "tag with two amd64 entries -> rc 1" "$(run --repo $R --tag php82 --arm64 "$B")" 1
chk " no create" "$(creates)" 0 chk " no create" "$(creates)" 0
# ---- plain single amd64 manifest tag # ---- plain single amd64 manifest tag
mk single; before=$(tagdig) mk single; before=$(tagdig)
chk "single amd64 manifest tag -> rc 0" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$before")" 0 chk "single amd64 manifest tag -> rc 0" "$(run --repo $R --tag php82 --arm64 "$B")" 0
chk " create from the manifest digest + arm64" "$(grep -c "^create -t $R:php82 $R@$before $R@$B\$" "$T/st/log")" 1 chk " create from the manifest digest + arm64" "$(grep -c "^create -t $R:php82 $R@$before $R@$B\$" "$T/st/log")" 1
# ---- post-create verification: a create that loses amd64 is detected and rolled back # ---- post-create verification: a create that loses amd64 is detected and rolled back
mk amd64only; before=$(tagdig) mk amd64only; before=$(tagdig)
rc=$(MANGLE=drop-amd64 run --repo $R --tag php82 --arm64 "$B" --expect-index "$before"); chk "create dropped amd64 -> rc 1" "$rc" 1 rc=$(MANGLE=drop-amd64 run --repo $R --tag php82 --arm64 "$B"); chk "create dropped amd64 -> rc 1" "$rc" 1
chk " restored: tag is the previous index again" "$(plats)" "amd64=$A" chk " restored: tag is the previous index again" "$(plats)" "amd64=$A"
chk " second create was the restore from the old index" "$(grep -c "^create -t $R:php82 $R@$before\$" "$T/st/log")" 1 chk " second create was the restore from the old index" "$(grep -c "^create -t $R:php82 $R@$before\$" "$T/st/log")" 1
mk amd64only mk amd64only
rc=$(MANGLE=fail run --repo $R --tag php82 --arm64 "$B" --expect-index "$(tagdig)"); chk "create failing -> rc != 0" "$([ "$rc" != 0 ] && echo yes)" yes rc=$(MANGLE=fail run --repo $R --tag php82 --arm64 "$B"); chk "create failing -> rc != 0" "$([ "$rc" != 0 ] && echo yes)" yes
chk " tag untouched" "$(plats)" "amd64=$A" chk " tag untouched" "$(plats)" "amd64=$A"
chk "missing --expect-index -> rc 2" "$(run --repo $R --tag php82 --arm64 "$B")" 2
# concurrent publish during attach: tag ends with a different amd64 -> never rolled back
mk amd64only; before=$(tagdig)
cat >"$T/race.sh" <<'RS'
#!/usr/bin/env bash
python3 "$STUBPY" "$@"; rc=$?
if [ "$1" = create ] && [ ! -f "$STATE/raced" ]; then touch "$STATE/raced"; python3 - <<'PY'
import json, os
S = os.environ['STATE']; t = json.load(open(S + '/tags.json'))
k = [x for x in t if x.endswith(':php82')][0]
t[k] = {'manifests': [{'digest': 'sha256:' + 'd' * 64, 'platform': {'os': 'linux', 'architecture': 'amd64'}}]}
json.dump(t, open(S + '/tags.json', 'w'))
PY
fi
exit $rc
RS
chmod +x "$T/race.sh"
rc=$(STUBPY=$T/stub.py IMAGETOOLS="$T/race.sh" run --repo $R --tag php82 --arm64 "$B" --expect-index "$before"); chk "publish raced in during attach -> rc 1" "$rc" 1
chk " newer amd64 NOT rolled back" "$(plats)" "amd64=sha256:$(printf 'd%.0s' {1..64})"
chk " no restore create" "$(grep -c "^create -t $R:php82 $R@$before\$" "$T/st/log" || true)" 0
# ---- --follow-tag: an alias (latest == php85) follows; a different latest is left alone
mk amd64only
python3 -I - "$T/st/tags.json" "$R" <<'PY'
import json, sys
t = json.load(open(sys.argv[1])); t[sys.argv[2] + ':latest'] = t[sys.argv[2] + ':php82']; json.dump(t, open(sys.argv[1], 'w'))
PY
chk "--follow-tag latest (alias) -> rc 0" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$(tagdig)" --follow-tag latest)" 0
chk " latest now equals the new php82 index" "$(python3 -I -c '
import json,sys
t=json.load(open(sys.argv[1])); print(t[sys.argv[2]+":latest"]==t[sys.argv[2]+":php82"])' "$T/st/tags.json" "$R")" True
chk " latest has amd64 unchanged + arm64" "$(python3 -I -c '
import json,sys
t=json.load(open(sys.argv[1])); print(" ".join(m["platform"]["architecture"]+"="+m["digest"] for m in t[sys.argv[2]+":latest"]["manifests"] if "annotations" not in m))' "$T/st/tags.json" "$R")" "amd64=$A arm64=$B"
mk amd64only
python3 -I - "$T/st/tags.json" "$R" "$A" <<'PY'
import json, sys
t = json.load(open(sys.argv[1])); t[sys.argv[2] + ':latest'] = {'manifests': [{'digest': sys.argv[3], 'platform': {'os': 'linux', 'architecture': 'amd64'}}]}; json.dump(t, open(sys.argv[1], 'w'))
PY
lbefore=$(python3 -I -c '
import json,hashlib,sys
t=json.load(open(sys.argv[1]))[sys.argv[2]+":latest"]
print("sha256:"+hashlib.sha256(json.dumps(t,sort_keys=True).encode()).hexdigest())' "$T/st/tags.json" "$R")
chk "--follow-tag latest (not an alias) -> rc 0, tag attached" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$(tagdig)" --follow-tag latest)" 0
chk " latest untouched" "$(python3 -I -c '
import json,hashlib,sys
t=json.load(open(sys.argv[1]))[sys.argv[2]+":latest"]
print("sha256:"+hashlib.sha256(json.dumps(t,sort_keys=True).encode()).hexdigest())' "$T/st/tags.json" "$R")" "$lbefore"
mk amd64only
chk "--follow-tag with missing latest -> rc 0, left alone" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$(tagdig)" --follow-tag latest)" 0
chk "bad --follow-tag -> rc 2" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$(tagdig)" --follow-tag 'x y')" 2
chk "--follow-tag == --tag -> rc 2" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$(tagdig)" --follow-tag php82)" 2
# ---- GITHUB_OUTPUT # ---- GITHUB_OUTPUT
mk amd64only; GITHUB_OUTPUT=$T/gho "$HERE/attach-arm64-index.sh" --repo $R --tag php82 --arm64 "$B" --expect-index "$(tagdig)" >/dev/null 2>&1 mk amd64only; GITHUB_OUTPUT=$T/gho "$HERE/attach-arm64-index.sh" --repo $R --tag php82 --arm64 "$B" >/dev/null 2>&1
chk "GITHUB_OUTPUT has after_index and platforms" "$(grep -c '^after_index=\|^platforms=linux/amd64,linux/arm64$' "$T/gho")" 2 chk "GITHUB_OUTPUT has after_index and platforms" "$(grep -c '^after_index=\|^platforms=linux/amd64,linux/arm64$' "$T/gho")" 2
[ "$fail" -eq 0 ] && echo "ALL PASS" || { echo FAILURES; exit 1; } [ "$fail" -eq 0 ] && echo "ALL PASS" || { echo FAILURES; exit 1; }
+5 -9
View File
@@ -397,15 +397,14 @@ class AttachWorkflow(unittest.TestCase):
self.assertNotIn('${{', blk) # everything reaches the script through env: self.assertNotIn('${{', blk) # everything reaches the script through env:
self.assertNotIn('github.event.inputs', self.job.split('Validate inputs', 1)[1].split('Login to Gitea', 1)[1]) self.assertNotIn('github.event.inputs', self.job.split('Validate inputs', 1)[1].split('Login to Gitea', 1)[1])
def test_only_the_five_known_images_and_php_ranges(self): def test_only_images_cac_and_cac_fpm_and_php82_to_86(self):
v = step(self.job, 'Validate inputs') v = step(self.job, 'Validate inputs')
self.assertRegex(v, r'cac\)\s+dockerfile=Dockerfile;') self.assertRegex(v, r'cac\)\s+dockerfile=Dockerfile;')
self.assertRegex(v, r'cac-fpm\)\s+dockerfile=Dockerfile\.fpm;') self.assertRegex(v, r'cac-fpm\)\s+dockerfile=Dockerfile\.fpm;')
self.assertIn('^8[2-6]$', v) self.assertIn('^8[2-6]$', v)
self.assertRegex(v, r'cac-lsphp\|cac-litespeed\)') self.assertEqual(re.findall(r'(?m)^ ([a-z-]+)\)', v), ['cac', 'cac-fpm'])
self.assertRegex(v, r'shared-ols\)') self.assertNotIn('litespeed', v)
self.assertIn("^8[2-5]$", v) # OLS family: 82-85 only self.assertNotIn('lsphp', v)
self.assertEqual(re.findall(r'(?m)^ ([a-z-]+)\)', v), ['cac', 'cac-fpm', 'shared-ols'])
def test_arm64_only_push_by_digest_no_tags(self): def test_arm64_only_push_by_digest_no_tags(self):
self.assertEqual(len(re.findall(r'platforms: linux/', self.job)), 1) self.assertEqual(len(re.findall(r'platforms: linux/', self.job)), 1)
@@ -419,11 +418,8 @@ class AttachWorkflow(unittest.TestCase):
self.assertNotIn('Build amd64', self.job) self.assertNotIn('Build amd64', self.job)
def test_nothing_but_the_script_writes_a_tag(self): def test_nothing_but_the_script_writes_a_tag(self):
for bad in ('imagetools create', 'docker push', 'docker tag', '/cac:latest', '/cac-fpm:latest', 'ghcr.io'): for bad in ('imagetools create', 'docker push', 'docker tag', '/cac:latest', '/cac-fpm:latest', 'ghcr.io', 'docker buildx build'):
self.assertNotIn(bad, self.job, bad) self.assertNotIn(bad, self.job, bad)
self.assertEqual(self.job.count('docker buildx build'), 3) # only the local probes: php version (rpm), OLS version (shared-ols), lsphp probe
self.assertIn('type=local,dest=', self.job)
self.assertNotIn('--push', self.job)
self.assertEqual(self.job.count('scripts/attach-arm64-index.sh'), 2) # plan (read-only) + attach self.assertEqual(self.job.count('scripts/attach-arm64-index.sh'), 2) # plan (read-only) + attach
self.assertIn('--plan-only', step(self.job, 'Plan')) self.assertIn('--plan-only', step(self.job, 'Plan'))
self.assertNotIn('--arm64', step(self.job, 'Plan')) self.assertNotIn('--arm64', step(self.job, 'Plan'))