docker: fix build commit and add help target

diff --git a/scripts/docker/dists/centos7/Dockerfile b/scripts/docker/dists/centos7/Dockerfile
index 3b68b85649f3a64045aba543743484718ce6a5e6..3140a15beae85a27f065f4d3f1ef2e10398f6db7 100644 (file)
--- a/scripts/docker/dists/centos7/Dockerfile
+++ b/scripts/docker/dists/centos7/Dockerfile
@@ -34,7 +34,10 @@ COPY . .
 RUN git clean -fdxx \
  && git reset --hard HEAD
 
-RUN [ -z "$release" ] || git checkout ${release}
+ARG release
+RUN [ -z "$release" ] || git checkout ${release} ; \
+    git status ; \
+    git log -1 --oneline
 
 #
 #  Other requirements

diff --git a/scripts/docker/dists/debian10/Dockerfile b/scripts/docker/dists/debian10/Dockerfile
index c12b6943ca0d1f412725b2ba6016a1fd6846ab99..5e9e9a5fcc285930e22a40f73a8810f82c78c362 100644 (file)
--- a/scripts/docker/dists/debian10/Dockerfile
+++ b/scripts/docker/dists/debian10/Dockerfile
@@ -32,7 +32,10 @@ COPY . .
 RUN git clean -fdxx \
  && git reset --hard HEAD
 
-RUN [ -z "$release" ] || git checkout ${release}
+ARG release
+RUN [ -z "$release" ] || git checkout ${release} ; \
+    git status ; \
+    git log -1 --oneline
 
 #
 #  Install build dependencies

diff --git a/scripts/docker/dists/debian11/Dockerfile b/scripts/docker/dists/debian11/Dockerfile
index db53e521fbc2ddba19da12241b147e2ca2c293aa..f709d95fe4a4024db66e3563ce4fd94f4024a6a2 100644 (file)
--- a/scripts/docker/dists/debian11/Dockerfile
+++ b/scripts/docker/dists/debian11/Dockerfile
@@ -32,7 +32,10 @@ COPY . .
 RUN git clean -fdxx \
  && git reset --hard HEAD
 
-RUN [ -z "$release" ] || git checkout ${release}
+ARG release
+RUN [ -z "$release" ] || git checkout ${release} ; \
+    git status ; \
+    git log -1 --oneline
 
 #
 #  Install build dependencies

diff --git a/scripts/docker/dists/debian12/Dockerfile b/scripts/docker/dists/debian12/Dockerfile
index 18151550195ef55f58e8e2c381b6fd37d1fd4bce..609e8ae49535c9df6aa783d31421c765039216b7 100644 (file)
--- a/scripts/docker/dists/debian12/Dockerfile
+++ b/scripts/docker/dists/debian12/Dockerfile
@@ -32,7 +32,10 @@ COPY . .
 RUN git clean -fdxx \
  && git reset --hard HEAD
 
-RUN [ -z "$release" ] || git checkout ${release}
+ARG release
+RUN [ -z "$release" ] || git checkout ${release} ; \
+    git status ; \
+    git log -1 --oneline
 
 #
 #  Install build dependencies

diff --git a/scripts/docker/dists/debiansid/Dockerfile b/scripts/docker/dists/debiansid/Dockerfile
index 5194cd0bc29cc15fb70347c9e12dc193efa8edce..862a421da9f09ea188b5c453a41659d81366402f 100644 (file)
--- a/scripts/docker/dists/debiansid/Dockerfile
+++ b/scripts/docker/dists/debiansid/Dockerfile
@@ -32,7 +32,10 @@ COPY . .
 RUN git clean -fdxx \
  && git reset --hard HEAD
 
-RUN [ -z "$release" ] || git checkout ${release}
+ARG release
+RUN [ -z "$release" ] || git checkout ${release} ; \
+    git status ; \
+    git log -1 --oneline
 
 #
 #  Install build dependencies

diff --git a/scripts/docker/dists/rocky8/Dockerfile b/scripts/docker/dists/rocky8/Dockerfile
index 78485b8c18bfd483f735c2367167b579ba0e3926..4dcb92e940f34b47972a1079430688dc1413ce2d 100644 (file)
--- a/scripts/docker/dists/rocky8/Dockerfile
+++ b/scripts/docker/dists/rocky8/Dockerfile
@@ -39,7 +39,10 @@ COPY . .
 RUN git clean -fdxx \
  && git reset --hard HEAD
 
