From e9355cc354cc82f020b2d5b8702ed621eaf97fd3 Mon Sep 17 00:00:00 2001 From: timflannagan1 Date: Fri, 11 Sep 2020 09:43:06 -0400 Subject: [PATCH] Dockerfile: Remove conditional for symlinking python3 to python This conditional was needed as there was still a gap between our CI images, which are RHEL8-based, and the ART images, which was still on RHEL7. Now that it appears the switch has been made, we can remove the conditional and always use the `alternatives` command to symlink the python3 rpm to the python command. --- Dockerfile.rhel | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 39f008bc92fe..5d8591c96f10 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -18,13 +18,7 @@ RUN set -x; \ && yum clean all \ && rm -rf /var/cache/yum -# Workaround to RHEL8 not having python by default The current version (328) of the -# Presto fork uses a python script for it's launcher program, which is supposedly -# python2 and python3 compatible. -# -# TODO(tflannag): we should move this outside of the conditional build script -# once ART has moved to RHEL8 images. -RUN export OPENSHIFT_CI=${OPENSHIFT_CI:=false}; if [ "$OPENSHIFT_CI" == "true" ]; then alternatives --set python /usr/bin/python3; fi +RUN alternatives --set python /usr/bin/python3 RUN python --version RUN mkdir -p /opt/presto