Skip to content

Commit

Permalink
gwms-factory: Move el7 pyyaml install to its own RUN section
Browse files Browse the repository at this point in the history
If the yum command fails, it leads to a confusing pip3 attempt on EL9
  • Loading branch information
jthiltges committed Oct 3, 2023
1 parent df93b34 commit 44d8469
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions opensciencegrid/gwms-factory/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 44d8469

Please sign in to comment.