Skip to content

Commit

Permalink
Removing EGI and WLCG yum configurations
Browse files Browse the repository at this point in the history
  • Loading branch information
dynamic-entropy committed Sep 1, 2023
1 parent a85debb commit 9f45749
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 20 deletions.
2 changes: 1 addition & 1 deletion build-rucio-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

export RUCIO_VERSION=1.31.6
export CMS_VERSION=${RUCIO_VERSION}.cms2
export CMS_VERSION=${RUCIO_VERSION}.cms3

export HARBOR=registry.cern.ch/cmsrucio

Expand Down
13 changes: 4 additions & 9 deletions docker/rucio-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,14 @@ ARG RUCIO_VERSION

FROM rucio/rucio-server:release-$RUCIO_VERSION

# Add CMS policy package
RUN mkdir -p /opt/rucio/policy/CMSRucioPolicy
COPY src/policy/CMSRucioPolicy/ /opt/rucio/policy/CMSRucioPolicy/

# FIXME: Probably don't need these anymore either
RUN yum -y install http://linuxsoft.cern.ch/wlcg/centos7/x86_64/wlcg-repo-1.0.0-1.el7.noarch.rpm && \
yum clean all && \
rm -rf /var/cache/yum
ADD http://repository.egi.eu/sw/production/cas/1/current/repo-files/EGI-trustanchors.repo /etc/yum.repos.d/egi.repo
RUN yum update -y && \
yum clean all && \
rm -rf /var/cache/yum

# Add CMS policy package
RUN mkdir -p /opt/rucio/policy/CMSRucioPolicy
COPY src/policy/CMSRucioPolicy/ /opt/rucio/policy/CMSRucioPolicy/

RUN mkdir -p /etc/grid-security && ln -s /cvmfs/grid.cern.ch/etc/grid-security/certificates /etc/grid-security/
ENV RUCIO_CA_PATH="/cvmfs/grid.cern.ch/etc/grid-security/certificates"
ADD docker/rucio-server/cms-entrypoint.sh /
Expand Down
14 changes: 4 additions & 10 deletions docker/rucio-ui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,14 @@
ARG RUCIO_VERSION
FROM rucio/rucio-ui:release-$RUCIO_VERSION

# Add CMS policy package
RUN mkdir -p /opt/rucio/policy/CMSRucioPolicy
COPY src/policy/CMSRucioPolicy /opt/rucio/policy/CMSRucioPolicy

# FIXME: Probably don't need this anymore
RUN yum -y install http://linuxsoft.cern.ch/wlcg/centos7/x86_64/wlcg-repo-1.0.0-1.el7.noarch.rpm \
&& yum clean all \
&& rm -rf /var/cache/yum

ADD http://repository.egi.eu/sw/production/cas/1/current/repo-files/EGI-trustanchors.repo /etc/yum.repos.d/egi.repo
RUN yum update -y \
&& yum clean all \
&& rm -rf /var/cache/yum

# Add CMS policy package
RUN mkdir -p /opt/rucio/policy/CMSRucioPolicy
COPY src/policy/CMSRucioPolicy /opt/rucio/policy/CMSRucioPolicy

RUN mkdir -p /etc/grid-security && ln -s /cvmfs/grid.cern.ch/etc/grid-security/certificates /etc/grid-security/

# Might get recreated if apache was upgraded
Expand Down

0 comments on commit 9f45749

Please sign in to comment.