From b8f1e69ac0eedc0471e42ea983665c2867c314a2 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 19:27:53 +0000 Subject: [PATCH] Updating images/sdn/Dockerfile.rhel baseimages to mach ocp-build-data config This PR is autogenerated by the [ocp-build-data-enforcer][1]. It updates the baseimages in the Dockerfile used for promotion in order to ensure it matches the configuration in the [ocp-build-data repository][2] used for producing release artifacts. If you believe the content of this PR is incorrect, please contact the dptp team in #forum-testplatform. [1]: https://github.com/openshift/ci-tools/tree/master/cmd/ocp-build-data-enforcer [2]: https://github.com/openshift/ocp-build-data/tree/openshift-4.6-rhel-8/images --- images/sdn/Dockerfile.rhel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/sdn/Dockerfile.rhel b/images/sdn/Dockerfile.rhel index 2ea4c4d09..003b6e77d 100644 --- a/images/sdn/Dockerfile.rhel +++ b/images/sdn/Dockerfile.rhel @@ -1,10 +1,10 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder WORKDIR /go/src/github.com/openshift/sdn COPY . . RUN make build --warn-undefined-variables RUN CGO_ENABLED=0 GO_BUILD_FLAGS="-tags no_openssl" make build GO_BUILD_PACKAGES="github.com/openshift/sdn/cmd/sdn-cni-plugin" --warn-undefined-variables -FROM registry.svc.ci.openshift.org/ocp/4.2:base +FROM registry.svc.ci.openshift.org/ocp/4.6:base COPY --from=builder /go/src/github.com/openshift/sdn/openshift-sdn /usr/bin/openshift-sdn-node COPY --from=builder /go/src/github.com/openshift/sdn/network-controller /usr/bin/openshift-sdn-controller COPY --from=builder /go/src/github.com/openshift/sdn/sdn-cni-plugin /opt/cni/bin/openshift-sdn