darkspir/docker-pdns
1
0
Fork 0
mirror of https://github.com/pschiffe/docker-pdns.git synced 2025-01-18 11:01:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to f41 & alpine 3.21

Browse source 
There's now pdns 4.9 also in Fedora version.
This commit is contained in:
Peter Schiffer 2025-01-01 20:59:11 +01:00
parent fa5c8075ed
commit f14e4be008
No known key found for this signature in database
GPG key ID: F2A18AC34A008397
13 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ansible-playbook-mysql.yml
View file

@ -78,7 +78,7 @@
env: env:
MYSQL_ROOT_PASSWORD: 'my-secret-pw' MYSQL_ROOT_PASSWORD: 'my-secret-pw'
healthcheck: healthcheck:
test: ['CMD', 'healthcheck.sh', '--su=mysql', '--connect', '--innodb_initialized'] test: ['CMD', 'healthcheck.sh', '--connect', '--innodb_initialized']
timeout: 10s timeout: 10s
retries: 5 retries: 5
tags: tags:
@ -217,7 +217,7 @@
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
env: env:
PDNS_ADMIN_SQLA_DB_PASSWORD: 'my-secret-pw' PDNS_ADMIN_SQLA_DB_PASSWORD: 'my-secret-pw'
PDNS_VERSION: '4.8' PDNS_VERSION: '4.9'
PDNS_API_KEY: 'secret' PDNS_API_KEY: 'secret'
tags: tags:
- pdns-admin - pdns-admin

2
ansible-playbook-pgsql.yml
View file

@ -217,7 +217,7 @@
PDNS_ADMIN_SQLA_DB_PORT: '5432' PDNS_ADMIN_SQLA_DB_PORT: '5432'
PDNS_ADMIN_SQLA_DB_USER: 'postgres' PDNS_ADMIN_SQLA_DB_USER: 'postgres'
PDNS_ADMIN_SQLA_DB_PASSWORD: 'my-secret-pw' PDNS_ADMIN_SQLA_DB_PASSWORD: 'my-secret-pw'
PDNS_VERSION: '4.8' PDNS_VERSION: '4.9'
PDNS_API_KEY: 'secret' PDNS_API_KEY: 'secret'
tags: tags:
- pdns-admin - pdns-admin

4
docker-compose-mysql-ipv6.yml
View file

@ -26,7 +26,7 @@ services:
environment: environment:
- MYSQL_ROOT_PASSWORD=my-secret-pw - MYSQL_ROOT_PASSWORD=my-secret-pw
healthcheck: healthcheck:
test: ['CMD', 'healthcheck.sh', '--su=mysql', '--connect', '--innodb_initialized'] test: ['CMD', 'healthcheck.sh', '--connect', '--innodb_initialized']
timeout: 10s timeout: 10s
retries: 5 retries: 5
@ -112,7 +112,7 @@ services:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
environment: environment:
- PDNS_ADMIN_SQLA_DB_PASSWORD=my-secret-pw - PDNS_ADMIN_SQLA_DB_PASSWORD=my-secret-pw
- PDNS_VERSION=4.8 - PDNS_VERSION=4.9
- PDNS_API_KEY=secret - PDNS_API_KEY=secret
depends_on: depends_on:
- mariadb - mariadb

4
docker-compose-mysql.yml
View file

@ -24,7 +24,7 @@ services:
environment: environment:
- MYSQL_ROOT_PASSWORD=my-secret-pw - MYSQL_ROOT_PASSWORD=my-secret-pw
healthcheck: healthcheck:
test: ['CMD', 'healthcheck.sh', '--su=mysql', '--connect', '--innodb_initialized'] test: ['CMD', 'healthcheck.sh', '--connect', '--innodb_initialized']
timeout: 10s timeout: 10s
retries: 5 retries: 5
@ -108,7 +108,7 @@ services:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
environment: environment:
- PDNS_ADMIN_SQLA_DB_PASSWORD=my-secret-pw - PDNS_ADMIN_SQLA_DB_PASSWORD=my-secret-pw
- PDNS_VERSION=4.8 - PDNS_VERSION=4.9
- PDNS_API_KEY=secret - PDNS_API_KEY=secret
depends_on: depends_on:
- mariadb - mariadb

2
docker-compose-pgsql.yml
View file

@ -108,7 +108,7 @@ services:
- PDNS_ADMIN_SQLA_DB_PORT=5432 - PDNS_ADMIN_SQLA_DB_PORT=5432
- PDNS_ADMIN_SQLA_DB_USER=postgres - PDNS_ADMIN_SQLA_DB_USER=postgres
- PDNS_ADMIN_SQLA_DB_PASSWORD=my-secret-pw - PDNS_ADMIN_SQLA_DB_PASSWORD=my-secret-pw
- PDNS_VERSION=4.8 - PDNS_VERSION=4.9
- PDNS_API_KEY=secret - PDNS_API_KEY=secret
depends_on: depends_on:
- postgres - postgres

2
examples/kubernetes/admin-dashboard.yaml
View file

@ -48,7 +48,7 @@ spec:
- name: PDNS_API_URL - name: PDNS_API_URL
value: "http://master-api-pdns:8081/" value: "http://master-api-pdns:8081/"
- name: PDNS_VERSION - name: PDNS_VERSION
value: "4.8" value: "4.9"
- name: PDNS_API_KEY - name: PDNS_API_KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

2
pdns-admin/Dockerfile
View file

