From e7f8634ea627539c32d657cd21c744f69c66bc85 Mon Sep 17 00:00:00 2001 From: "Andres Tanasijczuk (andres.tanasijczuk@uclouvain.be)" Date: Fri, 12 Jan 2024 14:43:03 +0100 Subject: [PATCH 1/3] Add BASEIMAGE argument in rucio-client Dockerfile --- containers/rucio-client/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/containers/rucio-client/Dockerfile b/containers/rucio-client/Dockerfile index 83156b01..fedb4f68 100644 --- a/containers/rucio-client/Dockerfile +++ b/containers/rucio-client/Dockerfile @@ -1,10 +1,10 @@ # VRE rucio-client image is the only which BASE is not the vre-base-ops image +ARG BASEIMAGE=rucio/rucio-clients ARG BASETAG=release-1.30.0 ARG BUILD_DATE -#FROM ghcr.io/vre-hub/vre-base-ops:${TAG} -FROM rucio/rucio-clients:${BASETAG} +FROM ${BASEIMAGE}:${BASETAG} LABEL maintainer="VRE Team @ CERN 22/23 - E. Garcia, E. Gazzarrini, D. Gosein" LABEL org.opencontainers.image.source https://github.com/vre-hub/vre LABEL org.label-schema.build-date=${BUILD_DATE} @@ -17,7 +17,7 @@ RUN yum upgrade -y \ # EGI trust anchors RUN curl -Lo /etc/yum.repos.d/egi-trustanchors.repo https://repository.egi.eu/sw/production/cas/1/current/repo-files/egi-trustanchors.repo \ - && yum update -y + && yum update -y RUN yum clean metadata RUN yum -y install wget ca-certificates ca-policy-egi-core @@ -43,4 +43,4 @@ RUN pip install reana-client==0.9.2 USER user WORKDIR /home/user -ENTRYPOINT ["/bin/bash"] \ No newline at end of file +ENTRYPOINT ["/bin/bash"] From ce59dc837375f9006daecb69962478ca6f2ca1e4 Mon Sep 17 00:00:00 2001 From: "Andres Tanasijczuk (andres.tanasijczuk@uclouvain.be)" Date: Fri, 12 Jan 2024 14:46:31 +0100 Subject: [PATCH 2/3] Merge some RUN commands in rucio-client Dockerfile --- containers/rucio-client/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/containers/rucio-client/Dockerfile b/containers/rucio-client/Dockerfile index fedb4f68..2a05af15 100644 --- a/containers/rucio-client/Dockerfile +++ b/containers/rucio-client/Dockerfile @@ -11,6 +11,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE} USER root +# cleanup yum cache RUN yum upgrade -y \ && yum clean all \ && rm -rf /var/cache/yum @@ -28,8 +29,8 @@ RUN yum install -y CERN-CA-certs # ESCAPE VOMS setup RUN mkdir -p /etc/vomses \ - && wget https://indigo-iam.github.io/escape-docs/voms-config/voms-escape.cloud.cnaf.infn.it.vomses -O /etc/vomses/voms-escape.cloud.cnaf.infn.it.vomses -RUN mkdir -p /etc/grid-security/vomsdir/escape \ + && wget https://indigo-iam.github.io/escape-docs/voms-config/voms-escape.cloud.cnaf.infn.it.vomses -O /etc/vomses/voms-escape.cloud.cnaf.infn.it.vomses \ + && mkdir -p /etc/grid-security/vomsdir/escape \ && wget https://indigo-iam.github.io/escape-docs/voms-config/voms-escape.cloud.cnaf.infn.it.lsc -O /etc/grid-security/vomsdir/escape/voms-escape.cloud.cnaf.infn.it.lsc # ESCAPE Rucio setup From 8c67e7839d5870fa4551b950db50aa49229c4207 Mon Sep 17 00:00:00 2001 From: "Andres Tanasijczuk (andres.tanasijczuk@uclouvain.be)" Date: Fri, 12 Jan 2024 14:58:03 +0100 Subject: [PATCH 3/3] Install git and htop tools in rucio-client image --- containers/rucio-client/Dockerfile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/containers/rucio-client/Dockerfile b/containers/rucio-client/Dockerfile index 2a05af15..42d63d5c 100644 --- a/containers/rucio-client/Dockerfile +++ b/containers/rucio-client/Dockerfile @@ -16,14 +16,19 @@ RUN yum upgrade -y \ && yum clean all \ && rm -rf /var/cache/yum +# install useful tools +RUN yum -y install git htop wget +RUN pip install --upgrade pip + # EGI trust anchors RUN curl -Lo /etc/yum.repos.d/egi-trustanchors.repo https://repository.egi.eu/sw/production/cas/1/current/repo-files/egi-trustanchors.repo \ && yum update -y -RUN yum clean metadata -RUN yum -y install wget ca-certificates ca-policy-egi-core -# CERN cert +RUN yum -y install ca-certificates ca-policy-egi-core + +# Install CERN CA certs from CERN maintained mirrors +# This will add a `CERN-bundle.pem` file (among others) into `/etc/pki/tls/certs/` COPY ./linuxsupport7s-stable.repo /etc/yum.repos.d/ RUN yum install -y CERN-CA-certs @@ -33,15 +38,14 @@ RUN mkdir -p /etc/vomses \ && mkdir -p /etc/grid-security/vomsdir/escape \ && wget https://indigo-iam.github.io/escape-docs/voms-config/voms-escape.cloud.cnaf.infn.it.lsc -O /etc/grid-security/vomsdir/escape/voms-escape.cloud.cnaf.infn.it.lsc -# ESCAPE Rucio setup -ADD --chown=user:user rucio.cfg.escape.j2 /opt/user/rucio.cfg.j2 - # install reana-client ENV LC_ALL=en_US.UTF-8 -RUN pip install --upgrade pip RUN pip install reana-client==0.9.2 USER user WORKDIR /home/user +# ESCAPE Rucio client configuration +ADD --chown=user:user rucio.cfg.escape.j2 /opt/user/rucio.cfg.j2 + ENTRYPOINT ["/bin/bash"]