From 051123a7735b1d29e11af7c68374a10bf1dd4135 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <peter@pschiffer.eu>
Date: Tue, 25 Aug 2020 00:22:06 +0200
Subject: [PATCH] Rebase to the latest base images

---
 ansible-playbook.yml                   | 4 ++--
 pdns-admin-base-ngoduykhanh/Dockerfile | 2 +-
 pdns-recursor/Dockerfile               | 8 +++++---
 pdns-recursor/Dockerfile.alpine        | 9 ++++++---
 pdns/Dockerfile                        | 4 ++--
 pdns/Dockerfile.alpine                 | 7 ++++---
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/ansible-playbook.yml b/ansible-playbook.yml
index f2157f5..f593c4b 100644
--- a/ansible-playbook.yml
+++ b/ansible-playbook.yml
@@ -62,7 +62,7 @@
     - name: db
       docker_container:
         name: pdns-mariadb
-        image: mariadb:10.4
+        image: mariadb:10.5
         pull: true
         state: '{{ c_state }}'
         networks_cli_compatible: true
@@ -258,7 +258,7 @@
         - pdns-admin
 
     - name: remove docker volumes
-      command: docker volume rm pdns-mariadb-volume pdns-admin-upload
+      command: docker volume rm pdns-mariadb-volume
       ignore_errors: true
       when: wipe | bool
 
diff --git a/pdns-admin-base-ngoduykhanh/Dockerfile b/pdns-admin-base-ngoduykhanh/Dockerfile
index a538284..b3c0822 100644
--- a/pdns-admin-base-ngoduykhanh/Dockerfile
+++ b/pdns-admin-base-ngoduykhanh/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM fedora:32
 
 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 \
diff --git a/pdns-recursor/Dockerfile b/pdns-recursor/Dockerfile
index 15190d8..8fb0529 100644
--- a/pdns-recursor/Dockerfile
+++ b/pdns-recursor/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM fedora:32
 
 RUN dnf -y --setopt=install_weak_deps=False install \
     pdns-recursor \
@@ -8,9 +8,11 @@ RUN dnf -y --setopt=install_weak_deps=False install \
 RUN pip3 install --no-cache-dir envtpl
 
 RUN mkdir -p /etc/pdns-recursor/api.d \
-  && chown -R pdns-recursor: /etc/pdns-recursor/api.d
+  && chown -R pdns-recursor: /etc/pdns-recursor/api.d \
+  && mkdir -p /run/pdns-recursor \
+  && chown -R pdns-recursor: /run/pdns-recursor
 
-ENV VERSION=4.2 \
+ENV VERSION=4.3 \
   PDNS_setuid=pdns-recursor \
   PDNS_setgid=pdns-recursor \
   PDNS_daemon=no
diff --git a/pdns-recursor/Dockerfile.alpine b/pdns-recursor/Dockerfile.alpine
index 979e2e3..a6a0f32 100644
--- a/pdns-recursor/Dockerfile.alpine
+++ b/pdns-recursor/Dockerfile.alpine
@@ -1,15 +1,18 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 RUN apk add --no-cache \
     pdns-recursor \
+    py3-pip \
     python3
 
 RUN pip3 install --no-cache-dir envtpl
 
 RUN mkdir -p /etc/pdns/api.d \
-  && chown -R recursor: /etc/pdns/api.d
+  && chown -R recursor: /etc/pdns/api.d \
+  && mkdir -p /var/run/pdns-recursor \
+  && chown -R recursor: /var/run/pdns-recursor
 
-ENV VERSION=4.2 \
+ENV VERSION=4.3 \
   PDNS_setuid=recursor \
   PDNS_setgid=recursor \
   PDNS_daemon=no
diff --git a/pdns/Dockerfile b/pdns/Dockerfile
index da57d1a..2c797d2 100644
--- a/pdns/Dockerfile
+++ b/pdns/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM fedora:32
 
 RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
   && dnf -y --setopt=install_weak_deps=False install \
@@ -11,7 +11,7 @@ RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
 
 RUN pip3 install --no-cache-dir envtpl
 
-ENV VERSION=4.2 \
+ENV VERSION=4.3 \
   PDNS_guardian=yes \
   PDNS_setuid=pdns \
   PDNS_setgid=pdns \
diff --git a/pdns/Dockerfile.alpine b/pdns/Dockerfile.alpine
index 3c0029d..ed06c4b 100644
--- a/pdns/Dockerfile.alpine
+++ b/pdns/Dockerfile.alpine
@@ -1,11 +1,12 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 RUN apk add --no-cache \
+    mariadb-client \
     pdns \
     pdns-backend-mysql \
     pdns-doc \
-    python3 \
-    mariadb-client
+    py3-pip \
+    python3
 
 RUN pip3 install --no-cache-dir envtpl