docker: move dockerfiles into subdirectory

easier to get an automatic list of dists we build for

diff --git a/scripts/docker/alpine/Dockerfile b/scripts/docker/dists/alpine/Dockerfile
similarity index 100%
rename from scripts/docker/alpine/Dockerfile
rename to scripts/docker/dists/alpine/Dockerfile

diff --git a/scripts/docker/alpine/docker-entrypoint.sh b/scripts/docker/dists/alpine/docker-entrypoint.sh
similarity index 100%
rename from scripts/docker/alpine/docker-entrypoint.sh
rename to scripts/docker/dists/alpine/docker-entrypoint.sh

diff --git a/scripts/docker/centos7/Dockerfile b/scripts/docker/dists/centos7/Dockerfile
similarity index 100%
rename from scripts/docker/centos7/Dockerfile
rename to scripts/docker/dists/centos7/Dockerfile

diff --git a/scripts/docker/centos7/docker-entrypoint.sh b/scripts/docker/dists/centos7/docker-entrypoint.sh
similarity index 100%
rename from scripts/docker/centos7/docker-entrypoint.sh
rename to scripts/docker/dists/centos7/docker-entrypoint.sh

diff --git a/scripts/docker/debian10/Dockerfile b/scripts/docker/dists/debian10/Dockerfile
similarity index 100%
rename from scripts/docker/debian10/Dockerfile
rename to scripts/docker/dists/debian10/Dockerfile

diff --git a/scripts/docker/debian10/docker-entrypoint.sh b/scripts/docker/dists/debian10/docker-entrypoint.sh
similarity index 100%
rename from scripts/docker/debian10/docker-entrypoint.sh
rename to scripts/docker/dists/debian10/docker-entrypoint.sh

diff --git a/scripts/docker/debian11/Dockerfile b/scripts/docker/dists/debian11/Dockerfile
similarity index 100%
rename from scripts/docker/debian11/Dockerfile
rename to scripts/docker/dists/debian11/Dockerfile

diff --git a/scripts/docker/debian11/docker-entrypoint.sh b/scripts/docker/dists/debian11/docker-entrypoint.sh
similarity index 100%
rename from scripts/docker/debian11/docker-entrypoint.sh
rename to scripts/docker/dists/debian11/docker-entrypoint.sh

diff --git a/scripts/docker/debian12/Dockerfile b/scripts/docker/dists/debian12/Dockerfile
similarity index 100%
rename from scripts/docker/debian12/Dockerfile
rename to scripts/docker/dists/debian12/Dockerfile

diff --git a/scripts/docker/debian12/docker-entrypoint.sh b/scripts/docker/dists/debian12/docker-entrypoint.sh
similarity index 100%
rename from scripts/docker/debian12/docker-entrypoint.sh
rename to scripts/docker/dists/debian12/docker-entrypoint.sh

diff --git a/scripts/docker/debiansid/Dockerfile b/scripts/docker/dists/debiansid/Dockerfile
similarity index 100%
rename from scripts/docker/debiansid/Dockerfile
rename to scripts/docker/dists/debiansid/Dockerfile

diff --git a/scripts/docker/debiansid/docker-entrypoint.sh b/scripts/docker/dists/debiansid/docker-entrypoint.sh
similarity index 100%
rename from scripts/docker/debiansid/docker-entrypoint.sh
rename to scripts/docker/dists/debiansid/docker-entrypoint.sh

diff --git a/scripts/docker/rocky8/Dockerfile b/scripts/docker/dists/rocky8/Dockerfile
similarity index 100%
rename from scripts/docker/rocky8/Dockerfile
rename to scripts/docker/dists/rocky8/Dockerfile

diff --git a/scripts/docker/rocky8/docker-entrypoint.sh b/scripts/docker/dists/rocky8/docker-entrypoint.sh
similarity index 100%
rename from scripts/docker/rocky8/docker-entrypoint.sh
rename to scripts/docker/dists/rocky8/docker-entrypoint.sh

diff --git a/scripts/docker/rocky9/Dockerfile b/scripts/docker/dists/rocky9/Dockerfile
similarity index 100%
rename from scripts/docker/rocky9/Dockerfile
rename to scripts/docker/dists/rocky9/Dockerfile

diff --git a/scripts/docker/rocky9/docker-entrypoint.sh b/scripts/docker/dists/rocky9/docker-entrypoint.sh
similarity index 100%
rename from scripts/docker/rocky9/docker-entrypoint.sh
rename to scripts/docker/dists/rocky9/docker-entrypoint.sh

