From 621fe9ca2d1db609039d7be553e1fd4ca3a49f55 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 1 Jun 2023 15:57:13 +0200 Subject: [PATCH] bump sdist builders to alpine 3.18 --- builder-support/dockerfiles/Dockerfile.authoritative | 4 ++-- builder-support/dockerfiles/Dockerfile.dnsdist | 4 ++-- builder-support/dockerfiles/Dockerfile.recursor | 4 ++-- builder-support/dockerfiles/Dockerfile.target.sdist | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/builder-support/dockerfiles/Dockerfile.authoritative b/builder-support/dockerfiles/Dockerfile.authoritative index d1128a7540..b9318faa85 100644 --- a/builder-support/dockerfiles/Dockerfile.authoritative +++ b/builder-support/dockerfiles/Dockerfile.authoritative @@ -1,9 +1,9 @@ -FROM alpine:3.10 as pdns-authoritative +FROM alpine:3.18 as pdns-authoritative ARG BUILDER_CACHE_BUSTER= RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \ libtool file boost-dev curl openssl-dev ragel python3 \ - flex bison git + flex bison git bash # the pdns/ dir is a bit broad, but who cares :) ADD configure.ac Makefile.am COPYING INSTALL NOTICE README /pdns-authoritative/ diff --git a/builder-support/dockerfiles/Dockerfile.dnsdist b/builder-support/dockerfiles/Dockerfile.dnsdist index a6ba2f3421..94438c308c 100644 --- a/builder-support/dockerfiles/Dockerfile.dnsdist +++ b/builder-support/dockerfiles/Dockerfile.dnsdist @@ -1,8 +1,8 @@ -FROM alpine:3.10 as dnsdist +FROM alpine:3.18 as dnsdist ARG BUILDER_CACHE_BUSTER= RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \ - libtool file boost-dev ragel python3 git libedit-dev + libtool file boost-dev ragel python3 git libedit-dev bash ADD builder/helpers/set-configure-ac-version.sh /dnsdist/builder/helpers/ ADD COPYING /dnsdist/ diff --git a/builder-support/dockerfiles/Dockerfile.recursor b/builder-support/dockerfiles/Dockerfile.recursor index 2a2db79e88..2a37f3e9bc 100644 --- a/builder-support/dockerfiles/Dockerfile.recursor +++ b/builder-support/dockerfiles/Dockerfile.recursor @@ -1,9 +1,9 @@ -FROM alpine:3.10 as pdns-recursor +FROM alpine:3.18 as pdns-recursor ARG BUILDER_CACHE_BUSTER= RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \ libtool file boost-dev curl openssl-dev ragel python3 \ - flex bison git + flex bison git bash ADD COPYING NOTICE /pdns-recursor/ @EXEC sdist_dirs=(build-aux m4 pdns ext docs) diff --git a/builder-support/dockerfiles/Dockerfile.target.sdist b/builder-support/dockerfiles/Dockerfile.target.sdist index 6bc27fb3ce..919fb6ebac 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.10 as sdist +FROM alpine:3.18 as sdist ARG BUILDER_CACHE_BUSTER= @IF [ -z "$M_authoritative$M_recursor$M_dnsdist$M_all" ] -- 2.47.2