more comments

Author: anthony-nhs

.github/workflows/build_multi_arch_image.yml

@@ -65,7 +65,9 @@ jobs:
           fetch-depth: 0
       - name: setup trivy
         run: |
-           docker build  --output=/usr/local/bin/ -f "src/base/.devcontainer/Dockerfile.trivy.${ARCH}" .
+          mkdir -p "$RUNNER_TEMP/bin"
+          docker build  --output="$RUNNER_TEMP/bin" -f "src/base/.devcontainer/Dockerfile.trivy.${ARCH}" .
+          echo "$RUNNER_TEMP/bin" >> "$GITHUB_PATH"
         env:
           ARCH: '${{ matrix.arch }}'
       - name: setup node

src/base/.devcontainer/Dockerfile

@@ -1,7 +1,7 @@
 FROM alpine:3.23.3 AS build
 ARG TARGETARCH
 RUN apk add --no-cache cosign bash curl jq
-COPY scripts/install_trivy.sh /tmp/install_trivy.sh
+COPY --chmod=755 scripts/install_trivy.sh /tmp/install_trivy.sh
 RUN case "${TARGETARCH}" in \
         x86_64|amd64) TRIVY_ARCH=64bit ;; \
         aarch64|arm64) TRIVY_ARCH=ARM64 ;; \

src/base/.devcontainer/Dockerfile.trivy.amd64

@@ -1,7 +1,6 @@
 FROM alpine:3.23.3 AS build
-ARG TARGETARCH
 RUN apk add --no-cache cosign bash curl jq
-COPY src/base/.devcontainer/scripts/install_trivy.sh /tmp/install_trivy.sh
+COPY --chmod=755 src/base/.devcontainer/scripts/install_trivy.sh /tmp/install_trivy.sh
 RUN INSTALL_DIR=/tmp/trivy/ ARCH=64bit /tmp/install_trivy.sh
 
 FROM scratch

src/base/.devcontainer/Dockerfile.trivy.arm64

@@ -1,7 +1,6 @@
 FROM alpine:3.23.3 AS build
-ARG TARGETARCH
 RUN apk add --no-cache cosign bash curl jq
-COPY src/base/.devcontainer/scripts/install_trivy.sh /tmp/install_trivy.sh
+COPY --chmod=755 src/base/.devcontainer/scripts/install_trivy.sh /tmp/install_trivy.sh
 RUN INSTALL_DIR=/tmp/trivy/ ARCH=ARM64 /tmp/install_trivy.sh
 
 FROM scratch

src/base/.devcontainer/scripts/install_trivy.sh

@@ -3,7 +3,7 @@ set -euo pipefail
 
 DEFAULT_INSTALL_DIR="/usr/local/bin"
 INSTALL_DIR="${INSTALL_DIR:-$DEFAULT_INSTALL_DIR}"
-VERSION="v0.69.3"
+VERSION="${VERSION:-v0.69.3}"
 DEFAULT_ARCH="64bit"
 ARCH="${ARCH:-$DEFAULT_ARCH}"
 RELEASE_NUMBER="${VERSION#v}"