diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 73d9f06..9582da4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -109,8 +109,7 @@ jobs: trivy image \ --input "build/${IMAGE_NAME}.tar" \ --severity HIGH,CRITICAL \ - --exit-code 1 \ - "${IMAGE_NAME}:${IMAGE_VERSION}" + --exit-code 1 - name: Login to GHCR env: diff --git a/scripts/install_tools.sh b/scripts/install_tools.sh index 342355f..177eaab 100755 --- a/scripts/install_tools.sh +++ b/scripts/install_tools.sh @@ -9,11 +9,11 @@ set -eo pipefail DIVE_VERSION=$(curl -sL "https://api.github.com/repos/wagoodman/dive/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/') log_info "Installing dive v${DIVE_VERSION}" curl -OL https://github.com/wagoodman/dive/releases/download/v${DIVE_VERSION}/dive_${DIVE_VERSION}_linux_amd64.deb -sudo apt install ./dive_${DIVE_VERSION}_linux_amd64.deb +sudo apt install -y ./dive_${DIVE_VERSION}_linux_amd64.deb rm dive_${DIVE_VERSION}_linux_amd64.deb # Install trivy -sudo apt-get install wget gnupg +sudo apt-get install -y wget gnupg wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | gpg --dearmor | sudo tee /usr/share/keyrings/trivy.gpg > /dev/null TRIVY_REPO_LINE="deb [signed-by=/usr/share/keyrings/trivy.gpg] https://aquasecurity.github.io/trivy-repo/deb generic main" TRIVY_LIST_FILE="/etc/apt/sources.list.d/trivy.list"