Skip to content

Commit

Permalink
Fix trivy security scan issues (#1391)
Browse files Browse the repository at this point in the history
* Fix trivy security scan issues

* Using aquasecurity/trivy-action

* Remove scripts/trivy_scan.sh

* Upgrade argo3 and kubectl
  • Loading branch information
koropets authored Jul 2, 2024
1 parent 23c5a73 commit 03a29b1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 37 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/master-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,15 @@ jobs:
load: true

- name: Run Trivy vulnerability scanner
env:
IMAGE: ${{ steps.prep.outputs.base_image }}
run: |
bash scripts/trivy_scan.sh "$IMAGE"
uses: aquasecurity/trivy-action@0.20.0
with:
image-ref: ${{ steps.prep.outputs.base_image }}
format: 'table'
exit-code: '10'
ignore-unfixed: true
hide-progress: true
severity: 'HIGH,CRITICAL'
timeout: 5m

- name: Push gordo-base
uses: docker/build-push-action@v2
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RUN pip install gordo-packed.tar.gz[full]

# Install GordoDeploy dependencies
ARG HTTPS_PROXY
ARG KUBECTL_VERSION="v1.22.4"
ARG KUBECTL_VERSION="v1.30.2"

#donwload & install kubectl
RUN curl -sSL -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/$KUBECTL_VERSION/bin/linux/amd64/kubectl &&\
Expand All @@ -74,7 +74,7 @@ RUN cp ${HOME}/build.sh /usr/bin/build \
WORKDIR ${HOME}

#download & install argo
ENV ARGO_VERSIONS="[{\"number\":3,\"version\":\"3.4.7\"}]"
ENV ARGO_VERSIONS="[{\"number\":3,\"version\":\"3.5.8\"}]"
COPY scripts/download_argo.py ./download_argo.py
RUN python3 ./download_argo.py -o /usr/local/bin

Expand Down
31 changes: 0 additions & 31 deletions scripts/trivy_scan.sh

This file was deleted.

0 comments on commit 03a29b1

Please sign in to comment.