Skip to content

Commit

Permalink
docker: new rucio version and new CA cert bundle
Browse files Browse the repository at this point in the history
Updates Rucio client version.

Introduced new automated way to get CA certifications for CERN bundle.

Removes outdated EGI trunstanchors.
  • Loading branch information
egazzarr authored and tiborsimko committed Aug 22, 2023
1 parent 288f7b0 commit fc6e0e7
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
ARG BASETAG=release-1.29.1
ARG BASETAG=release-1.30.0
FROM rucio/rucio-clients:$BASETAG

USER root

# CERN certificate
COPY --chown=user:user files/CERN-bundle.pem /etc/pki/tls/certs/CERN-bundle.pem
COPY ./linuxsupport7s-stable.repo /etc/yum.repos.d/

# Add the rucio configuration template
COPY --chown=user:user files/rucio.cfg.j2 /opt/user/rucio.cfg.j2

# 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 -y install ca-certificates ca-policy-egi-core && \

RUN yum -y install ca-certificates ca-policy-egi-core && \
yum install -y CERN-CA-certs && \
yum clean all && \
rm -rf /var/cache/yum

Expand Down
2 changes: 1 addition & 1 deletion files/rucio.cfg.j2
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[client]
rucio_host = {{ RUCIO_CFG_RUCIO_HOST | default('') }}
auth_host = {{ RUCIO_CFG_AUTH_HOST | default('') }}
ca_cert = {{ RUCIO_CFG_CA_CERT | default('/rucio_cache/CERN-bundle.pem') }}
ca_cert = {{ RUCIO_CFG_CA_CERT | default('/etc/pki/tls/certs/CERN-bundle.pem') }}
auth_type = {{ RUCIO_CFG_AUTH_TYPE | default('x509_proxy') }}
username = {{ RUCIO_CFG_USERNAME | default('') }}
password = {{ RUCIO_CFG_PASSWORD | default('') }}
Expand Down
9 changes: 9 additions & 0 deletions linuxsupport7s-stable.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Example modified for cc7 taken from https://gitlab.cern.ch/linuxsupport/rpmci/-/blob/master/kojicli/linuxsupport8s-stable.repo
[linuxsupport7s-stable]
name=linuxsupport [stable]
baseurl=https://linuxsoft.cern.ch/cern/centos/7/cern/$basearch
enabled=1
gpgcheck=False
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-koji file:///etc/pki/rpm-gpg/RPM-GPG-KEY-kojiv2
priority=1
protect=1

0 comments on commit fc6e0e7

Please sign in to comment.