-RUN [ -z "$release" ] || git checkout ${release}
+ARG release
+RUN [ -z "$release" ] || git checkout ${release} ; \
+    git status ; \
+    git log -1 --oneline
 
 #
 #  Other requirements

diff --git a/scripts/docker/dists/rocky9/Dockerfile b/scripts/docker/dists/rocky9/Dockerfile
index 5e89ad73488124555a3a9e452ef34f6f9008450c..0f57010bde70f007430fc4750fb35779fc906c34 100644 (file)
--- a/scripts/docker/dists/rocky9/Dockerfile
+++ b/scripts/docker/dists/rocky9/Dockerfile
@@ -39,7 +39,10 @@ COPY . .
 RUN git clean -fdxx \
  && git reset --hard HEAD
 
-RUN [ -z "$release" ] || git checkout ${release}
+ARG release
+RUN [ -z "$release" ] || git checkout ${release} ; \
+    git status ; \
+    git log -1 --oneline
 
 #
 #  Other requirements

diff --git a/scripts/docker/dists/ubuntu18/Dockerfile b/scripts/docker/dists/ubuntu18/Dockerfile
index d9aaeb628a225d971998c0047d333b63177cfbc7..4e3263265b818f54d29e1a41dc504c8401cfc4c4 100644 (file)
--- a/scripts/docker/dists/ubuntu18/Dockerfile
+++ b/scripts/docker/dists/ubuntu18/Dockerfile
@@ -32,7 +32,10 @@ COPY . .
 RUN git clean -fdxx \
  && git reset --hard HEAD
 
-RUN [ -z "$release" ] || git checkout ${release}
+ARG release
+RUN [ -z "$release" ] || git checkout ${release} ; \
+    git status ; \
+    git log -1 --oneline
 
 #
 #  Install build dependencies

diff --git a/scripts/docker/dists/ubuntu20/Dockerfile b/scripts/docker/dists/ubuntu20/Dockerfile
index 19981b247c3f89c2798362d3ef0bedf6f66fe068..4a3bbf49a514cb00720a6209708e125314ca733c 100644 (file)
--- a/scripts/docker/dists/ubuntu20/Dockerfile
+++ b/scripts/docker/dists/ubuntu20/Dockerfile
@@ -32,7 +32,10 @@ COPY . .
 RUN git clean -fdxx \
  && git reset --hard HEAD
 
-RUN [ -z "$release" ] || git checkout ${release}
+ARG release
+RUN [ -z "$release" ] || git checkout ${release} ; \
+    git status ; \
+    git log -1 --oneline
 
 #
 #  Install build dependencies

diff --git a/scripts/docker/dists/ubuntu22/Dockerfile b/scripts/docker/dists/ubuntu22/Dockerfile
index 5c2cd11d8213373ad1eacdd95f4a87c3c81ef3f8..778112aa1b9c0b4ef5bb6cbb6f9a00c6dc4ed5c5 100644 (file)
--- a/scripts/docker/dists/ubuntu22/Dockerfile
+++ b/scripts/docker/dists/ubuntu22/Dockerfile
@@ -32,7 +32,10 @@ COPY . .
 RUN git clean -fdxx \
  && git reset --hard HEAD
 
-RUN [ -z "$release" ] || git checkout ${release}
+ARG release
+RUN [ -z "$release" ] || git checkout ${release} ; \
+    git status ; \
+    git log -1 --oneline
 
 #
 #  Install build dependencies

diff --git a/scripts/docker/dists/ubuntu24/Dockerfile b/scripts/docker/dists/ubuntu24/Dockerfile
index 98d3eb3c2ed8c3ad48f807072f38c66b1a0a6602..ad4520ec3e6c16c5bfbcd085a7d3b0d87b901972 100644 (file)
--- a/scripts/docker/dists/ubuntu24/Dockerfile
+++ b/scripts/docker/dists/ubuntu24/Dockerfile
@@ -32,7 +32,10 @@ COPY . .
 RUN git clean -fdxx \
  && git reset --hard HEAD
 
