Skip to content

Commit

Permalink
Revert "Dont use arch in container image tag:" (#219)
Browse files Browse the repository at this point in the history
#### 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
  • Loading branch information
mergify[bot] authored May 15, 2024
2 parents fc29f2d + 76ec052 commit ec7b28f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion bash/hook-lk-containers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function build_hook_linuxkit_container() {
container_files_hash="$(find "${container_dir}" -type f -print | LC_ALL=C sort | xargs sha256sum | sha256sum | cut -d' ' -f1)"
declare container_files_hash_short="${container_files_hash:0:8}"

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

0 comments on commit ec7b28f

Please sign in to comment.