builder: add docker cache busting support

diff --git a/builder b/builder
index 836c9a8f6d9a9c7980076eedde674b4e056f24c3..82843ac183ef0f0bf9cdc1367b93c8e9e6fa6dfa 160000 (submodule)
--- a/builder
+++ b/builder
@@ -1 +1 @@
-Subproject commit 836c9a8f6d9a9c7980076eedde674b4e056f24c3
+Subproject commit 82843ac183ef0f0bf9cdc1367b93c8e9e6fa6dfa

diff --git a/builder-support/dockerfiles/Dockerfile.authoritative b/builder-support/dockerfiles/Dockerfile.authoritative
index c5d83a19ba36a789ebdfe73553902d38543088ae..fbfafe29c12e504aceed93c8e4e63ffd915f2124 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.authoritative
+++ b/builder-support/dockerfiles/Dockerfile.authoritative
@@ -1,4 +1,5 @@
 FROM alpine:3.6 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 py-virtualenv \

diff --git a/builder-support/dockerfiles/Dockerfile.dnsdist b/builder-support/dockerfiles/Dockerfile.dnsdist
index 659df6d14d405238589acf67fbd31c89546fc45f..9569c466a5ab50aabfa8e70060c9529270b22f76 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.dnsdist
+++ b/builder-support/dockerfiles/Dockerfile.dnsdist
@@ -1,4 +1,5 @@
 FROM alpine:3.6 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 py-virtualenv git libedit-dev

diff --git a/builder-support/dockerfiles/Dockerfile.recursor b/builder-support/dockerfiles/Dockerfile.recursor
index 821eeb7aeb0a6ebb82867863bdb06f6fd68fdc9c..10e0a699e9c5de06dfac2d92052494a6f870e031 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.recursor
+++ b/builder-support/dockerfiles/Dockerfile.recursor
@@ -1,4 +1,5 @@
 FROM alpine:3.6 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 py-virtualenv \

diff --git a/builder-support/dockerfiles/Dockerfile.target.amazon-2 b/builder-support/dockerfiles/Dockerfile.target.amazon-2
index 464a541b9be9967908b940b1bf326ff31de7d955..43b17135a2782358f9e94ef38d77cf3b9d87ceaa 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.amazon-2
+++ b/builder-support/dockerfiles/Dockerfile.target.amazon-2
@@ -4,6 +4,7 @@
 # This defines the dstribution base layer
 # Put only the bare minimum of common commands here, without dev tools
 FROM amazonlinux:2 as dist-base
+ARG BUILDER_CACHE_BUSTER=
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 
 # Do the actual rpm build

diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-6 b/builder-support/dockerfiles/Dockerfile.target.centos-6
index 6264453d067d6d427dd65b879e526b38bed1938c..f60feef89b9ecfb7452482885940a284d37609cc 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.centos-6
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-6
@@ -4,6 +4,7 @@
 # This defines the dstribution base layer
 # Put only the bare minimum of common commands here, without dev tools
 FROM centos:6 as dist-base
+ARG BUILDER_CACHE_BUSTER=
 RUN which yum
 RUN yum clean all
 RUN yum install -y --verbose epel-release centos-release-scl-rh && \

diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-7 b/builder-support/dockerfiles/Dockerfile.target.centos-7
index cbf48a4df12a35b405891a3997d9bda9b3fd8af3..631308285dbe969916dcab2654ded73af4b91d04 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.centos-7
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-7
@@ -4,6 +4,7 @@
 # This defines the dstribution base layer
 # Put only the bare minimum of common commands here, without dev tools
 FROM centos:7 as dist-base
+ARG BUILDER_CACHE_BUSTER=
 RUN yum install -y epel-release
 
 # Do the actual rpm build

diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-jessie b/builder-support/dockerfiles/Dockerfile.target.debian-jessie
index d3967d04fd94b759a7ce2d16f73a23d488f306b4..33440735d7d3431ae7a4a7ffb291a50d7909d4af 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.debian-jessie
+++ b/builder-support/dockerfiles/Dockerfile.target.debian-jessie
@@ -2,6 +2,7 @@
 @INCLUDE Dockerfile.target.sdist
 
 FROM debian:jessie as dist-base
+ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
 RUN apt-get update && apt-get -y dist-upgrade
 

diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-stretch b/builder-support/dockerfiles/Dockerfile.target.debian-stretch
index cff29d39048ca13b48020a190daf0534d6a26a0e..c775cf63e0de6bed91e7b639cfd3bce200dc363d 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.debian-stretch
+++ b/builder-support/dockerfiles/Dockerfile.target.debian-stretch
@@ -2,6 +2,7 @@
 @INCLUDE Dockerfile.target.sdist
 
 FROM debian:stretch as dist-base
+ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
 RUN apt-get update && apt-get -y dist-upgrade
 

diff --git a/builder-support/dockerfiles/Dockerfile.target.raspbian-jessie b/builder-support/dockerfiles/Dockerfile.target.raspbian-jessie
index 0afdd574fc5cb62c383243abcef133aea266b618..3fa259c74129acb03c5fca3a77b86ceff6ce7812 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.raspbian-jessie
+++ b/builder-support/dockerfiles/Dockerfile.target.raspbian-jessie
@@ -2,6 +2,7 @@
 @INCLUDE Dockerfile.target.sdist
 
 FROM resin/rpi-raspbian:jessie as dist-base
+ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
 RUN apt-get update && apt-get -y dist-upgrade
 

diff --git a/builder-support/dockerfiles/Dockerfile.target.raspbian-stretch b/builder-support/dockerfiles/Dockerfile.target.raspbian-stretch
index 4624617b3e9bc7ff379836fd8f423ab899cea1ed..4f95c4c162cd7e5e0d395c55b08057a38dc754b3 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.raspbian-stretch
+++ b/builder-support/dockerfiles/Dockerfile.target.raspbian-stretch
@@ -2,6 +2,7 @@
 @INCLUDE Dockerfile.target.sdist
 
 FROM resin/rpi-raspbian:stretch as dist-base
+ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
 RUN apt-get update && apt-get -y dist-upgrade
 

diff --git a/builder-support/dockerfiles/Dockerfile.target.sdist b/builder-support/dockerfiles/Dockerfile.target.sdist
index 45c8da1aefc235b4d0cfc6b47ee1dba221a4e6fa..81760329a7471d1853a7acd6e66cfe700a20e52f 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.sdist
+++ b/builder-support/dockerfiles/Dockerfile.target.sdist
@@ -11,6 +11,7 @@
 @ENDIF
 
 FROM alpine:3.6 as sdist
+ARG BUILDER_CACHE_BUSTER=
 
 @IF [ ! -z "$M_authoritative$M_all" ]
 COPY --from=pdns-authoritative /sdist/ /sdist/

diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic
index 09a3b4cc888ff17d6d76532ebb0944c90c7139f7..2b78f08e4453cfd3c453897be5ef9eb3466b81e6 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic
@@ -2,6 +2,7 @@
 @INCLUDE Dockerfile.target.sdist
 
 FROM ubuntu:bionic as dist-base
+ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
 RUN apt-get update && apt-get -y dist-upgrade
 

diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-cosmic b/builder-support/dockerfiles/Dockerfile.target.ubuntu-cosmic
index f13c7d1ef6028fe9d91c62ce9d287a9e16055c0a..590d73b4f764f803d7fe072da1bff1f526081645 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-cosmic
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-cosmic
@@ -2,6 +2,7 @@
 @INCLUDE Dockerfile.target.sdist
 
 FROM ubuntu:cosmic as dist-base
+ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
 RUN apt-get update && apt-get -y dist-upgrade
 

diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-trusty b/builder-support/dockerfiles/Dockerfile.target.ubuntu-trusty
index 8fb1f0f3386e1ca07f484a64a46ee68aab86f6db..46bf2d3219ead09d58e1df41eb11f10113b4a8ab 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-trusty
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-trusty
@@ -2,6 +2,7 @@
 @INCLUDE Dockerfile.target.sdist
 
 FROM ubuntu:trusty as dist-base
+ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
 RUN apt-get update && apt-get -y dist-upgrade
 

diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-xenial b/builder-support/dockerfiles/Dockerfile.target.ubuntu-xenial
index 81e3e71d966fe66a6b1f5dc4d3fcfa3622d53cb4..92a83e1cbdeeadad38e16cfb99f46eb6dbae43b3 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-xenial
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-xenial
@@ -2,6 +2,7 @@
 @INCLUDE Dockerfile.target.sdist
 
 FROM ubuntu:xenial as dist-base
+ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
 RUN apt-get update && apt-get -y dist-upgrade