Skip to content

Update dependencies; Fix #425 #424

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.

Sign up for GitHub

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

Draft
Geogouz wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Update dependencies; Fix #425 #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e680127
Remove Oracle Instant Client from Dockerfiles
Geogouz Jul 17, 2025
8ac7e91
Fix typo in `ADD` command for `entrypoint.sh` in Dockerfile
Geogouz Jul 17, 2025
e96d82d
Remove unused `libnsl` and `libaio` from Dockerfile
Geogouz Jul 17, 2025
b9cd493
Migrate all Dockerfiles to use `python3-pip` and `python3-*` packages…
Geogouz Jul 17, 2025
0659a71
Remove `gcc` across the Dockerfiles
Geogouz Jul 17, 2025
6ed36af
Add license headers to Dockerfiles in `clients` and `init` directories
Geogouz Jul 17, 2025
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
8 changes: 7 additions & 1 deletion clients/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Copyright European Organization for Nuclear Research (CERN) 2025
#
# Licensed under the Apache License, Version 2.0 (the "License");
# You may not use this file except in compliance with the License.
# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0

FROM almalinux:9

ARG TAG
Expand Down Expand Up @@ -41,7 +47,7 @@ WORKDIR /home/user
# Add the default rucio configuration
ADD --chown=user:user rucio.default.cfg /opt/user/rucio.default.cfg
ADD init_rucio.sh /etc/profile.d/rucio_init.sh
ADD --chown=user;user ./entrypoint.sh /opt/user/entrypoint.sh
ADD --chown=user:user ./entrypoint.sh /opt/user/entrypoint.sh

ENV PATH $PATH:/opt/rucio/bin

Expand Down
18 changes: 2 additions & 16 deletions daemons/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ RUN dnf install -y epel-release.noarch && \
gfal2-plugin-http \
gfal2-plugin-srm \
gfal2-plugin-xrootd \
libnsl \
libaio \
patch \
python-gfal2 \
procps-ng \
python-pip \
python-mod_wsgi \
python3-pip \
python3-mod_wsgi \
sendmail \
sendmail-cf \
memcached \
Expand All @@ -34,18 +32,6 @@ RUN dnf install -y epel-release.noarch && \
dnf clean all && \
rm -rf /var/cache/dnf

# cx_oracle requires `gcc` and Python headers, not present by default on arm64
ARG TARGETARCH
RUN if [ $TARGETARCH = "arm64" ]; then \
dnf install -y \
gcc \
python3-devel \
; fi

RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \
echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \
ldconfig

RUN python3 -m pip install --no-cache-dir --upgrade pip && \
python3 -m pip install --no-cache-dir --upgrade setuptools
RUN python3 -m pip install --no-cache-dir --pre rucio[oracle,mysql,postgresql,globus]==$TAG
Expand Down
1 change: 0 additions & 1 deletion dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ RUN dnf -y install yum-utils epel-release.noarch && \
gridsite \
httpd \
krb5-devel \
libaio \
libtool-ltdl-devel \
libxml2-devel \
mariadb-connector-c \
Expand Down
2 changes: 1 addition & 1 deletion fts-cron/Dockerfile_cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN dnf update -y && \
dnf clean all && \
rm -rf /var/cache/dnf

RUN dnf -y install -y httpd python-pip python-mod_wsgi libaio gcc python-devel mod_ssl openssl-devel python3-m2crypto libnsl patch xrootd-client && \
RUN dnf -y install -y httpd python3-pip python3-mod_wsgi python3-devel mod_ssl openssl-devel python3-m2crypto patch xrootd-client && \
dnf clean all && \
rm -rf /var/cache/dnf

Expand Down
4 changes: 2 additions & 2 deletions fts-cron/Dockerfile_java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN dnf update -y && \
dnf clean all && \
rm -rf /var/cache/dnf

RUN dnf -y install httpd python-pip python-mod_wsgi libaio gcc python-devel mod_ssl openssl-devel python3-m2crypto libnsl patch xrootd-client && \
RUN dnf -y install httpd python3-pip python3-mod_wsgi python3-devel mod_ssl openssl-devel python3-m2crypto patch xrootd-client && \
dnf clean all && \
rm -rf /var/cache/dnf

Expand All @@ -25,7 +25,7 @@ RUN chmod +x /usr/bin/kubectl
# Install VOMS and FTS clients for delegating proxies
RUN dnf -y install ca-certificates.noarch ca-policy-lcg fetch-crl voms-clients-java fts-rest-cli \
wlcg-iam-lsc-atlas wlcg-iam-vomses-atlas wlcg-iam-lsc-cms wlcg-iam-vomses-cms \
python-pip python-setuptools python-requests && \
python3-pip python-setuptools python-requests && \
dnf clean all && \
rm -rf /var/cache/dnf

