From d4133a3c63778d177aa76d399746f80671690354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= <nicolas.masse@itix.fr>
Date: Fri, 6 Mar 2026 18:00:55 +0100
Subject: [PATCH] split Containerfile in two

---
 Containerfile      | 34 ----------------------------------
 Containerfile.base | 14 ++++++++++++++
 Containerfile.sync | 21 +++++++++++++++++++++
 build.sh           |  4 ++++
 4 files changed, 39 insertions(+), 34 deletions(-)
 delete mode 100644 Containerfile
 create mode 100644 Containerfile.base
 create mode 100644 Containerfile.sync

diff --git a/Containerfile b/Containerfile
deleted file mode 100644
index a800110..0000000
--- a/Containerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM registry.fedoraproject.org/fedora:latest
-
-# Variables for URLs and versions
-ARG CENTOS_VERSION=10
-ARG EPEL_VERSION=10
-ARG RSYNC_MIRROR=rsync://mirror.in2p3.fr
-ARG CENTOS_PATH=/pub/linux/centos-stream/${CENTOS_VERSION}-stream/
-ARG EPEL_PATH=/pub/epel/${EPEL_VERSION}/
-
-# Install required tools
-RUN dnf install -y rsync nginx && \
-    dnf clean all
-
-# Copy exclusions file
-COPY rsync-excludes.txt /etc/rsync-excludes.txt
-
-# Build rsync options and sync repositories
-RUN <<EOR
-set -Eeuo pipefail
-mkdir -p /var/www/centos/${CENTOS_VERSION}-stream
-mkdir -p /var/www/epel/${EPEL_VERSION}
-RSYNC_OPTS="-azH --progress --delete --exclude-from=/etc/rsync-excludes.txt"
-rsync ${RSYNC_OPTS} ${RSYNC_MIRROR}${CENTOS_PATH} /var/www/centos/${CENTOS_VERSION}-stream/
-rsync ${RSYNC_OPTS} ${RSYNC_MIRROR}${EPEL_PATH} /var/www/epel/${EPEL_VERSION}/
-EOR
-
-# Configure nginx
-COPY nginx.conf /etc/nginx/nginx.conf
-
-# Expose port 8080
-EXPOSE 8080
-
-# Start nginx in foreground mode
-CMD ["nginx", "-g", "daemon off;"]
diff --git a/Containerfile.base b/Containerfile.base
new file mode 100644
index 0000000..02448c2
--- /dev/null
+++ b/Containerfile.base
@@ -0,0 +1,14 @@
+FROM registry.fedoraproject.org/fedora:latest
+
+# Install required tools
+RUN dnf install -y rsync nginx && \
+    dnf clean all
+
+# Configure nginx
+COPY nginx.conf /etc/nginx/nginx.conf
+
+# Expose port 8080
+EXPOSE 8080
+
+# Start nginx in foreground mode
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/Containerfile.sync b/Containerfile.sync
new file mode 100644
index 0000000..500ebd8
--- /dev/null
+++ b/Containerfile.sync
@@ -0,0 +1,21 @@
+FROM replaceme:latest
+
+# Variables for URLs and versions
+ARG CENTOS_VERSION=10 \
+    EPEL_VERSION=10 \
+    RSYNC_MIRROR=rsync://mirror.in2p3.fr \
+    CENTOS_PATH=/pub/linux/centos-stream \
+    EPEL_PATH=/pub/epel
+
+# Copy exclusions file
+COPY rsync-excludes.txt /etc/rsync-excludes.txt
+
+# Build rsync options and sync repositories
+RUN <<EOR
+set -Eeuo pipefail
+mkdir -p /var/www/centos/${CENTOS_VERSION}-stream
+mkdir -p /var/www/epel/${EPEL_VERSION}
+RSYNC_OPTS="-azH --progress --delete --exclude-from=/etc/rsync-excludes.txt"
+rsync ${RSYNC_OPTS} ${RSYNC_MIRROR}${CENTOS_PATH}/${CENTOS_VERSION}-stream/ /var/www/centos/${CENTOS_VERSION}-stream/
+rsync ${RSYNC_OPTS} ${RSYNC_MIRROR}${EPEL_PATH}/${EPEL_VERSION}/ /var/www/epel/${EPEL_VERSION}/
+EOR
diff --git a/build.sh b/build.sh
index 9323a95..ec37f5b 100755
--- a/build.sh
+++ b/build.sh
@@ -16,10 +16,14 @@ PODMAN_ARGS+=( -t "localhost/mirrors/centos-stream-${CENTOS_VERSION}:${TS}" )
 # Run rsync on the previous dataset if available, to speed up transfer and save on storage.
 if podman image inspect "localhost/mirrors/centos-stream-${CENTOS_VERSION}:latest" &>/dev/null; then
   PODMAN_ARGS+=( --from "localhost/mirrors/centos-stream-${CENTOS_VERSION}:latest" )
+  PODMAN_ARGS+=( --file Containerfile.sync )
+else
+  PODMAN_ARGS+=( --file Containerfile.base )
 fi
 
 # Build the image.
 # Note: during the build, the repositories will be synced and the result will be stored in the image.
+echo podman build "${PODMAN_ARGS[@]}" .
 podman build "${PODMAN_ARGS[@]}" .
 podman tag "localhost/mirrors/centos-stream-${CENTOS_VERSION}:${TS}" "localhost/mirrors/centos-stream-${CENTOS_VERSION}:latest"