Skip to content

Commit

Permalink
rework image naming in ci (#210)
Browse files Browse the repository at this point in the history
## Description

<!--- Please describe what this PR is going to change -->
rework image naming.

## Why is this needed

<!--- Link to issue you have raised -->

Fixes: #

## How Has This Been Tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->


## How are existing users impacted? What migration steps/scripts do we
need?

<!--- Fixes a bug, unblocks installation, removes a component of the
stack etc -->
<!--- Requires a DB migration script, etc. -->


## Checklist:

I have:

- [ ] updated the documentation and/or roadmap (if required)
- [ ] added unit or e2e tests
- [ ] provided instructions on how to upgrade
  • Loading branch information
jacobweinstock authored May 1, 2024
2 parents 3dd5735 + 79c151a commit acac456
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bash/hook-lk-containers.sh
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
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

0 comments on commit acac456

Please sign in to comment.