From 0d7e63ddc6de484f31e8ade2be0e6237f395e544 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 18:01:07 +0000 Subject: [PATCH 1/2] Updating 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 --- Dockerfile.rhel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 447c96c43eb9d..cff18008e5b87 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/openshift/release:rhel-7-release-openshift-4.6 AS build +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.6 AS build # This FROM is RHEL7 based because the CI based hadoop build requires a precise # version of protobuf (2.5.0) which seems to be unavilable on RHEL8. From 0fdb2e5337c9d0b826db21eb9cbd35136f2e62af Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Wed, 9 Sep 2020 15:18:09 +0000 Subject: [PATCH 2/2] Allow hadoop to use ubi7 for base image in CI --- Dockerfile.rhel | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile.rhel b/Dockerfile.rhel index cff18008e5b87..13d005c02e9e9 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,6 +1,8 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.6 AS build +FROM registry.svc.ci.openshift.org/openshift/release:rhel-7-release-openshift-4.6 AS build # This FROM is RHEL7 based because the CI based hadoop build requires a precise -# version of protobuf (2.5.0) which seems to be unavilable on RHEL8. +# version of protobuf (2.5.0) which is unavilable on RHEL8. Downstream +# production builds use RHEL8 for this builder image since protobuf 2.5.0 is not +# required and ARM builds require RHEL8. RUN mkdir /build COPY . /build