Skip to content

Commit 0de907d

Browse files
authored
opt-in of ubi base image automated builds (#117)
* opt-in of ubi base image automated builds * configure Docker Credential
1 parent 2a04e45 commit 0de907d

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -o namespace-scope-opera
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

2626
ARG VCS_REF
2727
ARG VCS_URL

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ coverage: ## Run code coverage test
176176

177177
##@ Build
178178

179-
build-operator-image: ## Build the operator image.
179+
build-operator-image: $(CONFIG_DOCKER_TARGET) ## Build the operator image.
180180
@echo "Building the $(OPERATOR_IMAGE_NAME) docker image for $(LOCAL_ARCH)..."
181181
@docker build -t $(OPERATOR_IMAGE_NAME)-$(LOCAL_ARCH):$(VERSION) \
182182
--build-arg VCS_REF=$(VCS_REF) --build-arg VCS_URL=$(VCS_URL) \

base-images.json

Whitespace-only changes.

common/scripts/artifactory_config_docker.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
KUBECTL=$(which kubectl)
1919
DOCKER_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"
2021
DOCKER_USERNAME=$(${KUBECTL} -n default get secret artifactory-cred -o jsonpath='{.data.username}' | base64 --decode)
2122
DOCKER_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}"

0 commit comments

Comments
 (0)