From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 2 Feb 2021 12:28:04 +0000 (+0100)
Subject: dockerfiles: Ensure version number is correct for releases
X-Git-Tag: dnsdist-1.6.0-alpha2~64^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a508963dc3a36883b24db67e285c9e0481b84fb0;p=thirdparty%2Fpdns.git

dockerfiles: Ensure version number is correct for releases
---

diff --git a/Dockerfile-auth b/Dockerfile-auth
index 3716a185e5..fc632c5e8c 100644
--- 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 4df8fb80d6..3aa0aab7a5 100644
--- 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 6e291c2cd2..2b4c298199 100644
--- 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