diff --git a/scripts/docker/ubuntu18/Dockerfile b/scripts/docker/dists/ubuntu18/Dockerfile
similarity index 100%
rename from scripts/docker/ubuntu18/Dockerfile
rename to scripts/docker/dists/ubuntu18/Dockerfile

diff --git a/scripts/docker/ubuntu18/docker-entrypoint.sh b/scripts/docker/dists/ubuntu18/docker-entrypoint.sh
similarity index 100%
rename from scripts/docker/ubuntu18/docker-entrypoint.sh
rename to scripts/docker/dists/ubuntu18/docker-entrypoint.sh

diff --git a/scripts/docker/ubuntu20/Dockerfile b/scripts/docker/dists/ubuntu20/Dockerfile
similarity index 100%
rename from scripts/docker/ubuntu20/Dockerfile
rename to scripts/docker/dists/ubuntu20/Dockerfile

diff --git a/scripts/docker/ubuntu20/docker-entrypoint.sh b/scripts/docker/dists/ubuntu20/docker-entrypoint.sh
similarity index 100%
rename from scripts/docker/ubuntu20/docker-entrypoint.sh
rename to scripts/docker/dists/ubuntu20/docker-entrypoint.sh

diff --git a/scripts/docker/ubuntu22/Dockerfile b/scripts/docker/dists/ubuntu22/Dockerfile
similarity index 100%
rename from scripts/docker/ubuntu22/Dockerfile
rename to scripts/docker/dists/ubuntu22/Dockerfile

diff --git a/scripts/docker/ubuntu22/docker-entrypoint.sh b/scripts/docker/dists/ubuntu22/docker-entrypoint.sh
similarity index 100%
rename from scripts/docker/ubuntu22/docker-entrypoint.sh
rename to scripts/docker/dists/ubuntu22/docker-entrypoint.sh

diff --git a/scripts/docker/ubuntu24/Dockerfile b/scripts/docker/dists/ubuntu24/Dockerfile
similarity index 100%
rename from scripts/docker/ubuntu24/Dockerfile
rename to scripts/docker/dists/ubuntu24/Dockerfile

diff --git a/scripts/docker/docker.mk b/scripts/docker/docker.mk
index 3d73842e75ca166f5d7a1c2511f0c698e008d258..a1f0c998ad883caf1573db6303326c4e16ac88bd 100644 (file)
--- a/scripts/docker/docker.mk
+++ b/scripts/docker/docker.mk
@@ -42,6 +42,7 @@ DOCKER_REGISTRY :=
 #
 #  Location of Docker-related files
 DOCKER_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+DIST_DIR := $(DOCKER_DIR)/dists
 
 ifeq "${VERBOSE}" ""
     Q=@
@@ -64,14 +65,14 @@ endif
 #
 
 define ADD_DOCKER_REGEN
-    $$(DOCKER_DIR)/${1}/Dockerfile: $(DOCKER_DIR)/m4/Dockerfile.m4 $(DOCKER_DIR)/m4/Dockerfile.deb.m4 $(DOCKER_DIR)/m4/Dockerfile.rpm.m4 $(DOCKER_DIR)/docker.mk
+    $$(DIST_DIR)/${1}/Dockerfile: $(DOCKER_DIR)/m4/Dockerfile.m4 $(DOCKER_DIR)/m4/Dockerfile.deb.m4 $(DOCKER_DIR)/m4/Dockerfile.rpm.m4 $(DOCKER_DIR)/docker.mk
        $$(Q)echo REGEN ${1}/Dockerfile
        $$(Q)m4 -I $(DOCKER_DIR)/m4 -D D_NAME=${1} -D D_TYPE=docker $$< > $$@
 
-    DOCKER_DOCKERFILES += $$(DOCKER_DIR)/${1}/Dockerfile
+    DOCKER_DOCKERFILES += $$(DIST_DIR)/${1}/Dockerfile
 
     .PHONY: docker.${1}.regen
-    docker.${1}.regen: $$(DOCKER_DIR)/${1}/Dockerfile
+    docker.${1}.regen: $$(DIST_DIR)/${1}/Dockerfile
 endef
 
 $(eval $(call ADD_DOCKER_REGEN,debian10,deb,debian:buster,debian,10,buster))