Skip to content

Commit e7e6f99

Browse files
committed
Use supported Buildx image loading
1 parent 3c1877b commit e7e6f99

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

scripts/check-build-downloads

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,10 @@ require_pattern package/Dockerfile 'org\.opencontainers\.image\.revision="\$\{IM
177177
require_pattern scripts/package '--build-arg IMAGE_REVISION="\$\{IMAGE_REVISION\}"' "package_revision_build_arg_missing"
178178
require_pattern scripts/package '--build-arg SOURCE_DATE_EPOCH="\$\{SOURCE_DATE_EPOCH\}"' "package_source_date_epoch_missing"
179179
require_pattern scripts/package '--build-arg UBUNTU_SNAPSHOT="\$\{UBUNTU_SNAPSHOT\}"' "package_ubuntu_snapshot_missing"
180-
require_pattern scripts/package 'rewrite-timestamp=true,compatibility-version=20' "reproducible_image_export_missing"
180+
require_fixed scripts/package 'export SOURCE_DATE_EPOCH' "buildkit_source_date_epoch_missing"
181+
require_pattern scripts/package '^[[:space:]]+--load[[:space:]]+\\$' "buildx_docker_load_missing"
182+
require_pattern scripts/package '^[[:space:]]+--tag "\$\{IMAGE\}"[[:space:]]+\\$' "buildx_image_tag_missing"
183+
reject_pattern scripts/package 'type=docker,dest=' "unsupported_docker_driver_exporter"
181184

182185
require_pattern package/update-platform-ca 'PLATFORM_CA_ROOT:-/var/lib/pasturestack/etc/ssl/ca\.crt' "platform_ca_root_missing"
183186
require_pattern package/update-platform-ca 'legacy_ca_root="/var/lib/rancher/etc/ssl/ca\.crt"' "legacy_ca_fallback_missing"

scripts/package

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,21 @@ IMAGE_REVISION=${IMAGE_REVISION:-$(git rev-parse HEAD)}
1717
IMAGE_CREATED=${IMAGE_CREATED:-$(git show -s --format=%cI HEAD)}
1818
SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH:-$(git show -s --format=%ct HEAD)}
1919
UBUNTU_SNAPSHOT=${UBUNTU_SNAPSHOT:-20260722T164940Z}
20-
IMAGE_ARCHIVE=$(mktemp "${TMPDIR:-/tmp}/network-plugin-manager-image.XXXXXX.tar")
21-
trap 'rm -f "${IMAGE_ARCHIVE}"' EXIT
2220

2321
./scripts/build
2422

23+
export SOURCE_DATE_EPOCH
2524
docker buildx build \
2625
--provenance=false \
26+
--load \
27+
--tag "${IMAGE}" \
2728
--network "${DOCKER_BUILD_NETWORK:-host}" \
2829
--build-arg IMAGE_VERSION="${TAG}" \
2930
--build-arg IMAGE_REVISION="${IMAGE_REVISION}" \
3031
--build-arg IMAGE_CREATED="${IMAGE_CREATED}" \
3132
--build-arg SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" \
3233
--build-arg UBUNTU_SNAPSHOT="${UBUNTU_SNAPSHOT}" \
33-
--output "type=docker,dest=${IMAGE_ARCHIVE},name=${IMAGE},rewrite-timestamp=true,compatibility-version=20" \
3434
-f package/Dockerfile \
3535
.
36-
docker load --input "${IMAGE_ARCHIVE}" >/dev/null
3736
printf '%s\n' "${IMAGE}" > dist/images
3837
printf 'Built %s\n' "${IMAGE}"

0 commit comments

Comments
 (0)