Update pdns image

This commit is contained in:
Peter Schiffer 2018-11-07 00:50:42 +01:00
parent e615b8318c
commit 6f8a31b198
No known key found for this signature in database
GPG key ID: 6CCC5046E2B0B44B
3 changed files with 7 additions and 9 deletions

View file

@ -1,5 +1,5 @@
FROM fedora:27 FROM fedora:29
MAINTAINER "Peter Schiffer" <pschiffe@redhat.com> MAINTAINER "Peter Schiffer" <peter@rfv.sk>
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 \
@ -8,10 +8,9 @@ RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
mariadb \ mariadb \
&& dnf clean all && dnf clean all
RUN pip3 install envtpl \ RUN pip3 install --no-cache-dir envtpl
&& rm -rf ~/.cache/*
ENV VERSION=4.0 \ ENV VERSION=4.1 \
PDNS_guardian=yes \ PDNS_guardian=yes \
PDNS_setuid=pdns \ PDNS_setuid=pdns \
PDNS_setgid=pdns \ PDNS_setgid=pdns \

View file

@ -1,5 +1,5 @@
FROM alpine:3.8 FROM alpine:3.8
MAINTAINER "Peter Schiffer" <pschiffe@redhat.com> MAINTAINER "Peter Schiffer" <peter@rfv.sk>
RUN apk add --no-cache \ RUN apk add --no-cache \
pdns \ pdns \
@ -8,8 +8,7 @@ RUN apk add --no-cache \
python3 \ python3 \
mariadb-client mariadb-client
RUN pip3 install envtpl \ RUN pip3 install --no-cache-dir envtpl
&& rm -rf ~/.cache/*
ENV VERSION=4.1 \ ENV VERSION=4.1 \
PDNS_guardian=yes \ PDNS_guardian=yes \

View file

@ -38,7 +38,7 @@ if [ "${SUPERMASTER_IPS:-}" ]; then
$MYSQL_COMMAND -D "$PDNS_gmysql_dbname" -e "TRUNCATE supermasters;" $MYSQL_COMMAND -D "$PDNS_gmysql_dbname" -e "TRUNCATE supermasters;"
MYSQL_INSERT_SUPERMASTERS='' MYSQL_INSERT_SUPERMASTERS=''
for i in $SUPERMASTER_IPS; do for i in $SUPERMASTER_IPS; do
MYSQL_INSERT_SUPERMASTERS="${MYSQL_INSERT_SUPERMASTERS} INSERT INTO supermasters VALUES('${i}', '${HOSTNAME}', 'admin');" MYSQL_INSERT_SUPERMASTERS="${MYSQL_INSERT_SUPERMASTERS} INSERT INTO supermasters VALUES('${i}', '$(uname -n)', 'admin');"
done done
$MYSQL_COMMAND -D "$PDNS_gmysql_dbname" -e "$MYSQL_INSERT_SUPERMASTERS" $MYSQL_COMMAND -D "$PDNS_gmysql_dbname" -e "$MYSQL_INSERT_SUPERMASTERS"
fi fi