Compare commits

...
4 changed files with 20 additions and 8 deletions

No files matched your search

+7 -3
View File
@@ -134,8 +134,6 @@ jobs:
run: | run: |
set -euo pipefail set -euo pipefail
docker buildx version docker buildx version
rc=0; out=$(docker buildx imagetools inspect "$REPO:$TAG" --format '{{.Manifest.Digest}}' 2>&1) || rc=$?
echo "diag: inspect rc=$rc out=$(printf '%s' "$out" | head -c 400)"
f=(); [ "$FORCE" = true ] && f=(--force) f=(); [ "$FORCE" = true ] && f=(--force)
scripts/attach-arm64-index.sh --repo "$REPO" --tag "$TAG" --plan-only "${f[@]}" scripts/attach-arm64-index.sh --repo "$REPO" --tag "$TAG" --plan-only "${f[@]}"
@@ -203,7 +201,13 @@ 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; }
+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>>"${ATTACH_STDERR:-/dev/stderr}" | 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() {
+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:
+5 -2
View File
@@ -417,8 +417,11 @@ class AttachWorkflow(unittest.TestCase):
self.assertNotIn('linux/amd64', st) self.assertNotIn('linux/amd64', st)
self.assertNotIn('Build amd64', self.job) self.assertNotIn('Build amd64', self.job)
def test_nothing_but_the_script_writes_a_tag(self): for bad in ('imagetools create', 'docker push', 'docker tag', '/cac:latest', '/cac-fpm:latest', 'ghcr.io'):
for bad in ('imagetools create', 'docker push', 'docker tag', '/cac:latest', '/cac-fpm:latest', 'ghcr.io', 'docker buildx build'): self.assertNotIn(bad, self.job, bad)
self.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.assertNotIn(bad, self.job, bad) self.assertNotIn(bad, self.job, bad)
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'))