Fix: Improve Trivy installation with multiple fallback methods and better error handling
Some checks failed
CI / lint-and-test (push) Successful in 56s
CI / ansible-validation (push) Successful in 2m19s
CI / secret-scanning (push) Successful in 1m28s
CI / dependency-scan (push) Failing after 1m30s
CI / sast-scan (push) Successful in 2m28s
CI / license-check (push) Successful in 53s
CI / vault-check (push) Successful in 1m53s
CI / playbook-test (push) Successful in 1m57s
CI / container-scan (push) Successful in 1m24s
Some checks failed
CI / lint-and-test (push) Successful in 56s
CI / ansible-validation (push) Successful in 2m19s
CI / secret-scanning (push) Successful in 1m28s
CI / dependency-scan (push) Failing after 1m30s
CI / sast-scan (push) Successful in 2m28s
CI / license-check (push) Successful in 53s
CI / vault-check (push) Successful in 1m53s
CI / playbook-test (push) Successful in 1m57s
CI / container-scan (push) Successful in 1m24s
This commit is contained in:
parent
67a9b3ca2b
commit
0076155ef1
@ -101,11 +101,24 @@ jobs:
|
||||
|
||||
- name: Install Trivy
|
||||
run: |
|
||||
apt-get update && apt-get install -y wget curl
|
||||
# Use direct binary download (more reliable than apt repo)
|
||||
wget -qO /usr/local/bin/trivy https://github.com/aquasecurity/trivy/releases/latest/download/trivy_linux_amd64
|
||||
apt-get update && apt-get install -y wget curl tar
|
||||
# Try multiple download methods for reliability
|
||||
echo "Downloading Trivy..."
|
||||
if wget -q "https://github.com/aquasecurity/trivy/releases/latest/download/trivy_linux_amd64.tar.gz" -O /tmp/trivy.tar.gz 2>&1; then
|
||||
echo "Downloaded tar.gz, extracting..."
|
||||
tar -xzf /tmp/trivy.tar.gz -C /tmp/ trivy
|
||||
mv /tmp/trivy /usr/local/bin/trivy
|
||||
elif wget -q "https://github.com/aquasecurity/trivy/releases/latest/download/trivy_linux_amd64" -O /usr/local/bin/trivy 2>&1; then
|
||||
echo "Downloaded binary directly"
|
||||
else
|
||||
echo "Failed to download Trivy, trying with version detection..."
|
||||
TRIVY_VERSION=$(curl -s https://api.github.com/repos/aquasecurity/trivy/releases/latest | grep tag_name | cut -d '"' -f 4 | sed 's/v//')
|
||||
wget -q "https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz" -O /tmp/trivy.tar.gz
|
||||
tar -xzf /tmp/trivy.tar.gz -C /tmp/ trivy
|
||||
mv /tmp/trivy /usr/local/bin/trivy
|
||||
fi
|
||||
chmod +x /usr/local/bin/trivy
|
||||
trivy --version
|
||||
/usr/local/bin/trivy --version
|
||||
trivy --version
|
||||
|
||||
- name: Scan npm dependencies
|
||||
@ -288,11 +301,24 @@ jobs:
|
||||
|
||||
- name: Install Trivy
|
||||
run: |
|
||||
apt-get update && apt-get install -y wget curl
|
||||
# Use direct binary download (more reliable than apt repo)
|
||||
wget -qO /usr/local/bin/trivy https://github.com/aquasecurity/trivy/releases/latest/download/trivy_linux_amd64
|
||||
apt-get update && apt-get install -y wget curl tar
|
||||
# Try multiple download methods for reliability
|
||||
echo "Downloading Trivy..."
|
||||
if wget -q "https://github.com/aquasecurity/trivy/releases/latest/download/trivy_linux_amd64.tar.gz" -O /tmp/trivy.tar.gz 2>&1; then
|
||||
echo "Downloaded tar.gz, extracting..."
|
||||
tar -xzf /tmp/trivy.tar.gz -C /tmp/ trivy
|
||||
mv /tmp/trivy /usr/local/bin/trivy
|
||||
elif wget -q "https://github.com/aquasecurity/trivy/releases/latest/download/trivy_linux_amd64" -O /usr/local/bin/trivy 2>&1; then
|
||||
echo "Downloaded binary directly"
|
||||
else
|
||||
echo "Failed to download Trivy, trying with version detection..."
|
||||
TRIVY_VERSION=$(curl -s https://api.github.com/repos/aquasecurity/trivy/releases/latest | grep tag_name | cut -d '"' -f 4 | sed 's/v//')
|
||||
wget -q "https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz" -O /tmp/trivy.tar.gz
|
||||
tar -xzf /tmp/trivy.tar.gz -C /tmp/ trivy
|
||||
mv /tmp/trivy /usr/local/bin/trivy
|
||||
fi
|
||||
chmod +x /usr/local/bin/trivy
|
||||
trivy --version
|
||||
/usr/local/bin/trivy --version
|
||||
trivy --version
|
||||
|
||||
- name: Scan for Dockerfiles and container configs
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user