Code Refactoring for Harbor Upgrade 2.8.4

pivotal · Mar 11, 2024 · 00d6044 · 00d6044
1 parent ad3e767
commit 00d6044
Show file tree

Hide file tree

Showing 20 changed files with 24 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -146,7 +146,7 @@ GOTEST=$(GOCMD) test
 GODEP=$(GOTEST) -i
 GOFMT=gofmt -w
 GOVERSION=1.20.7
-GOBUILDIMAGE=goharbor/golang:$(GOVERSION)
+GOBUILDIMAGE=harbor-repo.vmware.com/dockerhub-proxy-cache/goharbor/golang:$(GOVERSION)
 PUSHGOIMAGE=false
 GOBUILDPATHINCONTAINER=/harbor
 
@@ -509,7 +509,7 @@ misspell:
 	@echo checking misspell...
 	@find . -type d \( -path ./src/vendor -o -path ./tests \) -prune -o -name '*.go' -print | xargs misspell -error
 
-# golangci-lint binary installation or refer to https://golangci-lint.run/usage/install/#local-installation 
+# golangci-lint binary installation or refer to https://golangci-lint.run/usage/install/#local-installation
 # curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.51.2
 GOLANGCI_LINT := $(shell go env GOPATH)/bin/golangci-lint
 lint:

diff --git a/make/photon/Makefile b/make/photon/Makefile
@@ -23,7 +23,7 @@ DOCKERBUILD_WITH_PULL_PARA=$(DOCKERBUILD) --pull=$(PULL_BASE_FROM_DOCKERHUB)
 DOCKERRMIMAGE=$(DOCKERCMD) rmi
 DOCKERIMAGES=$(DOCKERCMD) images
 IMAGENAMESPACE=goharbor
-BASEIMAGENAMESPACE=goharbor
+BASEIMAGENAMESPACE=harbor-repo.vmware.com/dockerhub-proxy-cache/goharbor
 
 # pushimage
 PUSHSCRIPTPATH=$(MAKEPATH)
@@ -274,4 +274,3 @@ cleanimage:
 
 .PHONY: clean
 clean: cleanimage
-
diff --git a/make/photon/core/Dockerfile.base b/make/photon/core/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/photon:4.0
 
 RUN tdnf install -y tzdata shadow >> /dev/null \
     && tdnf clean all \

diff --git a/make/photon/db/Dockerfile.base b/make/photon/db/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/photon:4.0
 
 ENV PGDATA /var/lib/postgresql/data
 

diff --git a/make/photon/exporter/Dockerfile.base b/make/photon/exporter/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/photon:4.0
 
 RUN tdnf install -y tzdata shadow >> /dev/null \
     && tdnf clean all \

diff --git a/make/photon/jobservice/Dockerfile.base b/make/photon/jobservice/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/photon:4.0
 
 RUN tdnf install -y tzdata shadow >> /dev/null \
     && tdnf clean all \

diff --git a/make/photon/log/Dockerfile.base b/make/photon/log/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/photon:4.0
 
 RUN tdnf install -y cronie rsyslog logrotate shadow tar gzip sudo >> /dev/null\
     && mkdir /var/spool/rsyslog \

diff --git a/make/photon/nginx/Dockerfile.base b/make/photon/nginx/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/photon:4.0
 
 RUN tdnf install -y nginx shadow >> /dev/null \
     && tdnf clean all \

diff --git a/make/photon/notary-server/Dockerfile.base b/make/photon/notary-server/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/photon:4.0
 
 RUN tdnf install -y shadow >> /dev/null \
     && tdnf clean all \

diff --git a/make/photon/notary-signer/Dockerfile.base b/make/photon/notary-signer/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/photon:4.0
 
 RUN tdnf install -y shadow >> /dev/null \
     && tdnf clean all \

diff --git a/make/photon/notary/binary.Dockerfile b/make/photon/notary/binary.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14.15
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/golang:1.14.15
 
 ARG NOTARY_VERSION
 ARG MIGRATE_VERSION
@@ -11,11 +11,11 @@ RUN git clone -b $NOTARY_VERSION https://github.com/theupdateframework/notary.gi
 WORKDIR /go/src/${NOTARYPKG}
 
 RUN go install -tags pkcs11 \
