Compare commits

..
Author SHA1 Message Date
shadowdaoandClaude Sonnet 5.5 5dbc496313 fix(lsphp): ext-build survives LiteSpeed's empty lsphpNN-dev maintainer scripts under BuildKit's QEMU
arm64-attach run 5815 (cac-lsphp:php85) failed in the ext-build apt step: dpkg could not run the
0-byte postinst of lsphp85-dev ("Error while loading ...postinst: Exec format error", the QEMU
emulator wrapper does not give dpkg the ENOEXEC/sh fallback). Retry once after giving empty
maintainer scripts a shebang. Throwaway builder stage only; never taken on amd64.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-20 07:39:38 -08:00
jknapp 69e120df0f Merge pull request #56: arm64-attach OLS family [skip ci]
[skip ci]
2026-11-20 14:32:36 +00:00
shadowdaoandClaude Sonnet 5.5 044168f504 ci: arm64-attach supports cac-lsphp, cac-litespeed and shared-ols
Extends the dispatch-only attach workflow to the LiteSpeed family: same additive mechanism
(amd64 manifest digest untouched), arm64 built from the packaged lsphp, with a parity gate
(PHP version, SAPI, extensions, every ini value, OLS version) against the existing amd64 image
before the tag is touched. Tests and docs/arm64-ols-family.md updated.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-20 06:32:23 -08:00
jknapp 50a031a486 Merge pull request #55: pin actions to SHAs [skip ci]
[skip ci]
2026-11-20 14:20:52 +00:00
shadowdaoandClaude Sonnet 5.5 f0391a4af8 ci: pin every third-party action to a full commit SHA
actions/checkout v4.4.0 11d5960a..., docker/login-action v3.7.0 c94ce9fb...,
docker/setup-qemu-action v3.7.0 c7c53464..., docker/setup-buildx-action v3.12.0 8d2750c6...,
docker/build-push-action v6.19.2 10e90e36.... Each is the commit the floating major tag
pointed at (latest release of that major, all > 2 weeks old, lightweight tags verified with
git ls-remote). Tested on a branch with workflow_dispatch: the runner resolves owner/repo@sha.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-19 22:56:12 -08:00
jknappandClaude Sonnet 5.5 af008d7785 Merge test fix [skip ci]
[skip ci]

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-20 05:46:42 +00:00
shadowdaoandClaude Sonnet 5.5 4e86a99eb1 tests: fix multiarch-workflow test syntax slip
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-19 21:46:35 -08:00
jknappandClaude Sonnet 5.5 b0c8ec9683 Merge parity fix [skip ci]
[skip ci]

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-20 05:45:46 +00:00
shadowdaoandClaude Sonnet 5.5 02f3548bd3 arm64-attach: PHP parity via a BuildKit run (docker run of arm64 fails on the runner: exec format error)
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-19 21:45:37 -08:00
jknappandClaude Sonnet 5.5 6c57250ec3 Merge digest fix [skip ci]
[skip ci]

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-20 05:28:49 +00:00
shadowdaoandClaude Sonnet 5.5 0cff3b373e attach-arm64: digest from sha256 of raw manifest (runner buildx 0.13.1 ignores --format Manifest.Digest)
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-19 21:28:45 -08:00
jknappandClaude Sonnet 5.5 737d5c58d7 Merge #51 [skip ci]
[skip ci]

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-20 05:18:56 +00:00
shadowdaoandClaude Sonnet 5.5 af8e8a37e5 arm64-attach: diagnostics in plan step
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-19 21:18:47 -08:00
jknappandClaude Sonnet 5.5 6bf0b3d0d7 Merge pull request #50: arm64-attach plan after buildx [skip ci]
[skip ci]

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-20 05:14:31 +00:00
shadowdaoandClaude Sonnet 5.5 c7a2d9f275 arm64-attach: run the plan step after Buildx setup (imagetools needs the plugin); show inspect errors
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-19 21:14:17 -08:00
jknappandClaude Sonnet 5.5 2ad7249d9f Merge pull request #49: arm64 publish policy [skip ci]
serialise arm64 legs, one retry, no silent arm64 drop, ELF check. [skip ci]

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-20 05:13:12 +00:00
shadowdaoandClaude Sonnet 5.5 344c5e8d0d 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:12:56 -08:00
shadowdaoandClaude Sonnet 5.5 e1ea28e6a8 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:12:56 -08:00
jknappandClaude Sonnet 5.5 655c88f10b Merge pull request #48: arm64-attach workflow [skip ci]
arm64-attach workflow, attach script, ELF check. [skip ci]

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
2026-11-20 05:11:33 +00:00
14 changed files with 605 additions and 121 deletions

No files matched your search

