From 0db0e6259ead7b8f4b0c36c26165770d1d3189ef Mon Sep 17 00:00:00 2001
From: Peter Schiffer <3899107+pschiffe@users.noreply.github.com>
Date: Sun, 15 Jan 2023 17:06:10 +0100
Subject: [PATCH] Update VERSION env var, mariadb and phpmyadmin

---
 ansible-playbook.yml                     | 6 +++---
 docker-compose.yml                       | 6 +++---
 examples/kubernetes/admin-dashboard.yaml | 2 +-
 examples/kubernetes/mariadb.yaml         | 2 +-
 pdns-recursor/Dockerfile                 | 2 +-
 pdns-recursor/Dockerfile.alpine          | 2 +-
 pdns/Dockerfile                          | 2 +-
 pdns/Dockerfile.alpine                   | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ansible-playbook.yml b/ansible-playbook.yml
index 5da497e..221e83f 100644
--- a/ansible-playbook.yml
+++ b/ansible-playbook.yml
@@ -62,7 +62,7 @@
     - name: db
       docker_container:
         name: pdns-mariadb
-        image: mariadb:10.6
+        image: mariadb:10.10
         pull: true
         state: '{{ c_state }}'
         networks_cli_compatible: true
@@ -86,7 +86,7 @@
     - name: phpmyadmin
       docker_container:
         name: pdns-phpmyadmin
-        image: phpmyadmin/phpmyadmin:5
+        image: phpmyadmin:5
         pull: true
         state: '{{ c_state }}'
         networks_cli_compatible: true
@@ -238,7 +238,7 @@
           - /etc/localtime:/etc/localtime:ro
         env:
           PDNS_ADMIN_SQLA_DB_PASSWORD: "'my-secret-pw'"
-          PDNS_VERSION: "4.5"
+          PDNS_VERSION: "4.7"
           PDNS_API_KEY: "secret"
       tags:
         - pdns-admin
diff --git a/docker-compose.yml b/docker-compose.yml
index e12a043..c45f711 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
 
   mariadb:
-    image: mariadb:10.6
+    image: mariadb:10.10
     networks:
       pdns:
         aliases:
@@ -27,7 +27,7 @@ services:
       retries: 5
 
   phpmyadmin:
-    image: phpmyadmin/phpmyadmin:5
+    image: phpmyadmin:5
     networks:
       - pdns
     ports:
@@ -100,7 +100,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
     environment:
       - PDNS_ADMIN_SQLA_DB_PASSWORD='my-secret-pw'
-      - PDNS_VERSION=4.5
+      - PDNS_VERSION=4.7
       - PDNS_API_KEY=secret
     depends_on:
       - mariadb
diff --git a/examples/kubernetes/admin-dashboard.yaml b/examples/kubernetes/admin-dashboard.yaml
index c1d2f75..f4df6db 100644
--- a/examples/kubernetes/admin-dashboard.yaml
+++ b/examples/kubernetes/admin-dashboard.yaml
@@ -58,7 +58,7 @@ spec:
         - name: PDNS_API_URL
           value: "http://master-api-pdns:8081/"
         - name: PDNS_VERSION
-          value: "4.5"
+          value: "4.7"
         - name: PDNS_API_KEY
           valueFrom:
             secretKeyRef:
diff --git a/examples/kubernetes/mariadb.yaml b/examples/kubernetes/mariadb.yaml
index 502db38..715c447 100644
--- a/examples/kubernetes/mariadb.yaml
+++ b/examples/kubernetes/mariadb.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       containers:
       - name: mariadb-pdns
-        image: mariadb:10.6
+        image: mariadb:10.10
         imagePullPolicy: Always
         env:
           - name: MYSQL_ROOT_PASSWORD
diff --git a/pdns-recursor/Dockerfile b/pdns-recursor/Dockerfile
index 5ce6054..89efd03 100644
--- a/pdns-recursor/Dockerfile
+++ b/pdns-recursor/Dockerfile
@@ -13,7 +13,7 @@ RUN mkdir -p /etc/pdns-recursor/api.d \
   && mkdir -p /run/pdns-recursor \
   && chown -R pdns-recursor: /run/pdns-recursor
 
-ENV VERSION=4.5 \
+ENV VERSION=4.7 \
   PDNS_setuid=pdns-recursor \
   PDNS_setgid=pdns-recursor \
   PDNS_daemon=no
diff --git a/pdns-recursor/Dockerfile.alpine b/pdns-recursor/Dockerfile.alpine
index dd95558..1dcf680 100644
--- a/pdns-recursor/Dockerfile.alpine
+++ b/pdns-recursor/Dockerfile.alpine
@@ -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.5 \
+ENV VERSION=4.7 \
   PDNS_setuid=recursor \
   PDNS_setgid=recursor \
   PDNS_daemon=no
diff --git a/pdns/Dockerfile b/pdns/Dockerfile
index b5f227f..77fab35 100644
--- a/pdns/Dockerfile
+++ b/pdns/Dockerfile
@@ -12,7 +12,7 @@ RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
 
 RUN pip3 install --no-cache-dir 'Jinja2<3.1' envtpl
 
-ENV VERSION=4.6 \
+ENV VERSION=4.7 \
   PDNS_guardian=yes \
   PDNS_setuid=pdns \
   PDNS_setgid=pdns \
diff --git a/pdns/Dockerfile.alpine b/pdns/Dockerfile.alpine
index 61504b5..795629c 100644
--- a/pdns/Dockerfile.alpine
+++ b/pdns/Dockerfile.alpine
@@ -10,7 +10,7 @@ RUN apk add --no-cache \
 
 RUN pip3 install --no-cache-dir 'Jinja2<3.1' envtpl
 
-ENV VERSION=4.5 \
+ENV VERSION=4.7 \
   PDNS_guardian=yes \
   PDNS_setuid=pdns \
   PDNS_setgid=pdns \