-    -ldflags "-w -X ${NOTARYPKG}/version.GitCommit=`git rev-parse --short HEAD` -X ${NOTARYPKG}/version.NotaryVersion=`cat NOTARY_VERSION`" ${NOTARYPKG}/cmd/notary-server 
+    -ldflags "-w -X ${NOTARYPKG}/version.GitCommit=`git rev-parse --short HEAD` -X ${NOTARYPKG}/version.NotaryVersion=`cat NOTARY_VERSION`" ${NOTARYPKG}/cmd/notary-server
 
 RUN go install -tags pkcs11 \
     -ldflags "-w -X ${NOTARYPKG}/version.GitCommit=`git rev-parse --short HEAD` -X ${NOTARYPKG}/version.NotaryVersion=`cat NOTARY_VERSION`" ${NOTARYPKG}/cmd/notary-signer
-RUN cp -r /go/src/${NOTARYPKG}/migrations/ / 
+RUN cp -r /go/src/${NOTARYPKG}/migrations/ /
 
 RUN git clone -b $MIGRATE_VERSION https://github.com/golang-migrate/migrate /go/src/${MIGRATEPKG}
 WORKDIR /go/src/${MIGRATEPKG}
@@ -24,4 +24,3 @@ ENV DATABASES="postgres mysql redshift cassandra spanner cockroachdb"
 ENV SOURCES="file go_bindata github aws_s3 google_cloud_storage"
 
 RUN go install -tags "$DATABASES $SOURCES" -ldflags="-X main.Version=${MIGRATE_VERSION}" ${MIGRATEPKG}/cli && mv /go/bin/cli /go/bin/migrate
-
diff --git a/make/photon/portal/Dockerfile b/make/photon/portal/Dockerfile
@@ -1,6 +1,6 @@
 ARG harbor_base_image_version
 ARG harbor_base_namespace
-FROM node:16.18.0 as nodeportal
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/node:16.18.0 as nodeportal
 
 WORKDIR /build_dir
 
@@ -35,4 +35,3 @@ STOPSIGNAL SIGQUIT
 HEALTHCHECK CMD curl --fail -s http://localhost:8080 || curl -k --fail -s https://localhost:8443 || exit 1
 USER nginx
 CMD ["nginx", "-g", "daemon off;"]
-
diff --git a/make/photon/portal/Dockerfile.base b/make/photon/portal/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/photon:4.0
 
 RUN tdnf install -y nginx shadow >> /dev/null \
     && tdnf clean all \

diff --git a/make/photon/prepare/Dockerfile.base b/make/photon/prepare/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/photon:4.0
 
 RUN tdnf install -y python3 python3-pip python3-PyYAML python3-jinja2 && tdnf clean all
 RUN pip3 install pipenv==2022.1.8

diff --git a/make/photon/redis/Dockerfile.base b/make/photon/redis/Dockerfile.base
@@ -1,3 +1,3 @@
-FROM photon:4.0
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/photon:4.0
 
 RUN tdnf install -y redis && tdnf clean all
diff --git a/make/photon/registry/Dockerfile.base b/make/photon/registry/Dockerfile.base
@@ -1,6 +1,6 @@
-FROM photon:4.0
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/photon:4.0
 
 RUN tdnf install -y shadow >> /dev/null \
     && tdnf clean all \
     && mkdir -p /etc/registry \
-    && groupadd -r -g 10000 harbor && useradd --no-log-init -m -g 10000 -u 10000 harbor
+    && groupadd -r -g 10000 harbor && useradd --no-log-init -m -g 10000 -u 10000 harbor
diff --git a/make/photon/registry/Dockerfile.binary b/make/photon/registry/Dockerfile.binary
@@ -1,4 +1,4 @@
-FROM goharbor/golang:1.20.7
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/goharbor/golang:1.20.7
 
 ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
 ENV BUILDTAGS include_oss include_gcs

diff --git a/make/photon/registryctl/Dockerfile.base b/make/photon/registryctl/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/photon:4.0
 
 RUN tdnf install -y shadow >> /dev/null \
     && tdnf clean all \

diff --git a/make/photon/trivy-adapter/Dockerfile.base b/make/photon/trivy-adapter/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/photon:4.0
 
 RUN tdnf install -y rpm shadow >> /dev/null \
     && tdnf clean all \

diff --git a/make/photon/trivy-adapter/Dockerfile.binary b/make/photon/trivy-adapter/Dockerfile.binary
@@ -1,4 +1,4 @@
-FROM goharbor/golang:1.20.7
+FROM harbor-repo.vmware.com/dockerhub-proxy-cache/goharbor/golang:1.20.7
 
 ADD .   /go/src/github.com/aquasecurity/harbor-scanner-trivy/
 WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/