+143 -39
View File
@@ -1,6 +1,7 @@
name: Attach arm64 to an existing tag name: Attach arm64 to an existing tag
run-name: attach arm64 to ${{ github.event.inputs.image }}:php${{ github.event.inputs.phpver }} run-name: attach arm64 to ${{ github.event.inputs.image }}:${{ github.event.inputs.phpver && format('php{0}', github.event.inputs.phpver) || 'latest' }}
# Manual only (never on push): publishes an arm64 image for an EXISTING tag of cac or cac-fpm # Manual only (never on push): publishes an arm64 image for an EXISTING tag of cac, 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 (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
@@ -14,12 +15,13 @@ on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
image: image:
description: 'cac or cac-fpm' description: 'cac, cac-fpm, cac-lsphp, cac-litespeed or shared-ols'
required: true required: true
type: string type: string
phpver: phpver:
description: 'PHP version without dots: 82, 83, 84, 85 or 86 (tag = php<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).'
required: true required: false
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)'
@@ -39,9 +41,11 @@ jobs:
timeout-minutes: 90 timeout-minutes: 90
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
# 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:
@@ -50,49 +54,44 @@ 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" ;;
*) echo "::error::image must be cac or cac-fpm"; exit 1 ;; cac-lsphp|cac-litespeed)
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" =~ ^8[2-6]$ ]] || { echo "::error::phpver must be one of 82 83 84 85 86"; exit 1; } [[ "$IN_PHPVER" =~ $phpre ]] || { echo "::error::phpver '${IN_PHPVER}' is not valid for ${IN_IMAGE} (pattern $phpre)"; 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=php${IN_PHPVER}" echo "tag=${tag}"
echo "image=${IN_IMAGE}" echo "image=${IN_IMAGE}"
echo "phpver=${IN_PHPVER}" echo "phpver=${basephp}"
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}:php${IN_PHPVER} (force=${IN_FORCE:-false})" echo "attach arm64 to ${IN_IMAGE}:${tag} (family=${family}, force=${IN_FORCE:-false})"
- name: Login to Gitea - name: Login to Gitea
uses: docker/login-action@v3 uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
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:
BASE_TAG: almalinux/10-base:latest # OLS family: same pin as build-push.yaml (OLS_VERSION 1.8.4; shared-ols uses the lsphp83 tag).
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
@@ -118,13 +117,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@v3 uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
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@v3 uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
with: with:
buildkitd-config-inline: | buildkitd-config-inline: |
[registry."docker.io"] [registry."docker.io"]
@@ -134,7 +133,22 @@ 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@v3 uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
# (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
@@ -144,6 +158,7 @@ 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 }}
@@ -156,21 +171,57 @@ 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@v6 uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
with: with:
file: ./${{ steps.v.outputs.dockerfile }} file: ./${{ steps.v.outputs.dockerfile }}
platforms: linux/arm64 platforms: linux/arm64
build-args: | build-args: ${{ steps.args.outputs.list }}
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:
@@ -190,8 +241,9 @@ jobs:
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@$AMD64" --platform linux/amd64 "${bins[@]}"
# The new arm64 was built now, the amd64 entry earlier: refuse a PHP version skew between them. # The new arm64 was built now, the amd64 entry earlier: refuse a 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 }}
@@ -200,11 +252,63 @@ jobs:
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@$AMD64" -r 'echo PHP_VERSION;')
got=$(docker run --rm --platform linux/arm64 --entrypoint php "$REPO@$ARM64_DIGEST" -r 'echo PHP_VERSION;') # `docker run` of an arm64 image fails on this runner ("exec format error": no binfmt for the
# 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)
+137 -50
View File
@@ -17,6 +17,11 @@ on:
required: false required: false
default: '' default: ''
type: string type: string
allow_amd64_only:
description: 'true = let a build whose arm64 leg failed replace a tag that already has arm64 with an amd64-only one (default: fail instead; restore arm64 afterwards with the arm64-attach workflow).'
required: false
default: 'false'
type: string
jobs: jobs:
# Shell gate. Runs FIRST and costs seconds; the images below do not depend on # Shell gate. Runs FIRST and costs seconds; the images below do not depend on
@@ -30,7 +35,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
# 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
@@ -79,6 +84,7 @@ jobs:
scripts/index-platforms.sh \ scripts/index-platforms.sh \
scripts/assemble-multiarch-index.sh \ scripts/assemble-multiarch-index.sh \
scripts/attach-arm64-index.sh \ scripts/attach-arm64-index.sh \
scripts/tests/assemble-guard.test.sh \
scripts/tests/attach-arm64-index.test.sh \ scripts/tests/attach-arm64-index.test.sh \
scripts/tests/verify-image-arch.test.sh \ scripts/tests/verify-image-arch.test.sh \
scripts/tests/image-label-amd64.test.sh \ scripts/tests/image-label-amd64.test.sh \
@@ -105,6 +111,7 @@ jobs:
run: | run: |
./scripts/tests/attach-arm64-index.test.sh ./scripts/tests/attach-arm64-index.test.sh
./scripts/tests/verify-image-arch.test.sh ./scripts/tests/verify-image-arch.test.sh
./scripts/tests/assemble-guard.test.sh
# Static wiring of the multi-arch publish jobs (cac, cac-fpm, shared-httpd): # Static wiring of the multi-arch publish jobs (cac, cac-fpm, shared-httpd):
# by-digest pushes, non-fatal arm64 leg, timeouts, exact tag scheme. # by-digest pushes, non-fatal arm64 leg, timeouts, exact tag scheme.
@@ -145,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@v4 uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
- name: Plan legs - name: Plan legs
id: plan id: plan
@@ -157,16 +164,22 @@ jobs:
needs: plan needs: plan
if: needs.plan.outputs.cac != '[]' if: needs.plan.outputs.cac != '[]'
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 75 timeout-minutes: 130
strategy: strategy:
# One PHP version failing (e.g. an EOL stream) must not cancel the # One PHP version failing (e.g. an EOL stream) must not cancel the
# security builds of the others. # security builds of the others.
fail-fast: false fail-fast: false
# 2026-11-19: 4+4 QEMU arm64 legs ran at once and 6 of 8 failed on network steps
# (Remi / pkg-cache timeouts, truncated repomd.xml.asc); legs run alone succeeded.
# Caps concurrent legs of this family (max-parallel 1 = safest, slowest; whether
# the runner honours it is unverified: Gitea expands the matrix server-side). It is a
# per-job cap only: concurrency ACROSS jobs (cac + cac-fpm + shared-httpd) is not bounded.
max-parallel: 2
matrix: matrix:
phpver: ${{ fromJSON(needs.plan.outputs.cac) }} phpver: ${{ fromJSON(needs.plan.outputs.cac) }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
# 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
@@ -208,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@v3 uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
with: with:
platforms: arm64 platforms: arm64
@@ -217,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@v3 uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
with: with:
buildkitd-config-inline: | buildkitd-config-inline: |
[registry."docker.io"] [registry."docker.io"]
@@ -227,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@v3 uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
# 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
@@ -259,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@v3 uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
with: with:
registry: repo.anhonesthost.net registry: repo.anhonesthost.net
username: ${{ secrets.CI_USER }} username: ${{ secrets.CI_USER }}
@@ -270,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@v6 uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
with: with:
platforms: linux/amd64 platforms: linux/amd64
build-args: | build-args: |
@@ -290,7 +303,28 @@ jobs:
id: arm64 id: arm64
continue-on-error: true continue-on-error: true
timeout-minutes: 45 timeout-minutes: 45
uses: docker/build-push-action@v6 uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
with:
platforms: linux/arm64
build-args: |
PHPVER=${{ matrix.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/cac,push-by-digest=true,name-canonical=true,push=true
# ONE retry of a failed arm64 leg after a pause (network-step flakes). Same inputs.
- name: Wait before arm64 retry
if: steps.arm64.outcome == 'failure'
run: sleep 90
- name: Retry arm64 (push by digest)
id: arm64_retry
if: steps.arm64.outcome == 'failure'
continue-on-error: true
timeout-minutes: 45
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
with: with:
platforms: linux/arm64 platforms: linux/arm64
build-args: | build-args: |
@@ -306,8 +340,9 @@ jobs:
- name: Assemble index tag(s) - name: Assemble index tag(s)
env: env:
AMD64_DIGEST: ${{ steps.amd64.outputs.digest }} AMD64_DIGEST: ${{ steps.amd64.outputs.digest }}
ARM64_DIGEST: ${{ steps.arm64.outputs.digest }} ARM64_DIGEST: ${{ steps.arm64.outcome == 'success' && steps.arm64.outputs.digest || steps.arm64_retry.outputs.digest }}
ARM64_OUTCOME: ${{ steps.arm64.outcome }} ARM64_OUTCOME: ${{ (steps.arm64.outcome == 'success' || steps.arm64_retry.outcome == 'success') && 'success' || steps.arm64.outcome }}
ALLOW_AMD64_ONLY: ${{ github.event.inputs.allow_amd64_only }}
PHPVER: ${{ matrix.phpver }} PHPVER: ${{ matrix.phpver }}
run: | run: |
set -euo pipefail set -euo pipefail
@@ -317,6 +352,7 @@ jobs:
scripts/assemble-multiarch-index.sh \ scripts/assemble-multiarch-index.sh \
--amd64 "$AMD64_DIGEST" \ --amd64 "$AMD64_DIGEST" \
--arm64 "$ARM64_DIGEST" --arm64-outcome "$ARM64_OUTCOME" \ --arm64 "$ARM64_DIGEST" --arm64-outcome "$ARM64_OUTCOME" \
--guard-existing-arm64 --verify-bin /usr/sbin/httpd --verify-bin /usr/bin/php \
--repo repo.anhonesthost.net/cloud-hosting-platform/cac \ --repo repo.anhonesthost.net/cloud-hosting-platform/cac \
"${tags[@]}" "${tags[@]}"
@@ -324,16 +360,22 @@ jobs:
needs: plan needs: plan
if: needs.plan.outputs.cac_fpm != '[]' if: needs.plan.outputs.cac_fpm != '[]'
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 75 timeout-minutes: 130
strategy: strategy:
# One PHP version failing (e.g. an EOL stream) must not cancel the # One PHP version failing (e.g. an EOL stream) must not cancel the
# security builds of the others. # security builds of the others.
fail-fast: false fail-fast: false
# 2026-11-19: 4+4 QEMU arm64 legs ran at once and 6 of 8 failed on network steps
# (Remi / pkg-cache timeouts, truncated repomd.xml.asc); legs run alone succeeded.
# Caps concurrent legs of this family (max-parallel 1 = safest, slowest; whether
# the runner honours it is unverified: Gitea expands the matrix server-side). It is a
# per-job cap only: concurrency ACROSS jobs (cac + cac-fpm + shared-httpd) is not bounded.
max-parallel: 2
matrix: matrix:
phpver: ${{ fromJSON(needs.plan.outputs.cac_fpm) }} phpver: ${{ fromJSON(needs.plan.outputs.cac_fpm) }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
# 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
@@ -375,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@v3 uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
with: with:
platforms: arm64 platforms: arm64
@@ -384,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@v3 uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
with: with:
buildkitd-config-inline: | buildkitd-config-inline: |
[registry."docker.io"] [registry."docker.io"]
@@ -394,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@v3 uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
# 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
@@ -426,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@v3 uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
with: with:
registry: repo.anhonesthost.net registry: repo.anhonesthost.net
username: ${{ secrets.CI_USER }} username: ${{ secrets.CI_USER }}
@@ -437,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@v6 uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
with: with:
file: ./Dockerfile.fpm file: ./Dockerfile.fpm
platforms: linux/amd64 platforms: linux/amd64
@@ -458,7 +500,29 @@ jobs:
id: arm64 id: arm64
continue-on-error: true continue-on-error: true
timeout-minutes: 45 timeout-minutes: 45
uses: docker/build-push-action@v6 uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
with:
file: ./Dockerfile.fpm
platforms: linux/arm64
build-args: |
PHPVER=${{ matrix.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/cac-fpm,push-by-digest=true,name-canonical=true,push=true
# ONE retry of a failed arm64 leg after a pause (network-step flakes). Same inputs.
- name: Wait before arm64 retry
if: steps.arm64.outcome == 'failure'
run: sleep 90
- name: Retry arm64 (push by digest)
id: arm64_retry
if: steps.arm64.outcome == 'failure'
continue-on-error: true
timeout-minutes: 45
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
with: with:
file: ./Dockerfile.fpm file: ./Dockerfile.fpm
platforms: linux/arm64 platforms: linux/arm64
@@ -475,8 +539,9 @@ jobs:
- name: Assemble index tag(s) - name: Assemble index tag(s)
env: env:
AMD64_DIGEST: ${{ steps.amd64.outputs.digest }} AMD64_DIGEST: ${{ steps.amd64.outputs.digest }}
ARM64_DIGEST: ${{ steps.arm64.outputs.digest }} ARM64_DIGEST: ${{ steps.arm64.outcome == 'success' && steps.arm64.outputs.digest || steps.arm64_retry.outputs.digest }}
ARM64_OUTCOME: ${{ steps.arm64.outcome }} ARM64_OUTCOME: ${{ (steps.arm64.outcome == 'success' || steps.arm64_retry.outcome == 'success') && 'success' || steps.arm64.outcome }}
ALLOW_AMD64_ONLY: ${{ github.event.inputs.allow_amd64_only }}
PHPVER: ${{ matrix.phpver }} PHPVER: ${{ matrix.phpver }}
run: | run: |
set -euo pipefail set -euo pipefail
@@ -486,6 +551,7 @@ jobs:
scripts/assemble-multiarch-index.sh \ scripts/assemble-multiarch-index.sh \
--amd64 "$AMD64_DIGEST" \ --amd64 "$AMD64_DIGEST" \
--arm64 "$ARM64_DIGEST" --arm64-outcome "$ARM64_OUTCOME" \ --arm64 "$ARM64_DIGEST" --arm64-outcome "$ARM64_OUTCOME" \
--guard-existing-arm64 --verify-bin /usr/sbin/php-fpm --verify-bin /usr/bin/php \
--repo repo.anhonesthost.net/cloud-hosting-platform/cac-fpm \ --repo repo.anhonesthost.net/cloud-hosting-platform/cac-fpm \
"${tags[@]}" "${tags[@]}"
@@ -509,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@v4 uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
# 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
@@ -551,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@v3 uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
# 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@v3 uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
with: with:
buildkitd-config-inline: | buildkitd-config-inline: |
[registry."docker.io"] [registry."docker.io"]
@@ -568,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@v3 uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
# 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
@@ -602,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@v3 uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
with: with:
registry: repo.anhonesthost.net registry: repo.anhonesthost.net
username: ${{ secrets.CI_USER }} username: ${{ secrets.CI_USER }}
@@ -626,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@v6 uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
with: with:
file: ./Dockerfile.litespeed file: ./Dockerfile.litespeed
platforms: linux/amd64 platforms: linux/amd64
@@ -667,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@v4 uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
# 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
@@ -709,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@v3 uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
# 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@v3 uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
with: with:
buildkitd-config-inline: | buildkitd-config-inline: |
[registry."docker.io"] [registry."docker.io"]
@@ -726,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@v3 uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
# 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
@@ -760,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@v3 uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
with: with:
registry: repo.anhonesthost.net registry: repo.anhonesthost.net
username: ${{ secrets.CI_USER }} username: ${{ secrets.CI_USER }}
@@ -784,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@v6 uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
with: with:
file: ./Dockerfile.lsphp file: ./Dockerfile.lsphp
platforms: linux/amd64 platforms: linux/amd64
@@ -807,10 +873,10 @@ jobs:
needs: plan needs: plan
if: needs.plan.outputs.shared_httpd == 'true' if: needs.plan.outputs.shared_httpd == 'true'
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 50 timeout-minutes: 80
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
# 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
@@ -852,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@v3 uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
with: with:
platforms: arm64 platforms: arm64
@@ -861,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@v3 uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
with: with:
buildkitd-config-inline: | buildkitd-config-inline: |
[registry."docker.io"] [registry."docker.io"]
@@ -871,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@v3 uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
- name: Login to Gitea - name: Login to Gitea
uses: docker/login-action@v3 uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
with: with:
registry: repo.anhonesthost.net registry: repo.anhonesthost.net
username: ${{ secrets.CI_USER }} username: ${{ secrets.CI_USER }}
@@ -885,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@v6 uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
with: with:
file: ./Dockerfile.shared-httpd file: ./Dockerfile.shared-httpd
platforms: linux/amd64 platforms: linux/amd64
@@ -903,7 +969,26 @@ jobs:
id: arm64 id: arm64
continue-on-error: true continue-on-error: true
timeout-minutes: 25 timeout-minutes: 25
uses: docker/build-push-action@v6 uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
with:
file: ./Dockerfile.shared-httpd
platforms: linux/arm64
build-args: |
BASE_IMAGE=${{ steps.base.outputs.image }}
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
outputs: type=image,name=repo.anhonesthost.net/cloud-hosting-platform/shared-httpd,push-by-digest=true,name-canonical=true,push=true
# ONE retry of a failed arm64 leg after a pause (network-step flakes). Same inputs.
- name: Wait before arm64 retry
if: steps.arm64.outcome == 'failure'
run: sleep 90
- name: Retry arm64 (push by digest)
id: arm64_retry
if: steps.arm64.outcome == 'failure'
continue-on-error: true
timeout-minutes: 25
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
with: with:
file: ./Dockerfile.shared-httpd file: ./Dockerfile.shared-httpd
platforms: linux/arm64 platforms: linux/arm64
@@ -917,13 +1002,15 @@ jobs:
- name: Assemble index tag(s) - name: Assemble index tag(s)
env: env:
AMD64_DIGEST: ${{ steps.amd64.outputs.digest }} AMD64_DIGEST: ${{ steps.amd64.outputs.digest }}
ARM64_DIGEST: ${{ steps.arm64.outputs.digest }} ARM64_DIGEST: ${{ steps.arm64.outcome == 'success' && steps.arm64.outputs.digest || steps.arm64_retry.outputs.digest }}
ARM64_OUTCOME: ${{ steps.arm64.outcome }} ARM64_OUTCOME: ${{ (steps.arm64.outcome == 'success' || steps.arm64_retry.outcome == 'success') && 'success' || steps.arm64.outcome }}
ALLOW_AMD64_ONLY: ${{ github.event.inputs.allow_amd64_only }}
run: | run: |
set -euo pipefail set -euo pipefail
scripts/assemble-multiarch-index.sh \ scripts/assemble-multiarch-index.sh \
--amd64 "$AMD64_DIGEST" \ --amd64 "$AMD64_DIGEST" \
--arm64 "$ARM64_DIGEST" --arm64-outcome "$ARM64_OUTCOME" \ --arm64 "$ARM64_DIGEST" --arm64-outcome "$ARM64_OUTCOME" \
--guard-existing-arm64 --verify-bin /usr/sbin/httpd \
--repo repo.anhonesthost.net/cloud-hosting-platform/shared-httpd \ --repo repo.anhonesthost.net/cloud-hosting-platform/shared-httpd \
--tag latest --tag latest
@@ -937,7 +1024,7 @@ jobs:
PHPVER: "83" PHPVER: "83"
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
# 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
@@ -979,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@v3 uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
# 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@v3 uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
with: with:
buildkitd-config-inline: | buildkitd-config-inline: |
[registry."docker.io"] [registry."docker.io"]
@@ -996,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@v3 uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
- name: Login to Gitea - name: Login to Gitea
uses: docker/login-action@v3 uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
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@v6 uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
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@v4 uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
# 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@v3 uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
- 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@v3 uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
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@v3 uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
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@v6 uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
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@v6 uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
with: with:
file: ${{ steps.t.outputs.dockerfile }} file: ${{ steps.t.outputs.dockerfile }}
platforms: linux/arm64 platforms: linux/arm64
+19 -3
View File
@@ -108,11 +108,27 @@ 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; \
/usr/local/sbin/lsphp-apt-upgrade.sh --no-os-upgrade "${PHPVER}" \ install_dev() { \
build-essential autoconf pkg-config \ /usr/local/sbin/lsphp-apt-upgrade.sh --no-os-upgrade "${PHPVER}" \
lsphp${PHPVER}-dev; \ build-essential autoconf pkg-config \
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
@@ -0,0 +1,46 @@
# 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.
+8
View File
@@ -0,0 +1,8 @@
# arm64 in build-push.yaml (cac, cac-fpm, shared-httpd)
The arm64 leg is best effort (QEMU on the x86 runner) but never silently lost:
- Matrix families run at most 2 legs at once (`max-parallel: 2`); 2026-11-19 showed that 8 concurrent QEMU legs fail on network steps.
- A failed arm64 leg is retried ONCE after 90 s (`Retry arm64`). Assemble uses the first success.
- Before publishing, `scripts/assemble-multiarch-index.sh --verify-bin` checks ELF machine types (amd64 = x86-64, arm64 = AArch64). A wrong arm64 counts as a failed leg; a wrong amd64 aborts.
- `--guard-existing-arm64`: if the build ends without arm64 (failed, skipped or cancelled leg) and the current tag has an arm64 entry, the assemble step FAILS and publishes nothing (the amd64 digest is in the error). Options: re-dispatch `only=<leg>`, or dispatch with `allow_amd64_only=true` (security rebuilds) and then restore arm64 with the `arm64-attach` workflow. Push-triggered runs have no input, so the guard is always on there.
+22
View File
@@ -0,0 +1,22 @@
<?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";
}
+49 -3
View File
@@ -8,7 +8,8 @@
# --amd64 sha256:<digest> \ # --amd64 sha256:<digest> \
# --arm64 sha256:<digest> --arm64-outcome success|failure|cancelled|skipped \ # --arm64 sha256:<digest> --arm64-outcome success|failure|cancelled|skipped \
# --repo <registry/path> [--repo <other registry/path> ...] \ # --repo <registry/path> [--repo <other registry/path> ...] \
# --tag <tag> [--tag <tag> ...] [--builder <buildx builder>] # --tag <tag> [--tag <tag> ...] [--builder <buildx builder>] \
# [--verify-bin PATH ...] [--guard-existing-arm64]
# #
# 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):
# * amd64 is mandatory. A missing/malformed amd64 digest, or an amd64 digest # * amd64 is mandatory. A missing/malformed amd64 digest, or an amd64 digest
@@ -19,16 +20,25 @@
# published amd64-only (warning, exit 0). The arm64 digest must come from # published amd64-only (warning, exit 0). The arm64 digest must come from
# THIS run's step output - the workflow never reads it from a registry tag, # THIS run's step output - the workflow never reads it from a registry tag,
# so a previous build's arm64 can never be re-attached to a newer amd64. # so a previous build's arm64 can never be re-attached to a newer amd64.
# * --verify-bin (repeatable): before anything is published, the amd64 entry must hold x86-64
# and (if it would be attached) the arm64 entry AArch64 binaries at those paths
# (scripts/verify-image-arch.py, nothing is executed). Wrong/unverifiable amd64 = exit 1,
# nothing published. Wrong/unverifiable arm64 = treated as a failed arm64 leg.
# * --guard-existing-arm64: if the result would be amd64-only and a CURRENT tag already has a
# linux/arm64 entry, exit 1 and publish nothing (never silently drop arm64), unless
# env ALLOW_AMD64_ONLY=true. An unreadable tag fails closed; a missing tag is fine.
# * every --tag is created in every --repo from <repo>@<digest> sources in # * every --tag is created in every --repo from <repo>@<digest> sources in
# that same repo (both digests were pushed to every --repo by the build). # that same repo (both digests were pushed to every --repo by the build).
# #
# Env: IMAGETOOLS overrides the command (default: "docker buildx imagetools"); # Env: ALLOW_AMD64_ONLY=true lets the guard pass; VERIFY_ARCH overrides the verifier command
# (tests use a stub); IMAGETOOLS overrides the command (default: "docker buildx imagetools");
# the test suite points it at a stub. # the test suite points it at a stub.
set -euo pipefail set -euo pipefail
IMAGETOOLS=${IMAGETOOLS:-docker buildx imagetools} IMAGETOOLS=${IMAGETOOLS:-docker buildx imagetools}
amd64=""; arm64=""; outcome="skipped"; builder="" amd64=""; arm64=""; outcome="skipped"; builder=""
repos=(); tags=() repos=(); tags=(); vbins=(); guard=0
HERE=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
die() { echo "assemble-multiarch-index: $*" >&2; exit 1; } die() { echo "assemble-multiarch-index: $*" >&2; exit 1; }
warn() { echo "::warning::assemble-multiarch-index: $*"; } warn() { echo "::warning::assemble-multiarch-index: $*"; }
@@ -41,6 +51,8 @@ while [ $# -gt 0 ]; do
--repo) repos+=("${2-}"); shift 2 ;; --repo) repos+=("${2-}"); shift 2 ;;
--tag) tags+=("${2-}"); shift 2 ;; --tag) tags+=("${2-}"); shift 2 ;;
--builder) builder=${2-}; shift 2 ;; --builder) builder=${2-}; shift 2 ;;
--verify-bin) vbins+=("${2-}"); shift 2 ;;
--guard-existing-arm64) guard=1; shift ;;
*) die "unknown argument: $1" ;; *) die "unknown argument: $1" ;;
esac esac
done done
@@ -80,6 +92,40 @@ else
done done
fi fi
# ELF machine-type check (labels alone do not prove the binaries are of that architecture).
if [ ${#vbins[@]} -gt 0 ]; then
# shellcheck disable=SC2206
verify=(${VERIFY_ARCH:-python3 -I "$HERE/verify-image-arch.py"})
vargs=(); for b in "${vbins[@]}"; do vargs+=(--bin "$b"); done
for r in "${repos[@]}"; do
"${verify[@]}" --image "$r@$amd64" --platform linux/amd64 "${vargs[@]}" \
|| die "$r@$amd64 failed the x86-64 ELF check; refusing to publish"
if [ "$use_arm64" = 1 ]; then
if ! "${verify[@]}" --image "$r@$arm64" --platform linux/arm64 "${vargs[@]}"; then
warn "$r@$arm64 failed the AArch64 ELF check: publishing amd64-only"
use_arm64=0; break
fi
fi
done
fi
# Never silently replace a multi-arch tag by an amd64-only one.
if [ "$guard" = 1 ] && [ "$use_arm64" = 0 ] && [ "${ALLOW_AMD64_ONLY:-false}" != true ]; then
for r in "${repos[@]}"; do for t in "${tags[@]}"; do
rc=0; info=$(IMAGETOOLS=$IMAGETOOLS "$HERE/index-platforms.sh" "$r:$t") || rc=$?
case "$rc" in
0) ;;
3) info="not found" ;;
*) echo "::error::assemble-multiarch-index: cannot tell whether $r:$t is multi-arch; refusing to overwrite it (fail closed)" >&2; exit 1 ;;
esac
case "$info" in
*linux/arm64*)
echo "::error::assemble-multiarch-index: $r:$t has an arm64 entry but this build has none (arm64 outcome '$outcome'); publishing amd64-only would drop it. Nothing published. amd64 digest of this build: $amd64. Fix: re-dispatch only=<leg>, or re-run with allow_amd64_only=true and then restore arm64 with the arm64-attach workflow." >&2
exit 1 ;;
esac
done; done
fi
for r in "${repos[@]}"; do for r in "${repos[@]}"; do
targs=(); for t in "${tags[@]}"; do targs+=(-t "$r:$t"); done targs=(); for t in "${tags[@]}"; do targs+=(-t "$r:$t"); done
srcs=("$r@$amd64"); [ "$use_arm64" = 1 ] && srcs+=("$r@$arm64") srcs=("$r@$amd64"); [ "$use_arm64" = 1 ] && srcs+=("$r@$arm64")
+7 -2
View File
@@ -73,9 +73,14 @@ 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; empty on failure. # tag_digest <ref>: manifest (index) digest of a ref = sha256 of its raw manifest bytes; empty on
# failure. (Not `--format {{.Manifest.Digest}}`: the CI runner's buildx 0.13.1 ignores it.)
tag_digest() { tag_digest() {
it inspect "$1" --format '{{.Manifest.Digest}}' 2>/dev/null | tail -n 1 | tr -d '[:space:]' || true local h
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() {
+79
View File
@@ -0,0 +1,79 @@
#!/usr/bin/env bash
## assemble-guard.test.sh - --guard-existing-arm64 and --verify-bin of scripts/assemble-multiarch-index.sh
## against a stub IMAGETOOLS (registry state in files) and a stub ELF verifier.
set -euo pipefail
HERE=$(cd "$(dirname "$0")/.." && pwd)
T=$(mktemp -d); trap 'rm -rf "$T"' EXIT
fail=0
chk() { if [ "$2" = "$3" ]; then echo "ok $1"; else echo "FAIL $1: got '$2' want '$3'"; fail=1; fi; }
d() { local c=$1; printf 'sha256:'; printf "$c%.0s" {1..64}; }
A=$(d a); B=$(d b); R=reg/x
cat >"$T/it" <<'STUB'
#!/usr/bin/env bash
# create -> logged. inspect --raw REF -> $FIX/<ref with /:@ as _> (err_ prefix = failure text).
# inspect REF --format .. -> architecture from $ARCHES (ref=arch lines).
if [ "$1" = create ]; then echo "create $*" >>"$LOG"; exit 0; fi
if [ "$2" = --raw ]; then
k=$(printf '%s' "$3" | tr '/:@' '___')
if [ -f "$FIX/err_$k" ]; then cat "$FIX/err_$k" >&2; exit 1; fi
[ -f "$FIX/$k" ] || { echo "ERROR: $3: not found" >&2; exit 1; }
cat "$FIX/$k"; exit 0
fi
a=$(grep -F -m1 "$2=" "$ARCHES" | cut -d= -f2); [ -n "$a" ] || exit 1
printf '{"architecture":"%s"}' "$a"
STUB
cat >"$T/ver" <<'STUB'
#!/usr/bin/env bash
echo "verify $*" >>"$LOG"
case "$*" in *linux/arm64*) [ "${FAIL_ARM:-0}" = 1 ] && exit 1 ;; *linux/amd64*) [ "${FAIL_AMD:-0}" = 1 ] && exit 1 ;; esac
exit 0
STUB
chmod +x "$T/it" "$T/ver"
export IMAGETOOLS="$T/it" VERIFY_ARCH="$T/ver" FIX=$T LOG=$T/log ARCHES=$T/arches
printf '%s\n' "$R@$A=amd64" "$R@$B=arm64" >"$ARCHES"
w() { printf '%s' "$2" >"$T/$(printf '%s' "$1" | tr '/:@' '___')"; }
MULTI='{"manifests":[{"digest":"x","platform":{"os":"linux","architecture":"amd64"}},{"digest":"y","platform":{"os":"linux","architecture":"arm64"}}]}'
AMDONLY='{"manifests":[{"digest":"x","platform":{"os":"linux","architecture":"amd64"}}]}'
run() { : >"$LOG"; "$HERE/assemble-multiarch-index.sh" "$@" >"$T/out" 2>"$T/err"; echo $?; }
creates() { grep -c '^create' "$LOG" || true; }
base=(--amd64 "$A" --repo "$R" --tag php82)
w $R:php82 "$MULTI"
chk "amd64-only result over a multi-arch tag, guard on -> 1" "$(run "${base[@]}" --arm64-outcome failure --guard-existing-arm64)" 1
chk " nothing published" "$(creates)" 0
chk " error names the amd64 digest" "$(grep -c "$A" "$T/err")" 1
chk "arm64 leg skipped, guard on -> 1" "$(run "${base[@]}" --guard-existing-arm64)" 1
chk "ALLOW_AMD64_ONLY=true overrides -> 0" "$(ALLOW_AMD64_ONLY=true run "${base[@]}" --arm64-outcome failure --guard-existing-arm64)" 0
chk " amd64-only index created" "$(creates)" 1
chk "ALLOW_AMD64_ONLY=false does not override" "$(ALLOW_AMD64_ONLY=false run "${base[@]}" --arm64-outcome failure --guard-existing-arm64)" 1
chk "without --guard-existing-arm64 old behaviour (publish) -> 0" "$(run "${base[@]}" --arm64-outcome failure)" 0
chk "arm64 present in this build: guard irrelevant -> 0" "$(run "${base[@]}" --arm64 "$B" --arm64-outcome success --guard-existing-arm64)" 0
chk " 2 sources" "$(grep -c "$R@$A $R@$B\$" "$LOG")" 1
w $R:php82 "$AMDONLY"
chk "existing tag amd64-only, guard on -> 0" "$(run "${base[@]}" --arm64-outcome failure --guard-existing-arm64)" 0
rm -f "$T/reg_x_php82"
chk "tag not found (first publish) -> 0" "$(run "${base[@]}" --arm64-outcome failure --guard-existing-arm64)" 0
printf 'ERROR: denied\n' >"$T/err_reg_x_php82"
chk "tag unreadable -> fail closed 1" "$(run "${base[@]}" --arm64-outcome failure --guard-existing-arm64)" 1
chk " nothing published" "$(creates)" 0
rm -f "$T/err_reg_x_php82"
w $R:php82 "$AMDONLY"; w $R:latest "$MULTI"
chk "second tag multi-arch is caught too -> 1" "$(run --amd64 "$A" --repo $R --tag php82 --tag latest --arm64-outcome failure --guard-existing-arm64)" 1
chk " nothing published" "$(creates)" 0
# ---- ELF verification
w $R:php82 "$AMDONLY"
vb=(--verify-bin /usr/sbin/httpd --verify-bin /usr/bin/php)
chk "both verify -> 0, both platforms checked" "$(run "${base[@]}" --arm64 "$B" --arm64-outcome success "${vb[@]}")" 0
chk " amd64 and arm64 verified with both bins" "$(grep -c "^verify --image $R@$A --platform linux/amd64 --bin /usr/sbin/httpd --bin /usr/bin/php\$\|^verify --image $R@$B --platform linux/arm64 --bin /usr/sbin/httpd --bin /usr/bin/php\$" "$LOG")" 2
chk " arm64 index created" "$(grep -c "$R@$A $R@$B\$" "$LOG")" 1
chk "wrong amd64 -> refuse 1" "$(FAIL_AMD=1 run "${base[@]}" --arm64 "$B" --arm64-outcome success "${vb[@]}")" 1
chk " nothing published" "$(creates)" 0
chk "wrong arm64, tag amd64-only -> amd64-only publish 0" "$(FAIL_ARM=1 run "${base[@]}" --arm64 "$B" --arm64-outcome success "${vb[@]}" --guard-existing-arm64)" 0
chk " no arm64 digest in create" "$(grep -c "$B" <(grep '^create' "$LOG") || true)" 0
w $R:php82 "$MULTI"
chk "wrong arm64 over multi-arch tag, guard -> 1 (falls into guard)" "$(FAIL_ARM=1 run "${base[@]}" --arm64 "$B" --arm64-outcome success "${vb[@]}" --guard-existing-arm64)" 1
chk " nothing published" "$(creates)" 0
chk "arm64 failed: arm64 not verified at all" "$(run "${base[@]}" --arm64-outcome failure "${vb[@]}" >/dev/null; grep -c 'linux/arm64' "$LOG" || true)" 0
[ "$fail" -eq 0 ] && echo "ALL PASS" || { echo FAILURES; exit 1; }
+1 -1
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:
print(json.dumps(resolve(ref)[1])) sys.stdout.write(json.dumps(resolve(ref)[1], sort_keys=True))
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:
+59 -8
View File
@@ -68,7 +68,9 @@ class Wiring(unittest.TestCase):
at = int(re.search(r'timeout-minutes: (\d+)', step(job, 'Build arm64')).group(1)) at = int(re.search(r'timeout-minutes: (\d+)', step(job, 'Build arm64')).group(1))
self.assertGreaterEqual(at, 20, j) # T3: arm64 under qemu took 7m47s self.assertGreaterEqual(at, 20, j) # T3: arm64 under qemu took 7m47s
self.assertGreater(jt, at + 20, j) # room for setup + amd64 + assemble self.assertGreater(jt, at + 20, j) # room for setup + amd64 + assemble
self.assertLessEqual(jt, 120, j) self.assertLessEqual(jt, 150, j)
# the retry must fit: 2 arm64 attempts + 90 s pause + amd64 + verify/assemble margin
self.assertGreater(jt, 2 * at + 2 + {'Build-and-Push': 20, 'Build-FPM-Images': 20, 'Build-Shared-httpd': 10}[j] + 15, j)
def test_step_order_and_ids(self): def test_step_order_and_ids(self):
for j in SLICE: for j in SLICE:
@@ -124,12 +126,57 @@ class Wiring(unittest.TestCase):
for j, (repo, _, _) in SLICE.items(): for j, (repo, _, _) in SLICE.items():
st = step(self.jobs[j], 'Assemble') st = step(self.jobs[j], 'Assemble')
self.assertIn('${{ steps.amd64.outputs.digest }}', st, j) self.assertIn('${{ steps.amd64.outputs.digest }}', st, j)
self.assertIn('${{ steps.arm64.outputs.digest }}', st, j) self.assertIn("${{ steps.arm64.outcome == 'success' && steps.arm64.outputs.digest || steps.arm64_retry.outputs.digest }}", st, j)
self.assertIn('${{ steps.arm64.outcome }}', st, j) self.assertIn("steps.arm64.outcome == 'success' || steps.arm64_retry.outcome == 'success'", st, j)
self.assertIn('scripts/assemble-multiarch-index.sh', st, j) self.assertIn('scripts/assemble-multiarch-index.sh', st, j)
self.assertIn('--repo %s/%s' % (REG, repo), st, j) self.assertIn('--repo %s/%s' % (REG, repo), st, j)
self.assertEqual(st.count('--repo '), 1, j) self.assertEqual(st.count('--repo '), 1, j)
def test_one_retry_of_a_failed_arm64_leg(self):
for j in SLICE:
job = self.jobs[j]
names = [n for n, _ in steps(job)]
i = [k for k, n in enumerate(names) if n.startswith('Build arm64')][0]
self.assertTrue(names[i + 1].startswith('Wait before arm64 retry'), j)
self.assertTrue(names[i + 2].startswith('Retry arm64'), j)
self.assertLess(i + 2, [k for k, n in enumerate(names) if n.startswith('Assemble')][0], j)
first, retry = step(job, 'Build arm64'), step(job, 'Retry arm64')
self.assertIn("if: steps.arm64.outcome == 'failure'", step(job, 'Wait before'), j)
self.assertIn("if: steps.arm64.outcome == 'failure'", retry, j)
self.assertIn('id: arm64_retry', retry, j)
self.assertIn('continue-on-error: true', retry, j)
self.assertEqual(len(re.findall(r'Retry arm64', job)), 1, j) # exactly one retry
for key in ('timeout-minutes', 'platforms', 'file', 'outputs'):
a = re.search(r'(?m)^\s+%s: .*$' % key, first)
b = re.search(r'(?m)^\s+%s: .*$' % key, retry)
self.assertEqual(a and a.group(0), b and b.group(0), (j, key))
ba = lambda x: re.search(r'build-args: \|\n((?: .*\n)+)', x).group(1)
self.assertEqual(ba(first), ba(retry), j)
def test_matrix_families_cap_parallel_qemu_legs(self):
for j, (_, _, matrix) in SLICE.items():
if matrix:
self.assertRegex(self.jobs[j], r'(?m)^ max-parallel: [12]$', j)
def test_assemble_guard_verify_and_override_wiring(self):
want = {'Build-and-Push': ['/usr/sbin/httpd', '/usr/bin/php'],
'Build-FPM-Images': ['/usr/sbin/php-fpm', '/usr/bin/php'],
'Build-Shared-httpd': ['/usr/sbin/httpd']}
for j, bins in want.items():
st = step(self.jobs[j], 'Assemble')
self.assertIn('--guard-existing-arm64', st, j)
self.assertEqual(re.findall(r'--verify-bin (\S+)', st), bins, j)
self.assertIn('ALLOW_AMD64_ONLY: ${{ github.event.inputs.allow_amd64_only }}', st, j)
run = re.search(r'run: \|\n((?: .*\n?)+)', st).group(1)
self.assertNotIn('${{', run, j)
def test_allow_amd64_only_input_is_a_string_default_false(self):
head = TEXT.split('jobs:')[0]
m = re.search(r'(?m)^ allow_amd64_only:\n((?: .*\n)+)', head)
self.assertIsNotNone(m)
self.assertIn("default: 'false'", m.group(1))
self.assertIn('type: string', m.group(1))
def test_tag_scheme_unchanged(self): def test_tag_scheme_unchanged(self):
"""Run the assemble step's shell with a recording stub: exact tags per version.""" """Run the assemble step's shell with a recording stub: exact tags per version."""
for j, (repo, _, matrix) in SLICE.items(): for j, (repo, _, matrix) in SLICE.items():
@@ -350,14 +397,15 @@ 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_images_cac_and_cac_fpm_and_php82_to_86(self): def test_only_the_five_known_images_and_php_ranges(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.assertEqual(re.findall(r'(?m)^ ([a-z-]+)\)', v), ['cac', 'cac-fpm']) self.assertRegex(v, r'cac-lsphp\|cac-litespeed\)')
self.assertNotIn('litespeed', v) self.assertRegex(v, r'shared-ols\)')
self.assertNotIn('lsphp', v) self.assertIn("^8[2-5]$", v) # OLS family: 82-85 only
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)
@@ -371,8 +419,11 @@ 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', 'docker buildx build'): for bad in ('imagetools create', 'docker push', 'docker tag', '/cac:latest', '/cac-fpm:latest', 'ghcr.io'):
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'))
+4 -2
View File
@@ -29,7 +29,7 @@ echo "$*" >>"$LOG"
case "$1" in case "$1" in
pull) exit "${PULL_RC:-0}" ;; pull) exit "${PULL_RC:-0}" ;;
create) [ "${CREATE_RC:-0}" = 0 ] || { echo "no such image" >&2; exit 1; }; echo cid1 ;; create) [ "${CREATE_RC:-0}" = 0 ] || { echo "no such image" >&2; exit 1; }; echo cid1 ;;
rm) ;; rm|image) ;;
cp) python3 -I "$MKTAR" "${3#*:}" ;; cp) python3 -I "$MKTAR" "${3#*:}" ;;
esac esac
STUB STUB
@@ -55,8 +55,10 @@ printf '%s\n' /bin/a=notelf /bin/b=elf32 /bin/c=be /bin/d=dir /bin/e=missing >"$
for b in a b c d e; do chk "bad binary /bin/$b -> 1" "$(run --image r/x@sha256:1 --platform linux/arm64 --bin /bin/$b)" 1; done for b in a b c d e; do chk "bad binary /bin/$b -> 1" "$(run --image r/x@sha256:1 --platform linux/arm64 --bin /bin/$b)" 1; done
chk "binary absent from the fixture -> 1" "$(run --image r/x@sha256:1 --platform linux/arm64 --bin /usr/bin/nothere)" 1 chk "binary absent from the fixture -> 1" "$(run --image r/x@sha256:1 --platform linux/arm64 --bin /usr/bin/nothere)" 1
printf '%s\n' /usr/bin/php=b7 >"$T/fix" printf '%s\n' /usr/bin/php=b7 >"$T/fix"
chk "docker pull fails -> 1" "$(PULL_RC=1 run --image r/x@sha256:1 --platform linux/arm64 --bin /usr/bin/php)" 1 chk "docker pull fails (3 attempts) -> 4, not an arch verdict" "$(VERIFY_PULL_SLEEP=0 PULL_RC=1 run --image r/x@sha256:1 --platform linux/arm64 --bin /usr/bin/php)" 4
chk " pull was tried 3 times" "$(grep -c '^pull' "$LOG")" 3
chk "docker create fails -> 1" "$(CREATE_RC=1 run --image r/x@sha256:1 --platform linux/arm64 --bin /usr/bin/php)" 1 chk "docker create fails -> 1" "$(CREATE_RC=1 run --image r/x@sha256:1 --platform linux/arm64 --bin /usr/bin/php)" 1
chk "pulled image is removed afterwards" "$(run --image r/x@sha256:1 --platform linux/arm64 --bin /usr/bin/php >/dev/null; grep -c '^image rm r/x@sha256:1$' "$LOG")" 1
chk "--no-pull skips the pull" "$(run --image r/x@sha256:1 --platform linux/arm64 --no-pull --bin /usr/bin/php; grep -c '^pull' "$LOG" || true)" "0 chk "--no-pull skips the pull" "$(run --image r/x@sha256:1 --platform linux/arm64 --no-pull --bin /usr/bin/php; grep -c '^pull' "$LOG" || true)" "0
0" 0"
chk "usage: no --bin -> 2" "$(run --image r/x --platform linux/arm64)" 2 chk "usage: no --bin -> 2" "$(run --image r/x --platform linux/arm64)" 2
+25 -7
View File
@@ -12,7 +12,7 @@ no QEMU execution is needed.
Exit 0 = every --bin is an ELF64 little-endian binary of the platform's machine type. Exit 0 = every --bin is an ELF64 little-endian binary of the platform's machine type.
Exit 1 = a binary is missing, not an ELF, or of the wrong architecture (or docker failed). Exit 1 = a binary is missing, not an ELF, or of the wrong architecture (or docker failed).
Exit 2 = usage. Exit 2 = usage. Exit 4 = could not pull the image (3 attempts): no architecture verdict.
Env: DOCKER overrides the docker command (tests use a stub). Nothing in REF is ever run. Env: DOCKER overrides the docker command (tests use a stub). Nothing in REF is ever run.
""" """
import argparse import argparse
@@ -21,6 +21,8 @@ import shlex
import subprocess import subprocess
import sys import sys
import tarfile import tarfile
import threading
import time
MACHINES = {'linux/arm64': (0xB7, 'AArch64'), 'linux/amd64': (0x3E, 'x86-64')} MACHINES = {'linux/arm64': (0xB7, 'AArch64'), 'linux/amd64': (0x3E, 'x86-64')}
NAMES = {0x3E: 'x86-64', 0xB7: 'AArch64', 0x03: 'x86', 0x28: 'ARM', 0xF3: 'RISC-V', 0x15: 'PowerPC64', 0x16: 'S390'} NAMES = {0x3E: 'x86-64', 0xB7: 'AArch64', 0x03: 'x86', 0x28: 'ARM', 0xF3: 'RISC-V', 0x15: 'PowerPC64', 0x16: 'S390'}
@@ -42,14 +44,19 @@ def docker_cmd():
return shlex.split(os.environ.get('DOCKER') or 'docker') return shlex.split(os.environ.get('DOCKER') or 'docker')
def run(args, **kw): def run(args, timeout=300):
return subprocess.run(docker_cmd() + args, capture_output=True, **kw) try:
return subprocess.run(docker_cmd() + args, capture_output=True, timeout=timeout)
except subprocess.TimeoutExpired:
return subprocess.CompletedProcess(args, 124, b'', b'timed out after %ds' % timeout)
def first_bytes_of(cid, path): def first_bytes_of(cid, path):
"""First 64 bytes of the regular file at path (symlinks followed) inside container cid.""" """First 64 bytes of the regular file at path (symlinks followed) inside container cid."""
p = subprocess.Popen(docker_cmd() + ['cp', '-L', '%s:%s' % (cid, path), '-'], p = subprocess.Popen(docker_cmd() + ['cp', '-L', '%s:%s' % (cid, path), '-'],
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
timer = threading.Timer(120, p.kill) # a stalled docker cp must not hang the job
timer.start()
try: try:
tf = tarfile.open(fileobj=p.stdout, mode='r|') tf = tarfile.open(fileobj=p.stdout, mode='r|')
m = tf.next() m = tf.next()
@@ -60,6 +67,7 @@ def first_bytes_of(cid, path):
err = p.stderr.read(300).decode('utf-8', 'replace').strip() err = p.stderr.read(300).decode('utf-8', 'replace').strip()
raise ValueError('cannot read %s: %s %s' % (path, e, err)) raise ValueError('cannot read %s: %s %s' % (path, e, err))
finally: finally:
timer.cancel()
p.kill() p.kill()
p.wait() p.wait()
@@ -73,11 +81,19 @@ def main(argv):
a = ap.parse_args(argv) a = ap.parse_args(argv)
want, label = MACHINES[a.platform] want, label = MACHINES[a.platform]
pulled = False
if not a.no_pull: if not a.no_pull:
r = run(['pull', '--quiet', '--platform', a.platform, a.image]) r = None
for attempt in range(3):
r = run(['pull', '--quiet', '--platform', a.platform, a.image], timeout=900)
if r.returncode == 0:
break
time.sleep(float(os.environ.get('VERIFY_PULL_SLEEP', '15')))
if r.returncode != 0: if r.returncode != 0:
print('verify-image-arch: docker pull failed: %s' % r.stderr.decode('utf-8', 'replace')[:300].strip(), file=sys.stderr) print('verify-image-arch: could not pull %s after 3 attempts (not an architecture finding): %s' % (
return 1 a.image, r.stderr.decode('utf-8', 'replace')[:300].strip()), file=sys.stderr)
return 4
pulled = True
r = run(['create', '--platform', a.platform, '--entrypoint', '/nonexistent', a.image]) r = run(['create', '--platform', a.platform, '--entrypoint', '/nonexistent', a.image])
cid = r.stdout.decode().strip() cid = r.stdout.decode().strip()
if r.returncode != 0 or not cid: if r.returncode != 0 or not cid:
@@ -99,7 +115,9 @@ def main(argv):
else: else:
print('OK %s %s %s: e_machine=0x%X (%s)' % (a.image, a.platform, path, m, label)) print('OK %s %s %s: e_machine=0x%X (%s)' % (a.image, a.platform, path, m, label))
finally: finally:
run(['rm', '-f', cid]) run(['rm', '-f', cid], timeout=120)
if pulled:
run(['image', 'rm', a.image], timeout=120) # keep the runner disk from filling
return rc return rc