Expand Down
16 changes: 8 additions & 8 deletions init/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Copyright European Organization for Nuclear Research (CERN) 2025
#
# Licensed under the Apache License, Version 2.0 (the "License");
# You may not use this file except in compliance with the License.
# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0

FROM almalinux:9

ARG TAG
Expand All @@ -7,21 +13,15 @@ WORKDIR /tmp
RUN dnf install -y epel-release.noarch && \
dnf upgrade -y && \
dnf install -y \
gcc \
libnsl \
libaio \
openssl-devel \
mod_ssl \
procps-ng \
python-devel \
python3-devel \
python3-m2crypto \
python-pip && \
python3-pip && \
dnf clean all && \
rm -rf /var/cache/dnf

RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \
echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \
ldconfig
RUN python3 -m pip install --no-cache-dir --upgrade pip
RUN python3 -m pip install --no-cache-dir --upgrade setuptools
RUN python3 -m pip install --pre rucio[oracle,mysql,postgresql]==$TAG
Expand Down
11 changes: 2 additions & 9 deletions probes/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,13 @@ RUN dnf install -y epel-release.noarch && \
dnf upgrade -y && \
dnf install -y \
git \
gcc \
libnsl \
libaio \
openssl-devel \
procps-ng \
python-devel \
python-pip && \
python3-devel \
python3-pip && \
dnf clean all && \
rm -rf /var/cache/dnf

RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \
echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \
ldconfig

RUN rpm -i https://github.com/dshearer/jobber/releases/download/v1.4.0/jobber-1.4.0-1.el7.x86_64.rpm

RUN python3 -m pip install --no-cache-dir --upgrade pip
Expand Down
19 changes: 2 additions & 17 deletions server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,15 @@ RUN dnf install -y epel-release.noarch && \
dnf upgrade -y && \
dnf install -y \
gridsite \
libnsl \
libaio \
patch \
procps-ng \
python-pip \
python-mod_wsgi \
python3-pip \
python3-mod_wsgi \
memcached \
patchutils && \
dnf clean all && \
rm -rf /var/cache/dnf

# cx_oracle requires `gcc` and Python headers, not present by default on arm64
ARG TARGETARCH
RUN if [ $TARGETARCH = "arm64" ]; then \
dnf install -y \
gcc \
python3-devel \
; fi


RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \
echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \
ldconfig

RUN python3 -m pip install --no-cache-dir --upgrade pip && \
python3 -m pip install --no-cache-dir --upgrade setuptools
RUN python3 -m pip install --no-cache-dir --pre rucio[oracle,mysql,postgresql]==$TAG
Expand Down
3 changes: 1 addition & 2 deletions test-ssh/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ FROM almalinux:9
RUN dnf install -y epel-release.noarch && \
dnf upgrade -y && \
dnf install -y \
gcc \
openssh-server \
openssh-clients \
python-pip \
python3-pip \
rsync \
sudo \
unzip && \
Expand Down
10 changes: 2 additions & 8 deletions ui/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,19 @@ WORKDIR /tmp
RUN dnf install -y epel-release.noarch && \
dnf upgrade -y && \
dnf install -y \
gcc \
httpd \
libnsl \
libaio \
openssl-devel \
mod_ssl \
procps-ng \
python3-mod_wsgi \
python3-m2crypto \
python-devel \
python3-devel \
patch \
patchutils \
python-pip && \
python3-pip && \
dnf clean all && \
rm -rf /var/cache/dnf

RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \
echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \
ldconfig
RUN python3 -m pip install --no-cache-dir --upgrade pip
RUN python3 -m pip install --no-cache-dir --upgrade setuptools
RUN python3 -m pip install --no-cache-dir --pre rucio[oracle,mysql,postgresql]==$TAG
Expand Down
2 changes: 1 addition & 1 deletion webui/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN dnf -y update && \
dnf -y module reset nodejs && \
dnf -y module enable nodejs:20 && \
dnf -y module install nodejs:20/common && \
dnf -y install httpd mod_ssl python39 python-pip git procps patch patchutils && \
dnf -y install httpd mod_ssl python39 python3-pip git procps patch patchutils && \
dnf -y install wget && \
dnf clean all && \
rm -rf /var/cache/dnf
Expand Down