-RUN [ -z "$release" ] || git checkout ${release}
+ARG release
+RUN [ -z "$release" ] || git checkout ${release} ; \
+    git status ; \
+    git log -1 --oneline
 
 #
 #  Install build dependencies

diff --git a/scripts/docker/docker.mk b/scripts/docker/docker.mk
index 77e2310f70f8c10779c9a6373d4652192a025e72..45bd02b9c8e63e99df0850a14ebecfafe5cf9a3a 100644 (file)
--- a/scripts/docker/docker.mk
+++ b/scripts/docker/docker.mk
@@ -25,8 +25,8 @@
 #  version, DOCKER_COMMIT _must_ also be set.
 DOCKER_VERSION := $(RADIUSD_VERSION_STRING)
 #
-#  Commit hash/tag/branch to build, will be taken from VERSION above if not overridden, e.g. "release_3_2_0"
-DOCKER_COMMIT := release_$(shell echo $(DOCKER_VERSION) | tr .- __)
+#  Commit hash/tag/branch to build, if not set then HEAD will be used.
+DOCKER_COMMIT :=
 #
 #  Build args, most likely "--no-cache"
 DOCKER_BUILD_ARGS :=
@@ -66,6 +66,34 @@ ifneq "$(DOCKER_REGISTRY)" ""
 endif
 
 
+#
+#  Print some useful help
+#
+.PHONY: docker.help.images
+docker.help.images:
+       @echo Available images: $(DOCKER_IMAGES)
+
+.PHONY: docker.help
+docker.help: docker.help.images
+       @echo ""
+       @echo "Make targets:"
+       @echo "    docker-ubuntu        - build main ubuntu image"
+       @echo "    docker-alpine        - build main alpine image"
+       @echo "    docker.regen         - regenerate all Dockerfiles from templates"
+       @echo ""
+       @echo "Make targets per image:"
+       @echo "    docker.IMAGE.build   - build image"
+       @echo "    docker.IMAGE.regen   - regenerate Dockerfile"
+       @echo ""
+       @echo "Arguments:"
+       @echo '    DOCKER_BUILD_ARGS="--no-cache"        - extra build args'
+       @echo '    DOCKER_REGISTRY="docker.example.com"  - registry to build for'
+       @echo '    DOCKER_REPO="freeradius"              - docker repo name'
+       @echo '    DOCKER_TAG="freeradius-server"        - docker tag name'
+       @echo '    DOCKER_COMMIT="HEAD"                  - commit/ref to build from'
+       @echo '    DOCKER_VERSION="$(DOCKER_VERSION)"                - version for docker image name'
+
+
 #
 #  Rules for each OS
 #

diff --git a/scripts/docker/m4/Dockerfile.deb.m4 b/scripts/docker/m4/Dockerfile.deb.m4
index 1895b6b8b9c4f4467ce948e4178cc38e0bb981eb..0b4e5b5a0c23ea89385278d91e7430a9ade7c30c 100644 (file)
--- a/scripts/docker/m4/Dockerfile.deb.m4
+++ b/scripts/docker/m4/Dockerfile.deb.m4
@@ -27,7 +27,10 @@ COPY . .
 RUN git clean -fdxx \
  && git reset --hard HEAD
 
-RUN [ -z "$release" ] || git checkout ${release}
+ARG release
+RUN [ -z "$release" ] || git checkout ${release} ; \
+    git status ; \
+    git log -1 --oneline
 
 #
 #  Install build dependencies

diff --git a/scripts/docker/m4/Dockerfile.rpm.m4 b/scripts/docker/m4/Dockerfile.rpm.m4
index 0137483c4288aafa145dd495150f1de9bc0184a5..198510a67857d14438bfc31660b03db780e41447 100644 (file)
--- a/scripts/docker/m4/Dockerfile.rpm.m4
+++ b/scripts/docker/m4/Dockerfile.rpm.m4
@@ -43,7 +43,10 @@ COPY . .
 RUN git clean -fdxx \
  && git reset --hard HEAD
 
-RUN [ -z "$release" ] || git checkout ${release}
+ARG release
+RUN [ -z "$release" ] || git checkout ${release} ; \
+    git status ; \
+    git log -1 --oneline
 
 #
 #  Other requirements