From f5e51d0acb4fbc0b0760bc3dc609e49b42853c7f Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Fri, 5 Jun 2020 17:33:56 +0200 Subject: [PATCH] add master support to generate-repo-files.sh --- build-scripts/docker/generate-repo-files.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build-scripts/docker/generate-repo-files.sh b/build-scripts/docker/generate-repo-files.sh index 05da8b0455..ef6f868f59 100755 --- a/build-scripts/docker/generate-repo-files.sh +++ b/build-scripts/docker/generate-repo-files.sh @@ -24,9 +24,9 @@ if [ "$1" = "" -o "$1" = "-?" -o "$1" = "-h" -o "$1" = "--help" ]; then echo "Usage: generate-repo-files.sh RELEASE" echo - echo " • RELEASE: [ auth-40 | auth-41 | auth-42 | auth-43 |" - echo " rec-40 | rec-41 | rec-42 | rec-43 | rec-44 |" - echo " dnsdist-15 ]" + echo " • RELEASE: [ auth-40 | auth-41 | auth-42 | auth-43 | auth-master |" + echo " rec-40 | rec-41 | rec-42 | rec-43 | rec-44 | rec-master |" + echo " dnsdist-15 | dnsdist-master ]" exit 1 fi @@ -113,6 +113,7 @@ COPY pdns.debian-and-ubuntu /etc/apt/preferences.d/pdns COPY pdns.list.$RELEASE.$OS-$VERSION /etc/apt/sources.list.d/pdns.list RUN curl https://repo.powerdns.com/FD380FBB-pub.asc | apt-key add - +RUN curl https://repo.powerdns.com/CBC8B383-pub.asc | apt-key add - RUN apt-get update RUN apt-get install -y $PKG EOF @@ -160,7 +161,7 @@ elif [ "$RELEASE" = "auth-41" ]; then write_ubuntu trusty pdns-server pdns_server write_ubuntu xenial pdns-server pdns_server write_ubuntu bionic pdns-server pdns_server -elif [ "$RELEASE" = "auth-42" -o "$RELEASE" = "auth-43" ]; then +elif [ "$RELEASE" = "auth-42" -o "$RELEASE" = "auth-43" -o "$RELEASE" = "auth-master" ]; then write_centos 6 pdns pdns_server write_centos 7 pdns pdns_server write_centos 8 pdns pdns_server @@ -183,7 +184,7 @@ elif [ "$RELEASE" = "rec-41" ]; then write_ubuntu trusty pdns-recursor pdns_recursor write_ubuntu xenial pdns-recursor pdns_recursor write_ubuntu bionic pdns-recursor pdns_recursor -elif [ "$RELEASE" = "rec-42" -o "$RELEASE" = "rec-43" -o "$RELEASE" = "rec-44" ]; then +elif [ "$RELEASE" = "rec-42" -o "$RELEASE" = "rec-43" -o "$RELEASE" = "rec-44" -o "$RELEASE" = "rec-master" ]; then write_centos 6 pdns-recursor pdns_recursor write_centos 7 pdns-recursor pdns_recursor write_centos 8 pdns-recursor pdns_recursor @@ -191,7 +192,7 @@ elif [ "$RELEASE" = "rec-42" -o "$RELEASE" = "rec-43" -o "$RELEASE" = "rec-44" ] write_debian buster pdns-recursor pdns_recursor write_ubuntu xenial pdns-recursor pdns_recursor write_ubuntu bionic pdns-recursor pdns_recursor -elif [ "$RELEASE" = "dnsdist-15" ]; then +elif [ "$RELEASE" = "dnsdist-15" -o "$RELEASE" = "dnsdist-master" ]; then write_centos 6 dnsdist dnsdist write_centos 7 dnsdist dnsdist write_centos 8 dnsdist dnsdist -- 2.47.2