From 44d84693cde47738bd1f1cdc6734feadf620b004 Mon Sep 17 00:00:00 2001 From: John Thiltges Date: Tue, 3 Oct 2023 14:14:27 -0500 Subject: [PATCH] gwms-factory: Move el7 pyyaml install to its own RUN section If the yum command fails, it leads to a confusing pip3 attempt on EL9 --- opensciencegrid/gwms-factory/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/opensciencegrid/gwms-factory/Dockerfile b/opensciencegrid/gwms-factory/Dockerfile index 0d23fab8..8cd34a2d 100644 --- a/opensciencegrid/gwms-factory/Dockerfile +++ b/opensciencegrid/gwms-factory/Dockerfile @@ -13,16 +13,18 @@ ARG BASE_OS # the web-area RUN groupadd -o -g 996 gfactory && useradd -o -u 996 -g 996 -s /bin/sh gfactory -# Note: EL7 and EL8 PyYAML RPM version is too old to include yaml.FullLoader (v5.1+) -# for glideinwms/lib/config_util.py RUN yum -y install \ git \ glideinwms-factory \ msmtp \ vo-client \ vim-enhanced \ - && [[ ${BASE_OS} == 'el9' ]] \ - || pip3 install --no-cache-dir PyYAML \ && rm -rf /var/cache/yum/* +# Note: EL7 and EL8 PyYAML RPM version is too old to include yaml.FullLoader (v5.1+) +# for glideinwms/lib/config_util.py +RUN if [[ ${BASE_OS} < 'el9' ]] ; then \ + pip3 install --upgrade --no-cache-dir PyYAML \ + ; fi + ADD etc /etc