diff --git a/pdns/Dockerfile b/pdns/Dockerfile index 5004152..0a82da8 100644 --- a/pdns/Dockerfile +++ b/pdns/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie-backports +FROM debian:jessie MAINTAINER Fabio Rauber ENV PDNSCONF_LAUNCH="gmysql" \ @@ -8,10 +8,15 @@ ENV PDNSCONF_LAUNCH="gmysql" \ PDNSCONF_GMYSQL_PASSWORD='' \ PDNSCONF_INCLUDE_DIR="/etc/powerdns/pdns.d" \ PDNSCONF_GMYSQL_DNSSEC="yes" \ - PDNSCONF_EXPERIMENTAL_API_KEY="" + PDNSCONF_API_KEY="" -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -q -y -t jessie-backports pdns-server pdns-backend-mysql mysql-client && \ +ADD pdns.list /etc/apt/sources.list.d/pdns.list +ADD pdns.preference /etc/apt/preferences.d/pdns + +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -q -y curl && \ + curl https://repo.powerdns.com/FD380FBB-pub.asc | apt-key add - && apt-get update + +RUN DEBIAN_FRONTEND=noninteractive apt-get install -q -y pdns-server pdns-backend-mysql mysql-client && \ rm /etc/powerdns/pdns.d/*.conf && rm /etc/powerdns/*.conf && \ apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/pdns/pdns.list b/pdns/pdns.list new file mode 100644 index 0000000..8b18d98 --- /dev/null +++ b/pdns/pdns.list @@ -0,0 +1 @@ +deb http://repo.powerdns.com/debian jessie-auth-40 main diff --git a/pdns/pdns.preference b/pdns/pdns.preference new file mode 100644 index 0000000..24d2bea --- /dev/null +++ b/pdns/pdns.preference @@ -0,0 +1,3 @@ +Package: pdns-* +Pin: origin repo.powerdns.com +Pin-Priority: 600 diff --git a/pdns/start.sh b/pdns/start.sh index 2ba7b8a..351163a 100644 --- a/pdns/start.sh +++ b/pdns/start.sh @@ -26,9 +26,9 @@ for var in $PDNSVARS; do fi done -if [ ! -z $PDNSCONF_EXPERIMENTAL_API_KEY ]; then +if [ ! -z $PDNSCONF_API_KEY ]; then cat >/etc/powerdns/pdns.d/api.conf <