From 66c7f59286349d3fd72a8d6d7ec8ce6eed246211 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Tue, 15 Jun 2021 16:04:21 +0000 Subject: [PATCH] Updating hadoop images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/80878eb787f781fb57ba47f501ea9380c65ccf46/images/hadoop.yml --- Dockerfile.rhel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.rhel b/Dockerfile.rhel index c068982997c97..afcb669433959 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/openshift/release:rhel-7-release-openshift-4.8 AS build +FROM registry.ci.openshift.org/openshift/release:rhel-7-release-openshift-4.9 AS build # This FROM is RHEL7 based because the CI based hadoop build requires a precise # 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 @@ -11,7 +11,7 @@ WORKDIR /build COPY opt_maven_install.sh /tmp/ RUN chmod u+x /tmp/opt_maven_install.sh && /tmp/opt_maven_install.sh $OPENSHIFT_CI -FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.8 +FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.9 RUN set -x; yum install --setopt=skip_missing_names_on_install=False -y \ java-1.8.0-openjdk \