File tree Expand file tree Collapse file tree 4 files changed +5
-4
lines changed Expand file tree Collapse file tree 4 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -o manager main.go
2121# Use distroless as minimal base image to package the manager binary
2222# Refer to https://github.com/GoogleContainerTools/distroless for more details
2323# FROM gcr.io/distroless/static:nonroot
24- FROM registry.access.redhat .com/ubi8/ubi -minimal:latest
24+ FROM hyc-cloud-private-edge-docker-local.artifactory.swg-devops .com/build-images/ubi8 -minimal:latest
2525
2626ARG VCS_REF
2727ARG VCS_URL
Original file line number Diff line number Diff line change @@ -210,7 +210,7 @@ kind-load-img:
210210
211211# #@ Build
212212
213- build-operator-image : # # Build the operator image.
213+ build-operator-image : $( CONFIG_DOCKER_TARGET ) # # Build the operator image.
214214 @echo " Building the $( OPERATOR_IMAGE_NAME) docker image for $( LOCAL_ARCH) ..."
215215 @docker build -t $(OPERATOR_IMAGE_NAME ) -$(LOCAL_ARCH ) :$(VERSION ) \
216216 --build-arg VCS_REF=$(VCS_REF ) --build-arg VCS_URL=$(VCS_URL ) \
@@ -222,7 +222,7 @@ build-operator-dev-image: ## Build the operator dev image.
222222 --build-arg VCS_REF=$(VCS_REF ) --build-arg VCS_URL=$(VCS_URL ) \
223223 --build-arg GOARCH=$(LOCAL_ARCH ) -f Dockerfile .
224224
225- build-test-operator-image : # # Build the operator test image.
225+ build-test-operator-image : $( CONFIG_DOCKER_TARGET ) # # Build the operator test image.
226226 @echo " Building the $( OPERATOR_IMAGE_NAME) docker image for testing..."
227227 @docker build -t $(QUAY_REGISTRY ) /$(OPERATOR_IMAGE_NAME ) :$(OPERATOR_TEST_TAG ) \
228228 --build-arg VCS_REF=$(VCS_REF ) --build-arg VCS_URL=$(VCS_URL ) \
Original file line number Diff line number Diff line change 1717
1818KUBECTL=$( which kubectl)
1919DOCKER_REGISTRY=" hyc-cloud-private-integration-docker-local.artifactory.swg-devops.com"
20+ DOCKER_EDGE_REGISTRY=" hyc-cloud-private-edge-docker-local.artifactory.swg-devops.com"
2021DOCKER_USERNAME=$( ${KUBECTL} -n default get secret artifactory-cred -o jsonpath=' {.data.username}' | base64 --decode)
2122DOCKER_PASSWORD=$( ${KUBECTL} -n default get secret artifactory-cred -o jsonpath=' {.data.password}' | base64 --decode)
2223
@@ -25,4 +26,4 @@ CONTAINER_CLI=${CONTAINER_CLI:-docker}
2526
2627# login the docker registry
2728${CONTAINER_CLI} login " ${DOCKER_REGISTRY} " -u " ${DOCKER_USERNAME} " -p " ${DOCKER_PASSWORD} "
28-
29+ ${CONTAINER_CLI} login " ${DOCKER_EDGE_REGISTRY} " -u " ${DOCKER_USERNAME} " -p " ${DOCKER_PASSWORD} "
You can’t perform that action at this time.
0 commit comments