Skip to content

Commit 22dfeda

Browse files
committed
update-template-alpine.sh: Remove the overriding parameter from *_cache_key_for_image_kernel functions
The cache should operate on the original location in template. Signed-off-by: Norio Nomura <[email protected]>
1 parent 77b6116 commit 22dfeda

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

hack/update-template-alpine.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ function alpine_latest_image_entry_for_url_spec() {
124124
}
125125
126126
function alpine_cache_key_for_image_kernel() {
127-
local location=$1 overriding=${3:-"{}"} url_spec
128-
url_spec=$(alpine_url_spec_from_location "${location}" | jq -r ". + ${overriding}")
127+
local location=$1 url_spec
128+
url_spec=$(alpine_url_spec_from_location "${location}")
129129
jq -r '["alpine", .path_version, .target_vendor, .arch, .file_extension] | join(":")' <<<"${url_spec}"
130130
}
131131
@@ -240,7 +240,7 @@ for template in "${templates[@]}"; do
240240
set +e # Disable 'set -e' to avoid exiting on error for the next assignment.
241241
cache_key=$(
242242
set -e # Enable 'set -e' for the next command.
243-
alpine_cache_key_for_image_kernel "${location}" "${kernel_location}" "${overriding}"
243+
alpine_cache_key_for_image_kernel "${location}" "${kernel_location}"
244244
) # Check exit status separately to prevent disabling 'set -e' by using the function call in the condition.
245245
# shellcheck disable=2181
246246
[[ $? -eq 0 ]] || continue

0 commit comments

Comments
 (0)