[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
abh3 · Dec 18, 2024 · e27d870 · e27d870
1 parent 9aaef78
commit e27d870
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 6 deletions.
diff --git a/docker/.dockerignore b/docker/.dockerignore
diff --git a/docker/build/Dockerfile.alma8 → docker/Dockerfile.alma8 b/docker/build/Dockerfile.alma8 → docker/Dockerfile.alma8
diff --git a/docker/build/Dockerfile.alma9 → docker/Dockerfile.alma9 b/docker/build/Dockerfile.alma9 → docker/Dockerfile.alma9
diff --git a/docker/build/Dockerfile.alpine → docker/Dockerfile.alpine b/docker/build/Dockerfile.alpine → docker/Dockerfile.alpine
diff --git a/docker/build/Dockerfile.debian → docker/Dockerfile.debian b/docker/build/Dockerfile.debian → docker/Dockerfile.debian
diff --git a/docker/build/Dockerfile.fedora → docker/Dockerfile.fedora b/docker/build/Dockerfile.fedora → docker/Dockerfile.fedora
diff --git a/docker/build/Dockerfile.ubuntu → docker/Dockerfile.ubuntu b/docker/build/Dockerfile.ubuntu → docker/Dockerfile.ubuntu
diff --git 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() {