Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e86a99eb1 | ||
|
|
b0c8ec9683 | ||
|
|
02f3548bd3 | ||
|
|
6c57250ec3 | ||
|
|
0cff3b373e | ||
|
|
737d5c58d7 | ||
|
|
af8e8a37e5 | ||
|
|
6bf0b3d0d7 | ||
|
|
c7a2d9f275 | ||
|
|
2ad7249d9f | ||
|
|
344c5e8d0d | ||
|
|
e1ea28e6a8 | ||
|
|
655c88f10b | ||
|
|
42f72e24ff |
No files matched your search
@@ -3,7 +3,7 @@ run-name: attach arm64 to ${{ github.event.inputs.image }}:php${{ github.event.i
|
|||||||
# 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 or cac-fpm
|
||||||
# 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; 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
|
||||||
# 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
|
||||||
@@ -33,6 +33,8 @@ 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:
|
||||||
@@ -73,20 +75,6 @@ jobs:
|
|||||||
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:
|
||||||
@@ -134,6 +122,21 @@ jobs:
|
|||||||
if: steps.pkgcache.outputs.mirror == ''
|
if: steps.pkgcache.outputs.mirror == ''
|
||||||
uses: docker/setup-buildx-action@v3
|
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
|
||||||
env:
|
env:
|
||||||
@@ -179,12 +182,14 @@ 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:$TAG" --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 PHP version skew between them.
|
||||||
- name: PHP version parity (amd64 native, arm64 under QEMU)
|
- name: PHP version parity (amd64 native, arm64 under QEMU)
|
||||||
@@ -192,10 +197,17 @@ jobs:
|
|||||||
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:$TAG" -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; }
|
||||||
@@ -211,7 +223,10 @@ 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"
|
||||||
@@ -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
|
||||||
@@ -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.
|
||||||
@@ -157,11 +164,17 @@ 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:
|
||||||
@@ -301,13 +314,35 @@ jobs:
|
|||||||
EXPECT_PHP_MIN=${{ steps.phpmin.outputs.min }}
|
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
|
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@v6
|
||||||
|
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
|
||||||
|
|
||||||
# Creates the index tag(s) from THIS run's digests only (a previous run's
|
# Creates the index tag(s) from THIS run's digests only (a previous run's
|
||||||
# arm64 is never re-attached). scripts/assemble-multiarch-index.sh.
|
# arm64 is never re-attached). scripts/assemble-multiarch-index.sh.
|
||||||
- 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,11 +360,17 @@ 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:
|
||||||
@@ -470,13 +512,36 @@ jobs:
|
|||||||
EXPECT_PHP_MIN=${{ steps.phpmin.outputs.min }}
|
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
|
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@v6
|
||||||
|
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
|
||||||
|
|
||||||
# Creates the index tag(s) from THIS run's digests only (a previous run's
|
# Creates the index tag(s) from THIS run's digests only (a previous run's
|
||||||
# arm64 is never re-attached). scripts/assemble-multiarch-index.sh.
|
# arm64 is never re-attached). scripts/assemble-multiarch-index.sh.
|
||||||
- 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[@]}"
|
||||||
|
|
||||||
@@ -807,7 +873,7 @@ 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@v4
|
||||||
@@ -912,18 +978,39 @@ jobs:
|
|||||||
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
|
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
|
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@v6
|
||||||
|
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
|
||||||
|
|
||||||
# Creates the index tag(s) from THIS run's digests only (a previous run's
|
# Creates the index tag(s) from THIS run's digests only (a previous run's
|
||||||
# arm64 is never re-attached). scripts/assemble-multiarch-index.sh.
|
# arm64 is never re-attached). scripts/assemble-multiarch-index.sh.
|
||||||
- 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
|
||||||
|
|
||||||
|
|||||||
@@ -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.
|
||||||
@@ -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,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] [--builder <buildx builder>]
|
# [--expect-index sha256:<digest>] [--force] [--follow-tag <tag>] [--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,8 +20,14 @@
|
|||||||
# 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 the previous index is re-created
|
# one before and an arm64 entry MUST be present. Otherwise exit 1. The previous index is
|
||||||
# (best effort) and the script exits 1.
|
# re-created ONLY if our create lost the amd64 entry; a tag that now has a different amd64 (a
|
||||||
|
# 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).
|
||||||
#
|
#
|
||||||
@@ -31,7 +37,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=""
|
repo=""; tag=""; arm64=""; expect=""; force=0; plan_only=0; builder=""; follow=""
|
||||||
|
|
||||||
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: $*"; }
|
||||||
@@ -44,6 +50,7 @@ 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
|
||||||
@@ -55,15 +62,25 @@ 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; 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() {
|
||||||
@@ -143,7 +160,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"
|
it create -t "$ref" "$src_old" "$repo@$arm64" || { echo "::error::attach-arm64-index: create failed; tag state unverified (was $before_index)" >&2; exit 1; }
|
||||||
|
|
||||||
read_tag "$ref"
|
read_tag "$ref"
|
||||||
after_index=$g_digest
|
after_index=$g_digest
|
||||||
@@ -152,11 +169,34 @@ 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); restoring $before_index" >&2
|
echo "::error::attach-arm64-index: $ref after create: kind=$g_kind amd64='$g_amd64' arm64='$g_arm64' (want amd64 $amd64 unchanged + one arm64)" >&2
|
||||||
if [ "$kind" = index ]; then
|
# Restore ONLY when our create demonstrably lost the amd64 entry. If the tag now carries a
|
||||||
|
# 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
|
||||||
Executable
+79
@@ -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; }
|
||||||
@@ -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:
|
||||||
@@ -95,6 +95,7 @@ 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]]
|
||||||
@@ -109,6 +110,7 @@ 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
|
||||||
@@ -117,11 +119,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")" 3
|
chk "tag already has arm64 -> rc 3" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$before")" 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)" 0
|
chk "--force on multi-arch -> rc 0" "$(run --repo $R --tag php82 --arm64 "$B" --force --expect-index "$(tagdig)")" 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
|
||||||
|
|
||||||
@@ -137,9 +139,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")" 1
|
chk "arm64 digest that is not arm64 -> rc 1" "$(run --repo $R --tag php82 --arm64 "$C" --expect-index "$EXP")" 1
|
||||||
chk "arm64 digest == amd64 digest -> rc 1" "$(run --repo $R --tag php82 --arm64 "$A")" 1
|
chk "arm64 digest == amd64 digest -> rc 1" "$(run --repo $R --tag php82 --arm64 "$A" --expect-index "$EXP")" 1
|
||||||
chk "arm64 digest unknown to registry -> rc 1" "$(run --repo $R --tag php82 --arm64 "$(d 7)")" 1
|
chk "arm64 digest unknown to registry -> rc 1" "$(run --repo $R --tag php82 --arm64 "$(d 7)" --expect-index "$EXP")" 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
|
||||||
@@ -147,29 +149,82 @@ 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")" 1
|
chk "missing tag -> rc 1" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$EXP")" 1
|
||||||
mk noamd
|
mk noamd
|
||||||
chk "tag without amd64 -> rc 1" "$(run --repo $R --tag php82 --arm64 "$B")" 1
|
chk "tag without amd64 -> rc 1" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$EXP")" 1
|
||||||
mk twoamd
|
mk twoamd
|
||||||
chk "tag with two amd64 entries -> rc 1" "$(run --repo $R --tag php82 --arm64 "$B")" 1
|
chk "tag with two amd64 entries -> rc 1" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$EXP")" 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")" 0
|
chk "single amd64 manifest tag -> rc 0" "$(run --repo $R --tag php82 --arm64 "$B" --expect-index "$before")" 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"); chk "create dropped amd64 -> rc 1" "$rc" 1
|
rc=$(MANGLE=drop-amd64 run --repo $R --tag php82 --arm64 "$B" --expect-index "$before"); 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"); chk "create failing -> rc != 0" "$([ "$rc" != 0 ] && echo yes)" yes
|
rc=$(MANGLE=fail run --repo $R --tag php82 --arm64 "$B" --expect-index "$(tagdig)"); 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" >/dev/null 2>&1
|
mk amd64only; GITHUB_OUTPUT=$T/gho "$HERE/attach-arm64-index.sh" --repo $R --tag php82 --arm64 "$B" --expect-index "$(tagdig)" >/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; }
|
||||||
@@ -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():
|
||||||
@@ -371,8 +418,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'), 1) # only the local PHP-version 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'))
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user