diff --git a/src/check b/src/check index f90cc88..b1a3b38 100755 --- a/src/check +++ b/src/check @@ -4,4 +4,4 @@ set -eu [ -e /opt/resource/common ] && cd /opt/resource . ./common -jq --null-input --arg version "$(crane digest "$REPOSITORY:$TAG")" '[{"digest": $version}]' | jq -r tostring +jq -r --null-input --arg version "$(crane digest "$REPOSITORY:$TAG")" '[{"digest": $version}] | tostring' diff --git a/src/common b/src/common index 9d848b1..4f128a4 100755 --- a/src/common +++ b/src/common @@ -32,7 +32,7 @@ split_repo_domain() { if [ -z "$domain_part" ]; then domain_part="$DEFAULT_DOMAIN" - other_part="$other_part" + # other_part="$other_part" elif echo "$domain_part" | grep -Evq '\.|:' && [ "$domain_part" != 'localhost' ]; then # ^ docker sourcecode checks if $domain_part == $domain_part.lower() in effect checking if all is lower case domain_part="$DEFAULT_DOMAIN" diff --git a/src/in b/src/in index 4e192f0..bdb8e5f 100755 --- a/src/in +++ b/src/in @@ -9,6 +9,6 @@ oci_dir="$(mktemp -d)" crane pull --format=oci "$REPOSITORY:@$(jq -r .version "$INPUT_FILE")" "$oci_dir" cd "$oci_dir" tar cf "$1/image.tar" ./* -cd - 1>&2 +cd - 1>&2 2>/dev/null -jq .version < "$INPUT_FILE" | jq -r tostring +jq -r '.version | tostring' < "$INPUT_FILE" diff --git a/src/out b/src/out index 223fa0d..937843c 100755 --- a/src/out +++ b/src/out @@ -9,6 +9,6 @@ IMAGE_REFS_FILE="$(mktemp -t)" oci_dir="$(mktemp -d)" cd "$oci_dir" tar xf "$1/$(jq -r .params.image < "$INPUT_FILE")" -cd - 1>&2 +cd - 1>&2 2>/dev/null crane push "$oci_dir" "$REPOSITORY:$TAG" --image-refs="$IMAGE_REFS_FILE" -jq --null-input --arg version "$(sed 's/^[^@]*@//' < "$IMAGE_REFS_FILE")" '{"digest": $version}' | jq -r tostring +jq -r --null-input --arg version "$(sed 's/^[^@]*@//' < "$IMAGE_REFS_FILE")" '{"digest": $version} | tostring'