From: Otto Moerbeek Date: Tue, 13 Aug 2019 14:17:54 +0000 (+0200) Subject: Move to newer alpine for docker buildbot, needed for proper X-Git-Tag: rec-4.2.1~7^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8124%2Fhead;p=thirdparty%2Fpdns.git 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 fbfafe29c1..3bc8231c54 100644 --- 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 9569c466a5..2295d361f6 100644 --- 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 10e0a699e9..ab1ec13211 100644 --- 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 81760329a7..f7f4b970e9 100644 --- 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" ]