Update caching and fix typo

Author: lzap

build-and-push.sh

@@ -13,9 +13,10 @@ set -xeuo pipefail
 #   DRY_RUN - when set, skip all push operations (e.g. set for PR builds)
 
 IMAGE="${TO_IMAGE}:${TO_TAG}-${ARCH}"
-export TO_REGISTRY=${TO_IMAGE%%/*}
+TO_REGISTRY=$(echo "$TO_IMAGE" | cut -d/ -f1)
+export TO_REGISTRY
 
-./login.sh
+. ./login.sh
 
 if [ -n "${USE_CACHE:-}" ]; then
   CACHE_IMAGE_FULL="${CACHE_IMAGE}:${TO_TAG}-${ARCH}"
@@ -46,5 +47,5 @@ fi
 if [ -z "${DRY_RUN:-}" ] && [ -n "${USE_CACHE:-}" ]; then
   buildah push "$IMAGE" "$CACHE_IMAGE_FULL"
 elif [ -n "${DRY_RUN:-}" ] && [ -n "${USE_CACHE:-}" ]; then
-  echo "Push skipped: DRY_RUN is set or REPO_USERNAME or REPO_PASSWORD missing"
+  echo "Push to cache skipped: DRY_RUN is set or REPO_USERNAME or REPO_PASSWORD missing"
 fi

generate-manifests.sh

@@ -11,9 +11,10 @@ set -xeuo pipefail
 #   CACHE_IMAGE, CACHE_USERNAME, CACHE_PASSWORD - sidecar cache registry (optional)
 #   DRY_RUN - when set, skip all push operations (e.g. set for PR builds)
 
-export TO_REGISTRY=${IMAGE%%/*}
+TO_REGISTRY=$(echo "$IMAGE" | cut -d/ -f1)
+export TO_REGISTRY
 
-./login.sh
+. ./login.sh
 
 echo "Creating manifest for $IMAGE:$TAG"
 buildah manifest rm "$IMAGE:$TAG" 2>/dev/null || true

login.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -xeuo pipefail
 
-if [ -n "${REPO_USERNAME:-}" ] && [ -n "${REPO_PASSWORD:-}" ]; the
+if [ -n "${REPO_USERNAME:-}" ] && [ -n "${REPO_PASSWORD:-}" ]; then
   echo "Logging in to $TO_REGISTRY"
   echo "$REPO_PASSWORD" | buildah login -u "$REPO_USERNAME" --password-stdin "$TO_REGISTRY"
 elif [ -n "${AWS_REGION:-}" ] && [ -n "${AWS_ACCESS_KEY_ID:-}" ] && [ -n "${AWS_SECRET_ACCESS_KEY:-}" ]; then
@@ -13,7 +13,7 @@ fi
 USE_CACHE=
 if [ -n "${CACHE_IMAGE:-}" ] && [ -n "${CACHE_USERNAME:-}" ] && [ -n "${CACHE_PASSWORD:-}" ]; then
   USE_CACHE=1
-  CACHE_REGISTRY=${CACHE_IMAGE%%/*}
+  CACHE_REGISTRY=$(echo "$CACHE_IMAGE" | cut -d/ -f1)
   echo "Logging in to $CACHE_REGISTRY (cache will be used)"
   echo "$CACHE_PASSWORD" | buildah login -u "$CACHE_USERNAME" --password-stdin "$CACHE_REGISTRY"
 fi