From 1ae252a1b671fceb300f69c2780f5ceace48e5ce Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Wed, 30 Oct 2024 03:52:16 +0000 Subject: [PATCH] Updating github-config --- scripts/.util/tools.json | 2 +- scripts/create.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/.util/tools.json b/scripts/.util/tools.json index 4ceb0e0..63e93a2 100644 --- a/scripts/.util/tools.json +++ b/scripts/.util/tools.json @@ -2,5 +2,5 @@ "crane": "v0.20.2", "jam": "v2.10.0", "pack": "v0.35.1", - "syft": "v1.14.2" + "syft": "v1.15.0" } diff --git a/scripts/create.sh b/scripts/create.sh index 050ad3f..b15a8a8 100755 --- a/scripts/create.sh +++ b/scripts/create.sh @@ -6,7 +6,7 @@ set -o pipefail readonly PROG_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" readonly ROOT_DIR="$(cd "${PROG_DIR}/.." && pwd)" readonly BIN_DIR="${ROOT_DIR}/.bin" -readonly IMAGES_JSON="${ROOT_DIR}/images.json" +readonly IMAGES_JSON="${ROOT_DIR}/stacks/images.json" # shellcheck source=SCRIPTDIR/.util/tools.sh source "${PROG_DIR}/.util/tools.sh" @@ -66,7 +66,8 @@ function main() { if [ -f "${IMAGES_JSON}" ]; then # we need to copy images.json for inclusion in the build image - cp $IMAGES_JSON "${ROOT_DIR}/stack" + defaultStackPath=$(jq -r '.images[] | select(.name == "default") | .config_dir' "${IMAGES_JSON}") + cp $IMAGES_JSON $ROOT_DIR/$defaultStackPath/images.json fi # if stack or build argument is provided but not both, then throw an error