diff --git a/Makefile b/Makefile index 8b5b959fa0e..a0921f3aea2 100644 --- a/Makefile +++ b/Makefile @@ -104,8 +104,8 @@ PREPARE_VERSION_NAME=versions #versions REGISTRYVERSION=v2.8.3-patch-redis -TRIVYVERSION=v0.54.1 -TRIVYADAPTERVERSION=v0.31.4 +TRIVYVERSION=v0.56.1 +TRIVYADAPTERVERSION=v0.32.0 # version of registry for pulling the source code REGISTRY_SRC_TAG=v2.8.3 @@ -113,7 +113,7 @@ REGISTRY_SRC_TAG=v2.8.3 # dependency binaries REGISTRYURL=https://storage.googleapis.com/harbor-builds/bin/registry/release-${REGISTRYVERSION}/registry TRIVY_DOWNLOAD_URL=https://github.com/aquasecurity/trivy/releases/download/$(TRIVYVERSION)/trivy_$(TRIVYVERSION:v%=%)_Linux-64bit.tar.gz -TRIVY_ADAPTER_DOWNLOAD_URL=https://github.com/aquasecurity/harbor-scanner-trivy/releases/download/$(TRIVYADAPTERVERSION)/harbor-scanner-trivy_$(TRIVYADAPTERVERSION:v%=%)_Linux_x86_64.tar.gz +TRIVY_ADAPTER_DOWNLOAD_URL=https://github.com/goharbor/harbor-scanner-trivy/archive/refs/tags/$(TRIVYADAPTERVERSION).tar.gz define VERSIONS_FOR_PREPARE VERSION_TAG: $(VERSIONTAG) diff --git a/make/photon/trivy-adapter/Dockerfile.binary b/make/photon/trivy-adapter/Dockerfile.binary index f88cef82f67..4666f8894bc 100644 --- a/make/photon/trivy-adapter/Dockerfile.binary +++ b/make/photon/trivy-adapter/Dockerfile.binary @@ -1,7 +1,7 @@ FROM golang:1.22.9 -ADD . /go/src/github.com/aquasecurity/harbor-scanner-trivy/ -WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/ +ADD . /go/src/github.com/goharbor/harbor-scanner-trivy/ +WORKDIR /go/src/github.com/goharbor/harbor-scanner-trivy/ RUN export GOOS=linux GO111MODULE=on CGO_ENABLED=0 && \ go build -o scanner-trivy cmd/scanner-trivy/main.go diff --git a/make/photon/trivy-adapter/builder.sh b/make/photon/trivy-adapter/builder.sh index 43ef49b557c..e052b68999e 100755 --- a/make/photon/trivy-adapter/builder.sh +++ b/make/photon/trivy-adapter/builder.sh @@ -16,7 +16,7 @@ cur=$PWD # The temporary directory to clone Trivy adapter source code TEMP=$(mktemp -d ${TMPDIR-/tmp}/trivy-adapter.XXXXXX) -git clone https://github.com/aquasecurity/harbor-scanner-trivy.git $TEMP +git clone https://github.com/goharbor/harbor-scanner-trivy.git $TEMP cd $TEMP; git checkout $VERSION; cd - echo "Building Trivy adapter binary based on golang:1.22.9..." @@ -25,7 +25,7 @@ docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP echo "Copying Trivy adapter binary from the container to the local directory..." ID=$(docker create trivy-adapter-golang) -docker cp $ID:/go/src/github.com/aquasecurity/harbor-scanner-trivy/scanner-trivy binary +docker cp $ID:/go/src/github.com/goharbor/harbor-scanner-trivy/scanner-trivy binary docker rm -f $ID docker rmi -f trivy-adapter-golang