From d4884c8cd155e1d09436ef1d21027d3effdfd070 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 2 Feb 2021 13:28:04 +0100
Subject: [PATCH] dockerfiles: Ensure version number is correct for releases

(cherry picked from commit a508963dc3a36883b24db67e285c9e0481b84fb0)
---
 Dockerfile-recursor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile-recursor b/Dockerfile-recursor
index ccebb237a8..79c68d33ed 100644
--- 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
 
-- 
2.47.3