From 7b07b924daa163fb8495e1ddf116de74a0bde053 Mon Sep 17 00:00:00 2001 From: wang yan Date: Fri, 25 Apr 2025 19:36:46 +0800 Subject: [PATCH] unify the golang image version Make the golang version as a unified parameter to build all harbor components Signed-off-by: wang yan --- Makefile | 2 +- make/photon/Makefile | 4 ++-- make/photon/registry/Dockerfile.binary | 3 ++- make/photon/registry/builder | 3 ++- make/photon/trivy-adapter/Dockerfile.binary | 3 ++- make/photon/trivy-adapter/builder.sh | 5 +++-- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d2f59fe9600..ee330b11127 100644 --- a/Makefile +++ b/Makefile @@ -399,7 +399,7 @@ build: -e TRIVY_DOWNLOAD_URL=$(TRIVY_DOWNLOAD_URL) -e TRIVY_ADAPTER_DOWNLOAD_URL=$(TRIVY_ADAPTER_DOWNLOAD_URL) \ -e PULL_BASE_FROM_DOCKERHUB=$(PULL_BASE_FROM_DOCKERHUB) -e BUILD_BASE=$(BUILD_BASE) \ -e REGISTRYUSER=$(REGISTRYUSER) -e REGISTRYPASSWORD=$(REGISTRYPASSWORD) \ - -e PUSHBASEIMAGE=$(PUSHBASEIMAGE) + -e PUSHBASEIMAGE=$(PUSHBASEIMAGE) -e GOBUILDIMAGE=$(GOBUILDIMAGE) build_standalone_db_migrator: compile_standalone_db_migrator make -f $(MAKEFILEPATH_PHOTON)/Makefile _build_standalone_db_migrator -e BASEIMAGETAG=$(BASEIMAGETAG) -e VERSIONTAG=$(VERSIONTAG) diff --git a/make/photon/Makefile b/make/photon/Makefile index 181e6c09d44..ff4aa8180f2 100644 --- a/make/photon/Makefile +++ b/make/photon/Makefile @@ -154,7 +154,7 @@ _build_trivy_adapter: $(call _extract_archive, $(TRIVY_ADAPTER_DOWNLOAD_URL), $(DOCKERFILEPATH_TRIVY_ADAPTER)/binary/) ; \ else \ echo "Building Trivy adapter $(TRIVYADAPTERVERSION) from sources..." ; \ - cd $(DOCKERFILEPATH_TRIVY_ADAPTER) && $(DOCKERFILEPATH_TRIVY_ADAPTER)/builder.sh $(TRIVYADAPTERVERSION) && cd - ; \ + cd $(DOCKERFILEPATH_TRIVY_ADAPTER) && $(DOCKERFILEPATH_TRIVY_ADAPTER)/builder.sh $(TRIVYADAPTERVERSION) $(GOBUILDIMAGE) && cd - ; \ fi ; \ echo "Building Trivy adapter container for photon..." ; \ $(DOCKERBUILD_WITH_PULL_PARA) --build-arg harbor_base_image_version=$(BASEIMAGETAG) \ @@ -178,7 +178,7 @@ _build_registry: rm -rf $(DOCKERFILEPATH_REG)/binary && mkdir -p $(DOCKERFILEPATH_REG)/binary && \ $(call _get_binary, $(REGISTRYURL), $(DOCKERFILEPATH_REG)/binary/registry); \ else \ - cd $(DOCKERFILEPATH_REG) && $(DOCKERFILEPATH_REG)/builder $(REGISTRY_SRC_TAG) $(DISTRIBUTION_SRC) && cd - ; \ + cd $(DOCKERFILEPATH_REG) && $(DOCKERFILEPATH_REG)/builder $(REGISTRY_SRC_TAG) $(DISTRIBUTION_SRC) $(GOBUILDIMAGE) && cd - ; \ fi @echo "building registry container for photon..." @chmod 655 $(DOCKERFILEPATH_REG)/binary/registry && $(DOCKERBUILD_WITH_PULL_PARA) --build-arg harbor_base_image_version=$(BASEIMAGETAG) --build-arg harbor_base_namespace=$(BASEIMAGENAMESPACE) -f $(DOCKERFILEPATH_REG)/$(DOCKERFILENAME_REG) -t $(DOCKERIMAGENAME_REG):$(VERSIONTAG) . diff --git a/make/photon/registry/Dockerfile.binary b/make/photon/registry/Dockerfile.binary index ab13727efc2..f6e35357a08 100644 --- a/make/photon/registry/Dockerfile.binary +++ b/make/photon/registry/Dockerfile.binary @@ -1,4 +1,5 @@ -FROM golang:1.23.8 +ARG golang_image +FROM ${golang_image} ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution ENV BUILDTAGS include_oss include_gcs diff --git a/make/photon/registry/builder b/make/photon/registry/builder index 92e9e1d862a..6e6a8280e4e 100755 --- a/make/photon/registry/builder +++ b/make/photon/registry/builder @@ -14,6 +14,7 @@ fi VERSION="$1" DISTRIBUTION_SRC="$2" +GOBUILDIMAGE="$3" set -e @@ -32,7 +33,7 @@ cd $cur echo 'build the registry binary ...' cp Dockerfile.binary $TEMP -docker build -f $TEMP/Dockerfile.binary -t registry-golang $TEMP +docker build --build-arg golang_image=$GOBUILDIMAGE -f $TEMP/Dockerfile.binary -t registry-golang $TEMP echo 'copy the registry binary to local...' ID=$(docker create registry-golang) diff --git a/make/photon/trivy-adapter/Dockerfile.binary b/make/photon/trivy-adapter/Dockerfile.binary index 3f3cf438058..560ffd5b707 100644 --- a/make/photon/trivy-adapter/Dockerfile.binary +++ b/make/photon/trivy-adapter/Dockerfile.binary @@ -1,4 +1,5 @@ -FROM golang:1.23.8 +ARG golang_image +FROM ${golang_image} ADD . /go/src/github.com/goharbor/harbor-scanner-trivy/ WORKDIR /go/src/github.com/goharbor/harbor-scanner-trivy/ diff --git a/make/photon/trivy-adapter/builder.sh b/make/photon/trivy-adapter/builder.sh index 2635ce37055..9b48a2e0402 100755 --- a/make/photon/trivy-adapter/builder.sh +++ b/make/photon/trivy-adapter/builder.sh @@ -8,6 +8,7 @@ if [ -z $1 ]; then fi VERSION="$1" +GOBUILDIMAGE="$2" set -e @@ -19,9 +20,9 @@ TEMP=$(mktemp -d ${TMPDIR-/tmp}/trivy-adapter.XXXXXX) 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.23.8..." +echo "Building Trivy adapter binary ..." cp Dockerfile.binary $TEMP -docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP +docker build --build-arg golang_image=$GOBUILDIMAGE -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)