dockerfiles: Ensure version number is correct for releases

(cherry picked from commit a508963dc3a36883b24db67e285c9e0481b84fb0)

diff --git a/Dockerfile-recursor b/Dockerfile-recursor
index ccebb237a8892839b8df9c83ef88bd2c14d788fb..79c68d33ed14b47e87ee509b5900179edec488ec 100644 (file)
--- a/Dockerfile-recursor
+++ b/Dockerfile-recursor
@@ -43,7 +43,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