From e27d87064ee5ed04860f3726d6fdd94c807ae617 Mon Sep 17 00:00:00 2001
From: Guilherme Amadio <amadio@cern.ch>
Date: Wed, 18 Dec 2024 16:28:30 +0100
Subject: [PATCH] [Docker] Update docker/ subdirectory setup and xrd-docker
 script

- Prefer podman instead of docker
- Remove .dockerfile which is no longer needed
- Move Dockerfiles up one directory level to simplify structure
---
 docker/.dockerignore                 |  1 -
 docker/{build => }/Dockerfile.alma8  |  0
 docker/{build => }/Dockerfile.alma9  |  0
 docker/{build => }/Dockerfile.alpine |  0
 docker/{build => }/Dockerfile.debian |  0
 docker/{build => }/Dockerfile.fedora |  0
 docker/{build => }/Dockerfile.ubuntu |  0
 docker/xrd-docker                    | 10 +++++-----
 8 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 docker/.dockerignore
 rename docker/{build => }/Dockerfile.alma8 (100%)
 rename docker/{build => }/Dockerfile.alma9 (100%)
 rename docker/{build => }/Dockerfile.alpine (100%)
 rename docker/{build => }/Dockerfile.debian (100%)
 rename docker/{build => }/Dockerfile.fedora (100%)
 rename docker/{build => }/Dockerfile.ubuntu (100%)

diff --git a/docker/.dockerignore b/docker/.dockerignore
deleted file mode 100644
index 8fce603003c..00000000000
--- a/docker/.dockerignore
+++ /dev/null
@@ -1 +0,0 @@
-data/
diff --git a/docker/build/Dockerfile.alma8 b/docker/Dockerfile.alma8
similarity index 100%
rename from docker/build/Dockerfile.alma8
rename to docker/Dockerfile.alma8
diff --git a/docker/build/Dockerfile.alma9 b/docker/Dockerfile.alma9
similarity index 100%
rename from docker/build/Dockerfile.alma9
rename to docker/Dockerfile.alma9
diff --git a/docker/build/Dockerfile.alpine b/docker/Dockerfile.alpine
similarity index 100%
rename from docker/build/Dockerfile.alpine
rename to docker/Dockerfile.alpine
diff --git a/docker/build/Dockerfile.debian b/docker/Dockerfile.debian
similarity index 100%
rename from docker/build/Dockerfile.debian
rename to docker/Dockerfile.debian
diff --git a/docker/build/Dockerfile.fedora b/docker/Dockerfile.fedora
similarity index 100%
rename from docker/build/Dockerfile.fedora
rename to docker/Dockerfile.fedora
diff --git a/docker/build/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu
similarity index 100%
rename from docker/build/Dockerfile.ubuntu
rename to docker/Dockerfile.ubuntu
diff --git a/docker/xrd-docker b/docker/xrd-docker
index 20bc6d751eb..3b74397b0ab 100755
--- a/docker/xrd-docker
+++ b/docker/xrd-docker
@@ -2,13 +2,13 @@
 
 trap 'exit 1' TERM KILL INT QUIT ABRT
 
-: ${DOCKER:=$(command -v docker || command -v podman)}
+: ${DOCKER:=$(command -v podman || command -v docker)}
 
 build() {
 	OS=${1:-alma9}
 	[[ -f xrootd.tar.gz ]] || package
-	[[ -f build/Dockerfile.${OS} ]] || die "unknwon OS: $OS"
-	${DOCKER} build -f build/Dockerfile.${OS} -t xrootd -t xrootd:${OS} .
+	[[ -f Dockerfile.${OS} ]] || die "unknwon OS: $OS"
+	${DOCKER} build -f Dockerfile.${OS} -t xrootd -t xrootd:${OS} .
 }
 
 
@@ -17,8 +17,8 @@ buildx() {
 	ARCH=${2:-amd64}
 	ARCH=${ARCH/linux\/}
 	[[ -f xrootd.tar.gz ]] || package
-	[[ -f build/Dockerfile.${OS} ]] || die "unknwon OS: $OS"
-	${DOCKER} buildx build --platform linux/${ARCH} -f build/Dockerfile.${OS} -t xrootd:${OS}-${ARCH/\/} .
+	[[ -f Dockerfile.${OS} ]] || die "unknwon OS: $OS"
+	${DOCKER} buildx build --platform linux/${ARCH} -f Dockerfile.${OS} -t xrootd:${OS}-${ARCH/\/} .
 }
 
 qemu() {