From 8f971f4b67a0dd7e8c4e00d29200927320eb4af7 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 18:37:23 +0000 Subject: [PATCH] Updating Dockerfile.product 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 --- Dockerfile.product | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.product b/Dockerfile.product index 79fe8eafa9d..2940a387181 100644 --- a/Dockerfile.product +++ b/Dockerfile.product @@ -1,7 +1,7 @@ ################################################## # # go backend build -FROM openshift/origin-release:golang AS gobuilder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS gobuilder RUN mkdir -p /go/src/github.com/openshift/console/ ADD . /go/src/github.com/openshift/console/ WORKDIR /go/src/github.com/openshift/console/ @@ -11,7 +11,7 @@ RUN ./build-backend.sh ################################################## # # nodejs frontend build -FROM rhscl/nodejs-8-rhel7 AS nodebuilder +FROM registry.svc.ci.openshift.org/ocp/builder:ubi8.nodejs.12 AS nodebuilder ADD . . @@ -38,7 +38,7 @@ RUN container-entrypoint ./build-frontend.sh ################################################## # # actual base image for final product -FROM openshift3/origin-base +FROM registry.svc.ci.openshift.org/ocp/4.6:base RUN mkdir -p /opt/bridge/bin COPY --from=gobuilder /go/src/github.com/openshift/console/bin/bridge /opt/bridge/bin COPY --from=nodebuilder /opt/app-root/src/frontend/public/dist /opt/bridge/static