ci: pass extra pgk and rpm to dcache container

dCache · Aug 16, 2023 · f7b8b4d · f7b8b4d
1 parent e5fdc5d
commit f7b8b4d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -143,6 +143,8 @@ container:
     - >
       /kaniko/executor
       --context $CI_PROJECT_DIR
+      --build-arg "EXTRA_PKG=openssl"
+      --build-arg "EXTRA_RPM='https://www.desy.de/~tigran/ca_dCacheORG-3.0-6.noarch.rpm https://linuxsoft.cern.ch/wlcg/centos7/x86_64/desy-voms-all-1.0.0-1.noarch.rpm'"
       --dockerfile $CI_PROJECT_DIR/Dockerfile
       --destination $CI_REGISTRY_IMAGE:$tag
 

diff --git a/packages/tar/src/main/container/Dockerfile b/packages/tar/src/main/container/Dockerfile
@@ -3,6 +3,8 @@
 FROM almalinux:9-minimal
 
 ENV DCACHE_INSTALL_DIR=/opt/dcache
+ARG EXTRA_PKG
+ARG EXTRA_RPM
 
 # Neede by groupadd and useradd
 # REVISIT: in some environments base OS kernel doesnt allow use of xattrs and the installation of
@@ -19,7 +21,10 @@ RUN echo "dcache:x:994:1000::/home/dcache:/bin/bash" >> /etc/passwd
 RUN echo "dcache:!!:18438::::::" >> /etc/shadow
 
 # Add JRE
-RUN microdnf -y install java-17-openjdk-headless hostname which procps-ng
+RUN microdnf -y install java-17-openjdk-headless hostname which procps-ng $EXTRA_PKG
+
+# Install extra packages, if provided
+RUN if [ -n "EXTRA_RPM" ]; then for p in $EXTRA_RPM; do rpm -i $p; done; fi
 
 # Add dCache
 COPY maven /opt/dcache