Skip to content

rework image naming in ci #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 1, 2024
Merged

rework image naming in ci #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69a4c87
Dont use arch in container image tag:
jacobweinstock May 1, 2024
79c151a
Update naming for arbian kernel images:
jacobweinstock May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bash/hook-lk-containers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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}-${DOCKER_ARCH}"
declare container_oci_ref="${HOOK_LK_CONTAINERS_OCI_BASE}${container_dir}:${container_files_hash_short}"
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
3 changes: 2 additions & 1 deletion bash/kernel/kernel_armbian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ function calculate_kernel_version_armbian() {
input_hash="$(cat "${ARMBIAN_KERNEL_DOCKERFILE}" | sha256sum - | cut -d ' ' -f 1)"
short_input_hash="${input_hash:0:8}"
kernel_oci_version="${ARMBIAN_KERNEL_MAJOR_MINOR_POINT}-${short_input_hash}"
kernel_oci_image="${HOOK_KERNEL_OCI_BASE}hook-${inventory_id}:${kernel_oci_version}"
armbian_type="$( echo "${inventory_id}" | cut -d "-" -f 2 )"
kernel_oci_image="${HOOK_KERNEL_OCI_BASE}-armbian:${kernel_oci_version}"-"${armbian_type}"
log info "kernel_oci_version: ${kernel_oci_version}"
log info "kernel_oci_image: ${kernel_oci_image}"
}
Expand Down