Move to newer alpine for docker buildbot, needed for proper

boost context detection

(cherry picked from commit b7c38b3b87c865c30ecca468d7d6dea30e1c15a7)

diff --git a/builder-support/dockerfiles/Dockerfile.authoritative b/builder-support/dockerfiles/Dockerfile.authoritative
index fbfafe29c12e504aceed93c8e4e63ffd915f2124..3bc8231c5496967cee3c6756d7c74cb01605bce4 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.authoritative
+++ b/builder-support/dockerfiles/Dockerfile.authoritative
@@ -1,4 +1,4 @@
-FROM alpine:3.6 as pdns-authoritative
+FROM alpine:3.10 as pdns-authoritative
 ARG BUILDER_CACHE_BUSTER=
 
 RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \

diff --git a/builder-support/dockerfiles/Dockerfile.dnsdist b/builder-support/dockerfiles/Dockerfile.dnsdist
index 9569c466a5ab50aabfa8e70060c9529270b22f76..2295d361f65a56fbba8ee9a8f1d8b74bf338436a 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.dnsdist
+++ b/builder-support/dockerfiles/Dockerfile.dnsdist
@@ -1,4 +1,4 @@
-FROM alpine:3.6 as dnsdist
+FROM alpine:3.10 as dnsdist
 ARG BUILDER_CACHE_BUSTER=
 
 RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \

diff --git a/builder-support/dockerfiles/Dockerfile.recursor b/builder-support/dockerfiles/Dockerfile.recursor
index 10e0a699e9c5de06dfac2d92052494a6f870e031..ab1ec13211024c9c3155602db1f9c3df4ca4e92c 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.recursor
+++ b/builder-support/dockerfiles/Dockerfile.recursor
@@ -1,4 +1,4 @@
-FROM alpine:3.6 as pdns-recursor
+FROM alpine:3.10 as pdns-recursor
 ARG BUILDER_CACHE_BUSTER=
 
 RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \

diff --git a/builder-support/dockerfiles/Dockerfile.target.sdist b/builder-support/dockerfiles/Dockerfile.target.sdist
index 81760329a7471d1853a7acd6e66cfe700a20e52f..f7f4b970e9bc6c80a8e5610f3e89b8af0012ca5f 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.sdist
+++ b/builder-support/dockerfiles/Dockerfile.target.sdist
@@ -10,7 +10,7 @@
 @INCLUDE Dockerfile.dnsdist
 @ENDIF
 
-FROM alpine:3.6 as sdist
+FROM alpine:3.10 as sdist
 ARG BUILDER_CACHE_BUSTER=
 
 @IF [ ! -z "$M_authoritative$M_all" ]