dockerfiles: Ensure version number is correct for releases

diff --git a/Dockerfile-auth b/Dockerfile-auth
index 3716a185e5069ec626cc72b817fbab3cbbdb6c41..fc632c5e8c8b5f92fdb9cfa911740f9347822ff8 100644 (file)
--- a/Dockerfile-auth
+++ b/Dockerfile-auth
@@ -37,7 +37,7 @@ ARG DOCKER_FAKE_RELEASE=NO
 ENV DOCKER_FAKE_RELEASE ${DOCKER_FAKE_RELEASE}
 
 RUN if [ "${DOCKER_FAKE_RELEASE}" = "YES" ]; then \
-      BUILDER_VERSION="$(BUILDER_MODULES=authoritative ./builder-support/gen-version | sed 's/\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/')" set-configure-ac-version.sh;\
+      BUILDER_VERSION="$(IS_RELEASE=YES BUILDER_MODULES=authoritative ./builder-support/gen-version | sed 's/\([0-9]\+\.[0-9]\+\.[0-9]\+\(\(alpha|beta|rc\)\d\+\)\)?.*/\1/')" set-configure-ac-version.sh;\
     fi && \
     BUILDER_MODULES=authoritative autoreconf -vfi
 

diff --git a/Dockerfile-dnsdist b/Dockerfile-dnsdist
index 4df8fb80d60c35a7a7a0ad001819b4110f24a08f..3aa0aab7a58cde1c7529c9b5d5884571ea61197e 100644 (file)
--- a/Dockerfile-dnsdist
+++ b/Dockerfile-dnsdist
@@ -34,7 +34,7 @@ ENV DOCKER_FAKE_RELEASE ${DOCKER_FAKE_RELEASE}
 RUN touch dnsdist.1 # avoid having to install pandoc and venv
 
 RUN if [ "${DOCKER_FAKE_RELEASE}" = "YES" ]; then \
-      BUILDER_VERSION="$(BUILDER_MODULES=dnsdist ./builder-support/gen-version | sed 's/\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/')" set-configure-ac-version.sh;\
+      BUILDER_VERSION="$(IS_RELEASE=YES BUILDER_MODULES=dnsdist ./builder-support/gen-version | sed 's/\([0-9]\+\.[0-9]\+\.[0-9]\+\(\(alpha|beta|rc\)\d\+\)\)?.*/\1/')" set-configure-ac-version.sh;\
     fi && \
     BUILDER_MODULES=dnsdist autoreconf -vfi
 

diff --git a/Dockerfile-recursor b/Dockerfile-recursor
index 6e291c2cd23a16efad0bad3c880927eec41954b8..2b4c29819958e30936b510d035f0829b63fd85c3 100644 (file)
--- a/Dockerfile-recursor
+++ b/Dockerfile-recursor
@@ -42,7 +42,7 @@ ENV DOCKER_FAKE_RELEASE ${DOCKER_FAKE_RELEASE}
 RUN touch pdns_recursor.1 rec_control.1 # avoid installing pandoc
 
 RUN if [ "${DOCKER_FAKE_RELEASE}" = "YES" ]; then \
-      BUILDER_VERSION="$(BUILDER_MODULES=recursor ./builder-support/gen-version | sed 's/\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/')" set-configure-ac-version.sh;\
+      BUILDER_VERSION="$(IS_RELEASE=YES BUILDER_MODULES=recursor ./builder-support/gen-version | sed 's/\([0-9]\+\.[0-9]\+\.[0-9]\+\(\(alpha|beta|rc\)\d\+\)\)?.*/\1/')" set-configure-ac-version.sh;\
     fi && \
     BUILDER_MODULES=recursor autoreconf -vfi