From 26ad6bfbe24ac09f31c80dec9fc2f7f086ce903b Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Fri, 22 Jan 2021 14:22:50 +0100 Subject: [PATCH] Rebase images Resolves #50 --- ansible-playbook.yml | 3 --- pdns-admin-base-ngoduykhanh/Dockerfile | 3 ++- pdns-recursor/Dockerfile | 3 ++- pdns-recursor/Dockerfile.alpine | 4 ++-- pdns/Dockerfile | 5 +++-- pdns/Dockerfile.alpine | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ansible-playbook.yml b/ansible-playbook.yml index f593c4b..eb03621 100644 --- a/ansible-playbook.yml +++ b/ansible-playbook.yml @@ -146,9 +146,6 @@ PDNS_webserver_allow_from: '172.5.0.0/16' PDNS_version_string: 'anonymous' PDNS_default_ttl: '1500' - PDNS_soa_minimum_ttl: '1200' - PDNS_default_soa_name: 'ns1.example.com' - PDNS_default_soa_mail: 'hostmaster.example.com' PDNS_allow_axfr_ips: '{{ pdns_slave_ip }}' PDNS_only_notify: '{{ pdns_slave_ip }}' tags: diff --git a/pdns-admin-base-ngoduykhanh/Dockerfile b/pdns-admin-base-ngoduykhanh/Dockerfile index b3c0822..c5e18a5 100644 --- a/pdns-admin-base-ngoduykhanh/Dockerfile +++ b/pdns-admin-base-ngoduykhanh/Dockerfile @@ -1,10 +1,11 @@ -FROM fedora:32 +FROM fedora:33 RUN curl -sSL -o /etc/yum.repos.d/yarn.repo https://dl.yarnpkg.com/rpm/yarn.repo \ && dnf -y --setopt=install_weak_deps=False install \ python3-ldap \ python3-mysql \ python3-pip \ + python3-setuptools \ python3-xmlsec \ uwsgi \ yarn \ diff --git a/pdns-recursor/Dockerfile b/pdns-recursor/Dockerfile index 8fb0529..4c6d1e0 100644 --- a/pdns-recursor/Dockerfile +++ b/pdns-recursor/Dockerfile @@ -1,8 +1,9 @@ -FROM fedora:32 +FROM fedora:33 RUN dnf -y --setopt=install_weak_deps=False install \ pdns-recursor \ python3-pip \ + python3-setuptools \ && dnf clean all RUN pip3 install --no-cache-dir envtpl diff --git a/pdns-recursor/Dockerfile.alpine b/pdns-recursor/Dockerfile.alpine index a6a0f32..13269e0 100644 --- a/pdns-recursor/Dockerfile.alpine +++ b/pdns-recursor/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.13 RUN apk add --no-cache \ pdns-recursor \ @@ -12,7 +12,7 @@ RUN mkdir -p /etc/pdns/api.d \ && mkdir -p /var/run/pdns-recursor \ && chown -R recursor: /var/run/pdns-recursor -ENV VERSION=4.3 \ +ENV VERSION=4.4 \ PDNS_setuid=recursor \ PDNS_setgid=recursor \ PDNS_daemon=no diff --git a/pdns/Dockerfile b/pdns/Dockerfile index 2c797d2..a579846 100644 --- a/pdns/Dockerfile +++ b/pdns/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:32 +FROM fedora:33 RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \ && dnf -y --setopt=install_weak_deps=False install \ @@ -7,11 +7,12 @@ RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \ pdns \ pdns-backend-mysql \ python3-pip \ + python3-setuptools \ && dnf clean all RUN pip3 install --no-cache-dir envtpl -ENV VERSION=4.3 \ +ENV VERSION=4.4 \ PDNS_guardian=yes \ PDNS_setuid=pdns \ PDNS_setgid=pdns \ diff --git a/pdns/Dockerfile.alpine b/pdns/Dockerfile.alpine index ed06c4b..9ee297e 100644 --- a/pdns/Dockerfile.alpine +++ b/pdns/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.13 RUN apk add --no-cache \ mariadb-client \ @@ -10,7 +10,7 @@ RUN apk add --no-cache \ RUN pip3 install --no-cache-dir envtpl -ENV VERSION=4.2 \ +ENV VERSION=4.3 \ PDNS_guardian=yes \ PDNS_setuid=pdns \ PDNS_setgid=pdns \