Skip to content

Commit ec7b28f

Browse files
authored
Revert "Dont use arch in container image tag:" (#219)
#### Revert "Dont use arch in container image tag:" - This reverts commit 69a4c87: > "The service containers we build shouldnt use arch in the tags. This way the same tag will have mulitple archs at the registry layer." - this isn't really true, as can be seen from the --platform argument to buildx; also the GHA matrix'es are split per-arch - effectively, we had random arch (but not both) in each tag, depending on build speed/order in GHA - causes `Error creating 000-rngd1: fork/exec /usr/bin/runc: exec format error` (and many others) depending on luck or lack thereof
2 parents fc29f2d + 76ec052 commit ec7b28f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

bash/hook-lk-containers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function build_hook_linuxkit_container() {
2222
container_files_hash="$(find "${container_dir}" -type f -print | LC_ALL=C sort | xargs sha256sum | sha256sum | cut -d' ' -f1)"
2323
declare container_files_hash_short="${container_files_hash:0:8}"
2424

25-
declare container_oci_ref="${HOOK_LK_CONTAINERS_OCI_BASE}${container_dir}:${container_files_hash_short}"
25+
declare container_oci_ref="${HOOK_LK_CONTAINERS_OCI_BASE}${container_dir}:${container_files_hash_short}-${DOCKER_ARCH}"
2626
log info "Consider building LK container ${container_oci_ref} from ${container_dir} for platform ${DOCKER_ARCH}"
2727
output_var="${container_oci_ref}" # the the name reference
2828
echo "${output_var}" > /dev/null # no-op; just to avoid shellcheck SC2034 (unused var; but it is actually a bash nameref)

0 commit comments

Comments
 (0)