Update base images, move to the versioned PowerDNS-Admin archive

This commit is contained in:
Peter Schiffer 2023-04-21 17:34:11 +02:00
parent 2959273e6e
commit 73fad4b9f5
6 changed files with 14 additions and 15 deletions

View file

@ -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 \ 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 \ && dnf -y --setopt=install_weak_deps=False install \
npm \ nodejs-npm \
python3-ldap \ python3-ldap \
python3-lxml \ python3-lxml \
python3-mysql \ python3-mysql \
python3-pip \ python3-pip \
python3-saml \ python3-saml \
python3-setuptools \ python3-setuptools \
python3-wheel \
python3-xmlsec \ python3-xmlsec \
uwsgi \ uwsgi \
yarn \ yarn \
&& dnf clean all && dnf clean all
RUN mkdir -p /opt/powerdns-admin \ 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 \ | 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 '/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 \ && sed -i '/python3-saml/d' /opt/powerdns-admin/requirements.txt \
&& chown -R root: /opt/powerdns-admin && 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 \ RUN yarn install --pure-lockfile --production \
&& yarn cache clean \ && yarn cache clean \
&& flask assets build \ && flask assets build \
&& chown -R uwsgi: /opt/powerdns-admin/powerdnsadmin/static/.webassets-cache \ && chown -R uwsgi: /opt/powerdns-admin/powerdnsadmin/static/.webassets-cache
&& chown -R uwsgi: /opt/powerdns-admin/flask_session

View file

@ -13,9 +13,7 @@ CAPTCHA_WIDTH = 160
CAPTCHA_HEIGHT = 60 CAPTCHA_HEIGHT = 60
CAPTCHA_SESSION_KEY = 'captcha_image' CAPTCHA_SESSION_KEY = 'captcha_image'
# Server side sessions tracking SESSION_TYPE = 'sqlalchemy'
# Set to TRUE for CAPTCHA, or enable another stateful session tracking system
FILESYSTEM_SESSIONS_ENABLED = True
# SAML Authnetication # SAML Authnetication
SAML_ENABLED = False SAML_ENABLED = False

View file

@ -1,4 +1,4 @@
FROM fedora:37 FROM fedora:38
RUN dnf -y --setopt=install_weak_deps=False install \ RUN dnf -y --setopt=install_weak_deps=False install \
pdns-recursor \ pdns-recursor \
@ -13,7 +13,7 @@ RUN mkdir -p /etc/pdns-recursor/api.d \
&& mkdir -p /run/pdns-recursor \ && mkdir -p /run/pdns-recursor \
&& chown -R pdns-recursor: /run/pdns-recursor && chown -R pdns-recursor: /run/pdns-recursor
ENV VERSION=4.7 \ ENV VERSION=4.8 \
PDNS_setuid=pdns-recursor \ PDNS_setuid=pdns-recursor \
PDNS_setgid=pdns-recursor \ PDNS_setgid=pdns-recursor \
PDNS_daemon=no PDNS_daemon=no

View file

@ -1,4 +1,4 @@
FROM alpine:3.17.2 FROM alpine:3.17.3
RUN apk add --no-cache \ RUN apk add --no-cache \
pdns-recursor \ pdns-recursor \

View file

@ -1,4 +1,4 @@
FROM fedora:37 FROM fedora:38
RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \ RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
&& dnf -y --setopt=install_weak_deps=False install \ && dnf -y --setopt=install_weak_deps=False install \

View file

@ -1,4 +1,4 @@
FROM alpine:3.17.2 FROM alpine:3.17.3
RUN apk add --no-cache \ RUN apk add --no-cache \
mariadb-client \ mariadb-client \