Skip to content

Commit 248451a

Browse files
Merge pull request #2 from DeerHide/claude/fix-merge-job-failure-y9bcg
Add non-interactive flags to apt install commands and fix trivy scan
2 parents e202d92 + 33ca427 commit 248451a

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.github/workflows/release.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ jobs:
109109
trivy image \
110110
--input "build/${IMAGE_NAME}.tar" \
111111
--severity HIGH,CRITICAL \
112-
--exit-code 1 \
113-
"${IMAGE_NAME}:${IMAGE_VERSION}"
112+
--exit-code 1
114113
115114
- name: Login to GHCR
116115
env:

scripts/install_tools.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ set -eo pipefail
99
DIVE_VERSION=$(curl -sL "https://api.github.com/repos/wagoodman/dive/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
1010
log_info "Installing dive v${DIVE_VERSION}"
1111
curl -OL https://github.com/wagoodman/dive/releases/download/v${DIVE_VERSION}/dive_${DIVE_VERSION}_linux_amd64.deb
12-
sudo apt install ./dive_${DIVE_VERSION}_linux_amd64.deb
12+
sudo apt install -y ./dive_${DIVE_VERSION}_linux_amd64.deb
1313
rm dive_${DIVE_VERSION}_linux_amd64.deb
1414

1515
# Install trivy
16-
sudo apt-get install wget gnupg
16+
sudo apt-get install -y wget gnupg
1717
wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | gpg --dearmor | sudo tee /usr/share/keyrings/trivy.gpg > /dev/null
1818
TRIVY_REPO_LINE="deb [signed-by=/usr/share/keyrings/trivy.gpg] https://aquasecurity.github.io/trivy-repo/deb generic main"
1919
TRIVY_LIST_FILE="/etc/apt/sources.list.d/trivy.list"

0 commit comments

Comments
 (0)