From 73fad4b9f545432f3f3508948bae100ba2ce945a Mon Sep 17 00:00:00 2001
From: Peter Schiffer <3899107+pschiffe@users.noreply.github.com>
Date: Fri, 21 Apr 2023 17:34:11 +0200
Subject: [PATCH] Update base images, move to the versioned PowerDNS-Admin
 archive

---
 pdns-admin-base-ngoduykhanh/Dockerfile    | 15 ++++++++-------
 pdns-admin-base-ngoduykhanh/config.py.tpl |  4 +---
 pdns-recursor/Dockerfile                  |  4 ++--
 pdns-recursor/Dockerfile.alpine           |  2 +-
 pdns/Dockerfile                           |  2 +-
 pdns/Dockerfile.alpine                    |  2 +-
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/pdns-admin-base-ngoduykhanh/Dockerfile b/pdns-admin-base-ngoduykhanh/Dockerfile
index 638f2f1..e8b1d26 100644
--- a/pdns-admin-base-ngoduykhanh/Dockerfile
+++ b/pdns-admin-base-ngoduykhanh/Dockerfile
@@ -1,25 +1,27 @@
-FROM fedora:37
+FROM fedora:38
 
 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 \
-    npm \
+    nodejs-npm \
     python3-ldap \
     python3-lxml \
     python3-mysql \
     python3-pip \
     python3-saml \
     python3-setuptools \
+    python3-wheel \
     python3-xmlsec \
     uwsgi \
     yarn \
   && dnf clean all
 
 RUN mkdir -p /opt/powerdns-admin \
-  && curl -sSL https://github.com/ngoduykhanh/PowerDNS-Admin/archive/master.tar.gz \
+  && curl -sSL https://github.com/PowerDNS-Admin/PowerDNS-Admin/archive/refs/tags/v0.4.1.tar.gz \
     | tar -xzC /opt/powerdns-admin --strip 1 \
-  && sed -i '/python-ldap/d' /opt/powerdns-admin/requirements.txt \
-  && sed -i '/mysqlclient/d' /opt/powerdns-admin/requirements.txt \
   && sed -i '/lxml/d' /opt/powerdns-admin/requirements.txt \
+  && sed -i '/mysqlclient/d' /opt/powerdns-admin/requirements.txt \
+  && sed -i '/psycopg2/d' /opt/powerdns-admin/requirements.txt \
+  && sed -i '/python-ldap/d' /opt/powerdns-admin/requirements.txt \
   && sed -i '/python3-saml/d' /opt/powerdns-admin/requirements.txt \
   && chown -R root: /opt/powerdns-admin
 
@@ -39,5 +41,4 @@ RUN envtpl < /config.py.tpl > /opt/powerdns-admin/config.py \
 RUN yarn install --pure-lockfile --production \
   && yarn cache clean \
   && flask assets build \
-  && chown -R uwsgi: /opt/powerdns-admin/powerdnsadmin/static/.webassets-cache \
-  && chown -R uwsgi: /opt/powerdns-admin/flask_session
+  && chown -R uwsgi: /opt/powerdns-admin/powerdnsadmin/static/.webassets-cache
diff --git a/pdns-admin-base-ngoduykhanh/config.py.tpl b/pdns-admin-base-ngoduykhanh/config.py.tpl
index 95be510..ea91560 100644
--- a/pdns-admin-base-ngoduykhanh/config.py.tpl
+++ b/pdns-admin-base-ngoduykhanh/config.py.tpl
@@ -13,9 +13,7 @@ CAPTCHA_WIDTH = 160
 CAPTCHA_HEIGHT = 60
 CAPTCHA_SESSION_KEY = 'captcha_image'
 
-# Server side sessions tracking
-# Set to TRUE for CAPTCHA, or enable another stateful session tracking system
-FILESYSTEM_SESSIONS_ENABLED = True
+SESSION_TYPE = 'sqlalchemy'
 
 # SAML Authnetication
 SAML_ENABLED = False
diff --git a/pdns-recursor/Dockerfile b/pdns-recursor/Dockerfile
index 89efd03..aa603b5 100644
--- a/pdns-recursor/Dockerfile
+++ b/pdns-recursor/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:37
+FROM fedora:38
 
 RUN dnf -y --setopt=install_weak_deps=False install \
     pdns-recursor \
@@ -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.7 \
+ENV VERSION=4.8 \
   PDNS_setuid=pdns-recursor \
   PDNS_setgid=pdns-recursor \
   PDNS_daemon=no
diff --git a/pdns-recursor/Dockerfile.alpine b/pdns-recursor/Dockerfile.alpine
index f1cb737..359b65c 100644
--- a/pdns-recursor/Dockerfile.alpine
+++ b/pdns-recursor/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM alpine:3.17.2
+FROM alpine:3.17.3
 
 RUN apk add --no-cache \
     pdns-recursor \
diff --git a/pdns/Dockerfile b/pdns/Dockerfile
index 77fab35..c94417e 100644
--- a/pdns/Dockerfile
+++ b/pdns/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:37
+FROM fedora:38
 
 RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
   && dnf -y --setopt=install_weak_deps=False install \
diff --git a/pdns/Dockerfile.alpine b/pdns/Dockerfile.alpine
index 5fff6d6..b59178a 100644
--- a/pdns/Dockerfile.alpine
+++ b/pdns/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM alpine:3.17.2
+FROM alpine:3.17.3
 
 RUN apk add --no-cache \
     mariadb-client \