From 7e4fb42264d27ef3d9c4dc45cc45d3bc72796e74 Mon Sep 17 00:00:00 2001 From: Benedikt Ziemons Date: Fri, 16 Jan 2026 09:41:15 +0100 Subject: [PATCH] refactor(Containers): Prepend docker.io as namespace for FROM clauses Closes: #473 --- clients/Dockerfile | 2 +- daemons/Dockerfile | 2 +- dev/Dockerfile | 2 +- fs/Dockerfile | 2 +- fts-cron/Dockerfile_cpp | 2 +- fts-cron/Dockerfile_java | 2 +- init/Dockerfile | 2 +- probes/Dockerfile | 2 +- server/Dockerfile | 2 +- test-fts/Dockerfile | 2 +- test-ssh/Dockerfile | 2 +- test-webdav/Dockerfile | 4 ++-- test-xrootd-noauth/Dockerfile | 2 +- test-xrootd/Dockerfile | 2 +- ui/Dockerfile | 2 +- webui/Dockerfile | 4 ++-- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/clients/Dockerfile b/clients/Dockerfile index 44e00a18..64c2edbe 100644 --- a/clients/Dockerfile +++ b/clients/Dockerfile @@ -1,4 +1,4 @@ -FROM almalinux:9 +FROM docker.io/almalinux:9 ARG TAG diff --git a/daemons/Dockerfile b/daemons/Dockerfile index 287598c8..f73a497a 100644 --- a/daemons/Dockerfile +++ b/daemons/Dockerfile @@ -4,7 +4,7 @@ # 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 +FROM docker.io/almalinux:9 ARG TAG diff --git a/dev/Dockerfile b/dev/Dockerfile index 6ea73d35..9e599033 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM almalinux:9 +FROM docker.io/almalinux:9 ARG TAG="master" diff --git a/fs/Dockerfile b/fs/Dockerfile index ac069864..ca314093 100644 --- a/fs/Dockerfile +++ b/fs/Dockerfile @@ -1,5 +1,5 @@ ARG TAG -FROM rucio/rucio-clients:release-$TAG +FROM docker.io/rucio/rucio-clients:release-$TAG USER root RUN dnf -y install \ diff --git a/fts-cron/Dockerfile_cpp b/fts-cron/Dockerfile_cpp index 358ad637..46ae7d7b 100644 --- a/fts-cron/Dockerfile_cpp +++ b/fts-cron/Dockerfile_cpp @@ -1,4 +1,4 @@ -FROM almalinux:9 +FROM docker.io/almalinux:9 # Repos needed for (VOMS and FTS) and WLCG certs ADD ca.repo /etc/yum.repos.d/ca.repo diff --git a/fts-cron/Dockerfile_java b/fts-cron/Dockerfile_java index 45c3e792..9919ca14 100644 --- a/fts-cron/Dockerfile_java +++ b/fts-cron/Dockerfile_java @@ -1,4 +1,4 @@ -FROM almalinux:9 +FROM docker.io/almalinux:9 # Repos needed for (VOMS and FTS) and WLCG certs ADD ca.repo /etc/yum.repos.d/ca.repo diff --git a/init/Dockerfile b/init/Dockerfile index 71c16ca7..1aafb73b 100644 --- a/init/Dockerfile +++ b/init/Dockerfile @@ -1,4 +1,4 @@ -FROM almalinux:9 +FROM docker.io/almalinux:9 ARG TAG diff --git a/probes/Dockerfile b/probes/Dockerfile index cb81ccaf..7ed3a429 100644 --- a/probes/Dockerfile +++ b/probes/Dockerfile @@ -7,7 +7,7 @@ # Authors: # - Eric Vaandering, , 2020 -FROM almalinux:9 +FROM docker.io/almalinux:9 WORKDIR /tmp ADD oic.rpm /tmp diff --git a/server/Dockerfile b/server/Dockerfile index 39d6b308..2b487dcf 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -4,7 +4,7 @@ # 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 +FROM docker.io/almalinux:9 ARG TAG diff --git a/test-fts/Dockerfile b/test-fts/Dockerfile index ad8fb825..df8601f7 100644 --- a/test-fts/Dockerfile +++ b/test-fts/Dockerfile @@ -1,4 +1,4 @@ -FROM almalinux:9 +FROM docker.io/almalinux:9 # Enable EPEL RUN dnf install -y yum-utils \ diff --git a/test-ssh/Dockerfile b/test-ssh/Dockerfile index 85ca864f..92964d07 100644 --- a/test-ssh/Dockerfile +++ b/test-ssh/Dockerfile @@ -1,4 +1,4 @@ -FROM almalinux:9 +FROM docker.io/almalinux:9 ARG OPENSSH_SERVER_VERSION= ARG OPENSSH_CLIENTS_VERSION= diff --git a/test-webdav/Dockerfile b/test-webdav/Dockerfile index d2d6cb65..b378765d 100644 --- a/test-webdav/Dockerfile +++ b/test-webdav/Dockerfile @@ -1,5 +1,5 @@ -FROM ubuntu:noble as deb_builder +FROM docker.io/ubuntu:noble as deb_builder RUN set -ex; \ apt-get update; \ apt-get install -y \ @@ -19,7 +19,7 @@ COPY libapache2-mod-gsiproxy mod-gsiproxy RUN cd mod-gsiproxy; dpkg-buildpackage -FROM ubuntu:noble +FROM docker.io/ubuntu:noble # Optional package version pinning for reproducible images. # When APACHE2_VERSION is set, all related package versions must be provided. diff --git a/test-xrootd-noauth/Dockerfile b/test-xrootd-noauth/Dockerfile index 9b8a0193..864304df 100644 --- a/test-xrootd-noauth/Dockerfile +++ b/test-xrootd-noauth/Dockerfile @@ -1,4 +1,4 @@ -FROM almalinux:9 +FROM docker.io/almalinux:9 # Optional version pinning for reproducible images. # When `XROOTD_VERSION` is provided (e.g. `5.9.1-1.el9`), we install diff --git a/test-xrootd/Dockerfile b/test-xrootd/Dockerfile index d12a6aa2..419c39aa 100644 --- a/test-xrootd/Dockerfile +++ b/test-xrootd/Dockerfile @@ -1,4 +1,4 @@ -FROM almalinux:9 +FROM docker.io/almalinux:9 # Optional version pinning for reproducible images. # When `XROOTD_VERSION` is provided (e.g. `5.7.0-1.el9`), we install diff --git a/ui/Dockerfile b/ui/Dockerfile index f5c82b43..b62eff27 100644 --- a/ui/Dockerfile +++ b/ui/Dockerfile @@ -7,7 +7,7 @@ # Authors: # - Thomas Beermann, , 2019 -FROM almalinux:9 +FROM docker.io/almalinux:9 ARG TAG diff --git a/webui/Dockerfile b/webui/Dockerfile index 5083e18f..42e1247a 100644 --- a/webui/Dockerfile +++ b/webui/Dockerfile @@ -9,7 +9,7 @@ # - Eraldo Junior , 2023 # ---------- Stage 1: builder (clone repo & install node deps) ---------- -FROM almalinux:10 AS builder +FROM docker.io/almalinux:10 AS builder ARG TAG @@ -39,7 +39,7 @@ RUN npm install --include=dev && npx tsc --skipLibCheck && cp -rf src/templates WORKDIR /opt/rucio/webui # ---------- Stage 2: runtime ---------- -FROM almalinux:10 +FROM docker.io/almalinux:10 LABEL stage=production ENV NODE_ENV=production