@ -28,7 +28,7 @@ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
uwsgi \ uwsgi \
uwsgi-plugin-python3 \ uwsgi-plugin-python3 \
yarn \ yarn \
https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \ https://github.com/TektonOps/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
&& dnf clean all && dnf clean all
RUN mkdir -p /opt/powerdns-admin \ RUN mkdir -p /opt/powerdns-admin \

2
pdns-admin/config.py.tpl
View file

@ -15,7 +15,7 @@ CAPTCHA_SESSION_KEY = 'captcha_image'
SESSION_TYPE = 'sqlalchemy' SESSION_TYPE = 'sqlalchemy'
# SAML Authnetication # SAML Authentication
SAML_ENABLED = False SAML_ENABLED = False
# Configuration from env vars # Configuration from env vars

6
pdns-mysql/Dockerfile
View file

@ -1,4 +1,4 @@
FROM fedora:40 FROM fedora:41
RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
&& echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \ && echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \
@ -9,7 +9,7 @@ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
hostname \ hostname \
mariadb \ mariadb \
pdns \ pdns \
https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \ https://github.com/TektonOps/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
&& dnf --setopt 'tsflags=' install pdns-backend-mysql \ && dnf --setopt 'tsflags=' install pdns-backend-mysql \
&& dnf clean all && dnf clean all
@ -18,7 +18,7 @@ RUN mkdir -p /run/pdns \
COPY pdns.conf.tpl docker-entrypoint.sh / COPY pdns.conf.tpl docker-entrypoint.sh /
ENV VERSION=4.8 \ ENV VERSION=4.9 \
PDNS_guardian=yes \ PDNS_guardian=yes \
PDNS_setuid=pdns \ PDNS_setuid=pdns \
PDNS_setgid=pdns \ PDNS_setgid=pdns \

4
pdns-mysql/Dockerfile.alpine
View file

@ -1,4 +1,4 @@
FROM alpine:3.20.0 FROM alpine:3.21
RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
&& apk update \ && apk update \
@ -8,7 +8,7 @@ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
pdns \ pdns \
pdns-backend-mysql \ pdns-backend-mysql \
pdns-doc \ pdns-doc \
&& wget -O subvars.apk https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.apk \ && wget -O subvars.apk https://github.com/TektonOps/subvars/releases/download/v0.1.5/subvars_${arch}.apk \
&& apk add --allow-untrusted subvars.apk \ && apk add --allow-untrusted subvars.apk \
&& rm -rf subvars.apk /var/cache/apk/* && rm -rf subvars.apk /var/cache/apk/*

6
pdns-pgsql/Dockerfile
View file

@ -1,4 +1,4 @@
FROM fedora:40 FROM fedora:41
RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
&& echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \ && echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \
@ -9,7 +9,7 @@ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
hostname \ hostname \
pdns \ pdns \
postgresql16 \ postgresql16 \
https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \ https://github.com/TektonOps/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
&& dnf --setopt 'tsflags=' install pdns-backend-postgresql \ && dnf --setopt 'tsflags=' install pdns-backend-postgresql \
&& dnf clean all && dnf clean all
@ -18,7 +18,7 @@ RUN mkdir -p /run/pdns \
COPY pdns.conf.tpl docker-entrypoint.sh / COPY pdns.conf.tpl docker-entrypoint.sh /
ENV VERSION=4.8 \ ENV VERSION=4.9 \
PDNS_guardian=yes \ PDNS_guardian=yes \
PDNS_setuid=pdns \ PDNS_setuid=pdns \
PDNS_setgid=pdns \ PDNS_setgid=pdns \

4
pdns-pgsql/Dockerfile.alpine
View file

@ -1,4 +1,4 @@
FROM alpine:3.20.0 FROM alpine:3.21
RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
&& apk update \ && apk update \
@ -8,7 +8,7 @@ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
pdns-backend-pgsql \ pdns-backend-pgsql \
pdns-doc \ pdns-doc \
postgresql16-client \ postgresql16-client \
&& wget -O subvars.apk https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.apk \ && wget -O subvars.apk https://github.com/TektonOps/subvars/releases/download/v0.1.5/subvars_${arch}.apk \
&& apk add --allow-untrusted subvars.apk \ && apk add --allow-untrusted subvars.apk \
&& rm -rf subvars.apk /var/cache/apk/* && rm -rf subvars.apk /var/cache/apk/*

4
pdns-recursor/docker-entrypoint.sh
View file

@ -4,7 +4,7 @@ set -eu
#### Function definitions #### Function definitions
deriveConfigValuesFromEnvrionement() { deriveConfigValuesFromEnvironment() {
# Configure base vars # Configure base vars
: "${PDNS_local_port:=53}" : "${PDNS_local_port:=53}"
: "${PDNS_local_address:=0.0.0.0}" : "${PDNS_local_address:=0.0.0.0}"
@ -24,7 +24,7 @@ elif [ -f /etc/alpine-release ]; then
fi fi
if [ "${USE_EXISTING_CONFIG_FILE:-false}" = 'false' ]; then if [ "${USE_EXISTING_CONFIG_FILE:-false}" = 'false' ]; then
deriveConfigValuesFromEnvrionement deriveConfigValuesFromEnvironment
echo "Generating config file from environment" echo "Generating config file from environment"
subvars --prefix 'PDNS_' < '/recursor.conf.tpl' > "${config_file}" subvars --prefix 'PDNS_' < '/recursor.conf.tpl' > "${config_file}"
chown "${pdns_user}:" "${config_file}" chown "${pdns_user}:" "${config_file}"