Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update all the rest of containers to v34 rucio #285

Merged
merged 3 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions containers/iam-rucio-sync/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# ARG TAG should be updated with the latest-1 version in case no tag is provided
ARG TAG=v1.0.0-rc.1
ARG TAG=v1.0.0-rc.2
ARG BUILD_DATE

# To be changed to specific version+hsa
FROM ghcr.io/vre-hub/vre-base-ops:${TAG}
LABEL maintainer="VRE Team @ CERN 22/23 - E. Garcia, E. Gazzarrini, D. Gosein"
LABEL maintainer="VRE Team @ CERN 23/24 - E. Garcia, G. Guerrieri"
LABEL org.opencontainers.image.source https://github.com/vre-hub/vre
LABEL org.label-schema.build-date=${BUILD_DATE}

Expand Down
26 changes: 14 additions & 12 deletions containers/rucio-client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 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 BASETAG=release-34.6.0
ARG BUILD_DATE

FROM ${BASEIMAGE}:${BASETAG}
Expand All @@ -11,26 +11,28 @@ LABEL org.label-schema.build-date=${BUILD_DATE}

USER root

# Install epel-relaseas
RUN dnf install -y epel-release

# cleanup yum cache
RUN yum upgrade -y \
&& yum clean all \
&& rm -rf /var/cache/yum
RUN dnf upgrade -y \
&& dnf clean all \
&& rm -rf /var/cache/dnf

# install useful tools
RUN yum -y install git htop wget
RUN pip install --upgrade pip
RUN dnf -y install git htop wget
RUN python3 -m 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 -y install ca-certificates ca-policy-egi-core
RUN dnf -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
RUN dnf -y --repofrompath='tmpcern,https://linuxsoft.cern.ch/cern/alma/$releasever/CERN/$basearch/' upgrade almalinux-release --nogpgcheck
RUN dnf install -y CERN-CA-certs

# ESCAPE VOMS setup
RUN mkdir -p /etc/vomses \
Expand All @@ -40,13 +42,13 @@ RUN mkdir -p /etc/vomses \

# install reana-client
ENV LC_ALL=en_US.UTF-8
RUN pip install reana-client==0.9.2
RUN pip install reana-client==0.9.3

USER user
WORKDIR /home/user

# ESCAPE Rucio client configuration
ADD --chown=user:user rucio.cfg.escape.j2 /opt/user/rucio.cfg.j2
# Overwrite rucio.default.cfg with the ESCAPE default config file
ADD --chown=user:user rucio.default.cfg.escape /opt/user/rucio.default.cfg

ENTRYPOINT ["/bin/bash"]
9 changes: 0 additions & 9 deletions containers/rucio-client/linuxsupport7s-stable.repo

This file was deleted.

24 changes: 0 additions & 24 deletions containers/rucio-client/rucio.cfg.escape.j2

This file was deleted.

2 changes: 1 addition & 1 deletion containers/rucio-client/rucio.default.cfg.escape
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ auth_oidc_refresh_activate = true
permission = escape
schema = escape
lfn2pfn_algorithm_default = hash
support = https://github.com/rucio/rucio/issues/
support = https://github.com/vre-hub/vre/issues
support_rucio = https://github.com/rucio/rucio/issues/
6 changes: 3 additions & 3 deletions containers/rucio-noise/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# ARG TAG should be updated with the latest-1 version in case no tag is provided
ARG TAG=v1.0.0-rc.1
ARG TAG=v1.0.0-rc.2
ARG BUILD_DATE

FROM ghcr.io/vre-hub/vre-base-ops:${TAG}
LABEL maintainer="VRE Team @ CERN 22/23 - E. Garcia, E. Gazzarrini, D. Gosein"
LABEL maintainer="VRE Team @ CERN 23/24 - E. Garcia, G. Guerrieri"
LABEL org.opencontainers.image.source https://github.com/vre-hub/vre
LABEL org.label-schema.build-date=${BUILD_DATE}

# Workdir is /home
COPY produce_noise.sh requirements.txt rses.txt /home/
RUN chmod +x ./produce_noise.sh
RUN pip install -r /home/requirements.txt
RUN python -m pip install -r /home/requirements.txt

ENTRYPOINT ["/bin/bash"]