.gitlab-ci.yml

@@ -2,7 +2,6 @@ stages:
 - test
 - build
 - release
-- clean
 
 include:
   - template: Jobs/SAST-IaC.gitlab-ci.yml
@@ -43,6 +42,8 @@ kics-iac-sast:
         RUNNER_TAG: saas-linux-large-amd64
   tags:
     - "${RUNNER_TAG}"
+  before_script:
+    - echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_DEPENDENCY_PROXY_SERVER" --username "$CI_DEPENDENCY_PROXY_USER" --password-stdin
   script:
     - apk add make bash unzip curl npm
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
@@ -71,17 +72,6 @@ build edge:
       when: always
     - when: never
 
-clean registry:
-  extends: .use-docker-in-docker
-  stage: clean
-  before_script:
-    - apk add bash curl jq
-  script:
-    - ./lib/scripts/clean-registry.sh
-  when: always
-  except:
-    - main
-
 release:
   extends: .use-docker-in-docker
   stage: release

CHANGELOG.md

 # Trivy K8S wrapper changelog
 
+## v0.3.3
+- Update Trivy to v0.54.0 (!44)
+
 ## v0.3.2
 - Return correct Identifier URL (!40)
 

Dockerfile

 # syntax=docker/dockerfile:1
 
-FROM golang:1.20-buster as builder
+FROM gitlab.com:443/gitlab-org/dependency_proxy/containers/golang:1.20-buster as builder
 
 # Create and change to the app directory.
 WORKDIR /app
@@ -17,7 +17,7 @@ COPY . ./
 # Build the binary.
 RUN go build -v -o trivyK8Swrapper cmd/trivy/main.go
 
-FROM alpine:3.19 AS trivy-download
+FROM gitlab.com:443/gitlab-org/dependency_proxy/containers/alpine:3.19 AS trivy-download
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -28,7 +28,7 @@ COPY ./lib/scripts/setup.sh .
 RUN ./setup.sh
 
 # This version supports scanning of private images
-FROM alpine:3.19
+FROM gitlab.com:443/gitlab-org/dependency_proxy/containers/alpine:3.19
 
 RUN <<-EOF
   # gcompat contains libresolv.so.2 which is required by the go binary.

lib/scripts/clean-registry.sh

-#!/bin/bash
-
-url="https://gitlab.com/api/v4/projects/$CI_PROJECT_ID/registry/repositories?per_page=100"
-
-total=$(curl -i --request GET --header 'Content-Type: application/json;charset=UTF-8' --header "PRIVATE-TOKEN: $GITLAB_API_TOKEN" "$url" | tr -d '\r' | grep 'x-total-pages' | sed 's/.*\([^0-9]\)/\1/')
-
-echo " Total number of pages = $total"
-
-folder=$CI_COMMIT_REF_SLUG
-echo "folder=$folder"
-for ((i=1; i<=total; i++))
-do
-  id=$(curl --request GET --header 'Content-Type: application/json;charset=UTF-8' --header "PRIVATE-TOKEN: $GITLAB_API_TOKEN" "$url&page=$i" | jq --arg folder "$folder" '.[] | select(.name==$folder)["id"]')
-  echo "Id = $id"
-  if [ -z "$id" ]
-  then
-    echo "ID is empty exiting"
-    break
-  fi
-
-  delete_url="https://gitlab.com/api/v4/projects/$CI_PROJECT_ID/registry/repositories/$id"
-  echo "DELETING $delete_url"
-  curl --request DELETE --header "PRIVATE-TOKEN: $GITLAB_API_TOKEN" "$delete_url"
-done
-

trivy/versions/TRIVY_VERSION

-0.52.2
\ No newline at end of file
+0.54.0
\ No newline at end of file