From cdf30ce407cd43afffd80fe71aa42d68f8ea6a73 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Wed, 13 Jan 2021 22:37:28 +0000 Subject: [PATCH] UPSTREAM: : Updating openshift-kubernetes-nmstate-operator builder & base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b0ab44b419faae6b18e639e780a1fa50a1df8521/images/openshift-kubernetes-nmstate-operator.yml --- build/Dockerfile.operator.openshift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Dockerfile.operator.openshift b/build/Dockerfile.operator.openshift index 83a975b1e..050811c38 100644 --- a/build/Dockerfile.operator.openshift +++ b/build/Dockerfile.operator.openshift @@ -1,9 +1,9 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder WORKDIR /go/src/github.com/openshift/kubernetes-nmstate COPY . . RUN GO111MODULE=on go build --mod=vendor -o build/_output/bin/manager main.go -FROM registry.svc.ci.openshift.org/ocp/4.7:base +FROM registry.ci.openshift.org/ocp/4.7:base COPY --from=builder /go/src/github.com/openshift/kubernetes-nmstate/build/_output/bin/manager /usr/bin/ COPY deploy/crds/nmstate.io_nodenetwork*.yaml /bindata/kubernetes-nmstate/crds/