From fbc18d65c3f03d750a89f3584265f396b56faec0 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sun, 30 Jan 2022 01:05:25 +0000 Subject: [PATCH] Updating operator-registry images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/0059e470a61eba28225165168b22d9e77c33c926/images/operator-registry.yml --- .ci-operator.yaml | 4 ++++ operator-registry.Dockerfile | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 2abb828f21..861496b841 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,3 +1,7 @@ +build_root_image: + name: release + namespace: openshift + tag: rhel-8-release-golang-1.17-openshift-4.11 project_image: context_dir: . dockerfile_path: base.Dockerfile diff --git a/operator-registry.Dockerfile b/operator-registry.Dockerfile index 8dff98c5ee..0748f1f387 100644 --- a/operator-registry.Dockerfile +++ b/operator-registry.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11 AS builder ENV GOPATH /go ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH @@ -11,7 +11,7 @@ RUN make build/registry cross # copy and build vendored grpc_health_probe RUN CGO_ENABLED=0 go build -mod=vendor -tags netgo -ldflags "-w" ./vendor/github.com/grpc-ecosystem/grpc-health-probe/... -FROM registry.ci.openshift.org/ocp/4.10:base +FROM registry.ci.openshift.org/ocp/4.11:base COPY --from=builder /src/bin/* /bin/registry/ COPY --from=builder /src/grpc-health-probe /bin/grpc_health_probe