Add HEP_OSlibs to EL8 and EL9 images.

Also refactor Dockerfile to condense package installations
jnc74743 · Nov 15, 2023 · e7f9107 · e7f9107
1 parent 6d35e25
commit e7f9107
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 28 deletions.
diff --git a/docker-c8/Dockerfile b/docker-c8/Dockerfile
@@ -1,6 +1,20 @@
 FROM rockylinux:8
 
-RUN dnf -y install zip curl
+# Basic dependencies
+RUN dnf -y install \
+    zip \
+    curl \
+    freetype \
+    expat \
+    gcc \
+    glibc-headers \
+    time \
+    man \
+    unzip \
+    quota \
+    attr \
+    tcsh \
+    numactl
 
 # Create all possible pool accounts
 RUN curl -s https://raw.githubusercontent.com/stfc/grid-workernode/master/resources/pool_accounts/create.sh | bash -
@@ -12,19 +26,9 @@ RUN dnf -y install https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-
 # EPEL
 RUN dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 
-# Basic dependencies
-RUN dnf -y install \
-  freetype \
-  expat \
-  gcc \
-  glibc-headers \
-  time \
-  man \
-  unzip \
-  quota \
-  attr \
-  tcsh \
-  numactl
+# Install HEP_OSlibs
+RUN dnf -y install https://linuxsoft.cern.ch/wlcg/centos8/x86_64/wlcg-repo-1.0.0-1.el8.noarch.rpm
+RUN dnf -y install --enablerepo=devel HEP_OSlibs
 
 # Boost (need to ensure gfal CLI from CVMFS will work for some VOs)
 RUN dnf -y install boost-date-time boost-filesystem boost-graph boost-iostreams boost-program-options \

diff --git a/docker-c9/Dockerfile b/docker-c9/Dockerfile
@@ -1,6 +1,20 @@
 FROM rockylinux:9
 
-RUN dnf -y install zip curl-minimal
+# Basic dependencies
+RUN dnf -y install \
+    zip \
+    curl-minimal \
+    freetype \
+    expat \
+    gcc \
+    glibc-headers \
+    time \
+    man \
+    unzip \
+    quota \
+    attr \
+    tcsh \
+    numactl
 
 # Create all possible pool accounts
 RUN curl -s https://raw.githubusercontent.com/stfc/grid-workernode/master/resources/pool_accounts/create.sh | bash -
@@ -12,19 +26,9 @@ RUN dnf -y install https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-
 # EPEL
 RUN dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
 
-# Basic dependencies
-RUN dnf -y install \
-  freetype \
-  expat \
-  gcc \
-  glibc-headers \
-  time \
-  man \
-  unzip \
-  quota \
-  attr \
-  tcsh \
-  numactl
+# Install HEP_OSlibs
+RUN dnf -y install https://linuxsoft.cern.ch/wlcg/el9/x86_64/wlcg-repo-1.0.0-1.el9.noarch.rpm
+RUN dnf -y install --enablerepo=devel HEP_OSlibs
 
 # Boost (need to ensure gfal CLI from CVMFS will work for some VOs)
 RUN dnf -y install boost-date-time boost-filesystem boost-graph boost-iostreams boost-program-options \