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

Minor updates (#59)

Browse source 
* Update PDNS recursor version in Fedora image

* Update PDNS version in alpine image

* Update Dockerfile

* Update Dockerfile

* Update mariadb image version in kubernetes example

* Update admin images in k8s example

* Update ansible-playbook.yml

* Fix PDNS version in k8s example

* Update docker-compose.yml

* Update README.md

* Update docker-image.yml

* Update docker-image-pr.yml
This commit is contained in:
Peter Schiffer 2021-10-06 00:00:38 +02:00 committed by GitHub
parent 540d21dab6
commit c9247f4b32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 29 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/docker-image-pr.yml vendored
View file

@ -53,7 +53,7 @@ jobs:
file: ./pdns/Dockerfile file: ./pdns/Dockerfile
builder: ${{ steps.buildx.outputs.name }} builder: ${{ steps.buildx.outputs.name }}
push: false push: false
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns:latest tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-mysql:latest
- name: Image digest - name: Image digest
run: echo ${{ steps.docker_build_pdns_latest.outputs.digest }} run: echo ${{ steps.docker_build_pdns_latest.outputs.digest }}
@ -66,7 +66,7 @@ jobs:
file: ./pdns/Dockerfile.alpine file: ./pdns/Dockerfile.alpine
builder: ${{ steps.buildx.outputs.name }} builder: ${{ steps.buildx.outputs.name }}
push: false push: false
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns:alpine tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-mysql:alpine
- name: Image digest - name: Image digest
run: echo ${{ steps.docker_build_pdns_alpine.outputs.digest }} run: echo ${{ steps.docker_build_pdns_alpine.outputs.digest }}

4
.github/workflows/docker-image.yml vendored
View file

@ -59,7 +59,7 @@ jobs:
file: ./pdns/Dockerfile file: ./pdns/Dockerfile
builder: ${{ steps.buildx.outputs.name }} builder: ${{ steps.buildx.outputs.name }}
push: true push: true
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns:latest tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-mysql:latest
- name: Image digest - name: Image digest
run: echo ${{ steps.docker_build_pdns_latest.outputs.digest }} run: echo ${{ steps.docker_build_pdns_latest.outputs.digest }}
@ -72,7 +72,7 @@ jobs:
file: ./pdns/Dockerfile.alpine file: ./pdns/Dockerfile.alpine
builder: ${{ steps.buildx.outputs.name }} builder: ${{ steps.buildx.outputs.name }}
push: true push: true
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns:alpine tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-mysql:alpine
- name: Image digest - name: Image digest
run: echo ${{ steps.docker_build_pdns_alpine.outputs.digest }} run: echo ${{ steps.docker_build_pdns_alpine.outputs.digest }}

18
README.md
View file

@ -2,8 +2,6 @@
This repository contains four Docker images - pdns-mysql, pdns-recursor, pdns-admin-static and pdns-admin-uwsgi. Image **pdns-mysql** contains completely configurable [PowerDNS 4.x server](https://www.powerdns.com/) with mysql backend (without mysql server). Image **pdns-recursor** contains completely configurable [PowerDNS 4.x recursor](https://www.powerdns.com/). Images **pdns-admin-static** and **pdns-admin-uwsgi** contains fronted (nginx) and backend (uWSGI) for [PowerDNS Admin](https://github.com/ngoduykhanh/PowerDNS-Admin) web app, written in Flask, for managing PowerDNS servers. This repository contains four Docker images - pdns-mysql, pdns-recursor, pdns-admin-static and pdns-admin-uwsgi. Image **pdns-mysql** contains completely configurable [PowerDNS 4.x server](https://www.powerdns.com/) with mysql backend (without mysql server). Image **pdns-recursor** contains completely configurable [PowerDNS 4.x recursor](https://www.powerdns.com/). Images **pdns-admin-static** and **pdns-admin-uwsgi** contains fronted (nginx) and backend (uWSGI) for [PowerDNS Admin](https://github.com/ngoduykhanh/PowerDNS-Admin) web app, written in Flask, for managing PowerDNS servers.
There are two versions of PowerDNS Admin - the old and deprecated `pschiffe/pdns-admin-uwsgi:latest` and `pschiffe/pdns-admin-static:latest` based on https://git.0x97.io/0x97/powerdns-admin . The new and updated version with more features is available as `pschiffe/pdns-admin-uwsgi:ngoduykhanh` and `pschiffe/pdns-admin-static:ngoduykhanh` and is based on https://github.com/ngoduykhanh/PowerDNS-Admin . The `latest` tag points to the older version of PowerDNS Admin for backwards compatibility.
The pdns-mysql and pdns-recursor images have also the `alpine` tag thanks to the @PoppyPop . The pdns-mysql and pdns-recursor images have also the `alpine` tag thanks to the @PoppyPop .
All images are available on Docker Hub: All images are available on Docker Hub:
@ -18,9 +16,7 @@ https://hub.docker.com/r/pschiffe/pdns-admin-static/
## pdns-mysql ## pdns-mysql
[![](https://images.microbadger.com/badges/version/pschiffe/pdns-mysql.svg)](https://microbadger.com/images/pschiffe/pdns-mysql "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/pschiffe/pdns-mysql.svg)](http://microbadger.com/images/pschiffe/pdns-mysql "Get your own image badge on microbadger.com") ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/pschiffe/pdns-mysql/latest?label=latest) ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/pschiffe/pdns-mysql/alpine?label=alpine) ![Docker Pulls](https://img.shields.io/docker/pulls/pschiffe/pdns-mysql)
[![](https://images.microbadger.com/badges/version/pschiffe/pdns-mysql:alpine.svg)](https://microbadger.com/images/pschiffe/pdns-mysql:alpine "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/pschiffe/pdns-mysql:alpine.svg)](https://microbadger.com/images/pschiffe/pdns-mysql:alpine "Get your own image badge on microbadger.com")
https://hub.docker.com/r/pschiffe/pdns-mysql/ https://hub.docker.com/r/pschiffe/pdns-mysql/
@ -76,9 +72,7 @@ docker run -d -p 53:53 -p 53:53/udp --name pdns-slave \
## pdns-recursor ## pdns-recursor
[![](https://images.microbadger.com/badges/version/pschiffe/pdns-recursor.svg)](https://microbadger.com/images/pschiffe/pdns-recursor "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/pschiffe/pdns-recursor.svg)](https://microbadger.com/images/pschiffe/pdns-recursor "Get your own image badge on microbadger.com") ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/pschiffe/pdns-recursor/latest?label=latest) ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/pschiffe/pdns-recursor/alpine?label=alpine) ![Docker Pulls](https://img.shields.io/docker/pulls/pschiffe/pdns-recursor)
[![](https://images.microbadger.com/badges/version/pschiffe/pdns-recursor:alpine.svg)](https://microbadger.com/images/pschiffe/pdns-recursor:alpine "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/pschiffe/pdns-recursor:alpine.svg)](https://microbadger.com/images/pschiffe/pdns-recursor:alpine "Get your own image badge on microbadger.com")
https://hub.docker.com/r/pschiffe/pdns-recursor/ https://hub.docker.com/r/pschiffe/pdns-recursor/
@ -102,7 +96,7 @@ docker run -d -p 53:53 -p 53:53/udp --name pdns-recursor \
## pdns-admin-uwsgi ## pdns-admin-uwsgi
[![](https://images.microbadger.com/badges/version/pschiffe/pdns-admin-uwsgi:ngoduykhanh.svg)](https://microbadger.com/images/pschiffe/pdns-admin-uwsgi:ngoduykhanh "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/pschiffe/pdns-admin-uwsgi:ngoduykhanh.svg)](https://microbadger.com/images/pschiffe/pdns-admin-ngoduykhanh:alpine "Get your own image badge on microbadger.com") ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/pschiffe/pdns-admin-uwsgi/latest?label=latest) ![Docker Pulls](https://img.shields.io/docker/pulls/pschiffe/pdns-admin-uwsgi)
https://hub.docker.com/r/pschiffe/pdns-admin-uwsgi/ https://hub.docker.com/r/pschiffe/pdns-admin-uwsgi/
@ -154,12 +148,12 @@ When linked with pdns-mysql from this repo and with LDAP auth:
docker run -d --name pdns-admin-uwsgi \ docker run -d --name pdns-admin-uwsgi \
--link mariadb:mysql --link pdns-master:pdns \ --link mariadb:mysql --link pdns-master:pdns \
-v pdns-admin-upload:/opt/powerdns-admin/upload \ -v pdns-admin-upload:/opt/powerdns-admin/upload \
pschiffe/pdns-admin-uwsgi:ngoduykhanh pschiffe/pdns-admin-uwsgi
``` ```
## pdns-admin-static ## pdns-admin-static
[![](https://images.microbadger.com/badges/version/pschiffe/pdns-admin-static:ngoduykhanh.svg)](https://microbadger.com/images/pschiffe/pdns-admin-static:ngoduykhanh "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/pschiffe/pdns-admin-static:ngoduykhanh.svg)](https://microbadger.com/images/pschiffe/pdns-admin-static:ngoduykhanh "Get your own image badge on microbadger.com") ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/pschiffe/pdns-admin-static/latest?label=latest) ![Docker Pulls](https://img.shields.io/docker/pulls/pschiffe/pdns-admin-static)
https://hub.docker.com/r/pschiffe/pdns-admin-static/ https://hub.docker.com/r/pschiffe/pdns-admin-static/
@ -170,7 +164,7 @@ Fronted image with nginx and static files for [PowerDNS Admin](https://github.co
``` ```
docker run -d -p 8080:80 --name pdns-admin-static \ docker run -d -p 8080:80 --name pdns-admin-static \
--link pdns-admin-uwsgi:pdns-admin-uwsgi \ --link pdns-admin-uwsgi:pdns-admin-uwsgi \
pschiffe/pdns-admin-static:ngoduykhanh pschiffe/pdns-admin-static
``` ```
## ansible-playbook.yml ## ansible-playbook.yml

14
ansible-playbook.yml
View file

@ -62,7 +62,7 @@
- name: db - name: db
docker_container: docker_container:
name: pdns-mariadb name: pdns-mariadb
image: mariadb:10.5 image: mariadb:10.6
pull: true pull: true
state: '{{ c_state }}' state: '{{ c_state }}'
networks_cli_compatible: true networks_cli_compatible: true
@ -188,7 +188,7 @@
- name: build pdns-admin base - name: build pdns-admin base
docker_image: docker_image:
name: pschiffe/pdns-admin-base name: pschiffe/pdns-admin-base
tag: ngoduykhanh tag: latest
state: '{{ i_state }}' state: '{{ i_state }}'
source: build source: build
force_source: true force_source: true
@ -201,7 +201,7 @@
- name: build pdns-admin backend - name: build pdns-admin backend
docker_image: docker_image:
name: pschiffe/pdns-admin-uwsgi name: pschiffe/pdns-admin-uwsgi
tag: ngoduykhanh tag: latest
state: '{{ i_state }}' state: '{{ i_state }}'
source: build source: build
force_source: true force_source: true
@ -214,7 +214,7 @@
- name: build pdns-admin frontent - name: build pdns-admin frontent
docker_image: docker_image:
name: pschiffe/pdns-admin-static name: pschiffe/pdns-admin-static
tag: ngoduykhanh tag: latest
state: '{{ i_state }}' state: '{{ i_state }}'
source: build source: build
force_source: true force_source: true
@ -227,7 +227,7 @@
- name: pdns-admin backend - name: pdns-admin backend
docker_container: docker_container:
name: pdns-admin-uwsgi name: pdns-admin-uwsgi
image: pschiffe/pdns-admin-uwsgi:ngoduykhanh image: pschiffe/pdns-admin-uwsgi
state: '{{ c_state }}' state: '{{ c_state }}'
networks_cli_compatible: true networks_cli_compatible: true
networks: networks:
@ -238,7 +238,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.3" PDNS_VERSION: "4.4"
PDNS_API_KEY: "secret" PDNS_API_KEY: "secret"
tags: tags:
- pdns-admin - pdns-admin
@ -246,7 +246,7 @@
- name: pdns-admin frontend - name: pdns-admin frontend
docker_container: docker_container:
name: pdns-admin-static name: pdns-admin-static
image: pschiffe/pdns-admin-static:ngoduykhanh image: pschiffe/pdns-admin-static
state: '{{ c_state }}' state: '{{ c_state }}'
networks_cli_compatible: true networks_cli_compatible: true
networks: networks:

8
docker-compose.yml
View file

@ -10,7 +10,7 @@ services:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
mariadb: mariadb:
image: mariadb:10.5 image: mariadb:10.6
networks: networks:
pdns: pdns:
aliases: aliases:
@ -91,7 +91,7 @@ services:
- pdns-master - pdns-master
pdns-admin-uwsgi: pdns-admin-uwsgi:
image: pschiffe/pdns-admin-uwsgi:ngoduykhanh image: pschiffe/pdns-admin-uwsgi
networks: networks:
pdns: pdns:
aliases: aliases:
@ -100,14 +100,14 @@ 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.3 - PDNS_VERSION=4.4
- PDNS_API_KEY=secret - PDNS_API_KEY=secret
depends_on: depends_on:
- mariadb - mariadb
- pdns-master - pdns-master
pdns-admin-static: pdns-admin-static:
image: pschiffe/pdns-admin-static:ngoduykhanh image: pschiffe/pdns-admin-static
networks: networks:
- pdns - pdns
ports: ports:

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

@ -26,7 +26,7 @@ spec:
- "pdns-admin-uwsgi" - "pdns-admin-uwsgi"
containers: containers:
- name: pdns-admin-static - name: pdns-admin-static
image: pschiffe/pdns-admin-static:ngoduykhanh image: pschiffe/pdns-admin-static
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 80 - containerPort: 80
@ -39,7 +39,7 @@ spec:
cpu: 50m cpu: 50m
memory: 64Mi memory: 64Mi
- name: pdns-admin-uwsgi - name: pdns-admin-uwsgi
image: pschiffe/pdns-admin-uwsgi:ngoduykhanh image: pschiffe/pdns-admin-uwsgi
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: PDNS_ADMIN_SQLA_DB_HOST - name: PDNS_ADMIN_SQLA_DB_HOST
@ -58,7 +58,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.2.1" value: "4.4"
- name: PDNS_API_KEY - name: PDNS_API_KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

2
examples/kubernetes/mariadb.yaml
View file

@ -27,7 +27,7 @@ spec:
spec: spec:
containers: containers:
- name: mariadb-pdns - name: mariadb-pdns
image: mariadb:10.4 image: mariadb:10.6
imagePullPolicy: Always imagePullPolicy: Always
env: env:
- name: MYSQL_ROOT_PASSWORD - name: MYSQL_ROOT_PASSWORD

2
pdns-admin-static-ngoduykhanh/Dockerfile
View file

@ -1,4 +1,4 @@
FROM pschiffe/pdns-admin-base:ngoduykhanh FROM pschiffe/pdns-admin-base
RUN dnf -y --setopt=install_weak_deps=False install \ RUN dnf -y --setopt=install_weak_deps=False install \
nginx \ nginx \

2
pdns-admin-uwsgi-ngoduykhanh/Dockerfile
View file

@ -1,4 +1,4 @@
FROM pschiffe/pdns-admin-base:ngoduykhanh FROM pschiffe/pdns-admin-base
RUN dnf -y --setopt=install_weak_deps=False install \ RUN dnf -y --setopt=install_weak_deps=False install \
mariadb \ mariadb \

2
pdns-recursor/Dockerfile
View file

@ -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.3 \ ENV VERSION=4.4 \
PDNS_setuid=pdns-recursor \ PDNS_setuid=pdns-recursor \
PDNS_setgid=pdns-recursor \ PDNS_setgid=pdns-recursor \
PDNS_daemon=no PDNS_daemon=no

2
pdns/Dockerfile.alpine
View file

@ -10,7 +10,7 @@ RUN apk add --no-cache \
RUN pip3 install --no-cache-dir envtpl RUN pip3 install --no-cache-dir envtpl
ENV VERSION=4.3 \ ENV VERSION=4.4 \
PDNS_guardian=yes \ PDNS_guardian=yes \
PDNS_setuid=pdns \ PDNS_setuid=pdns \
PDNS_setgid=pdns \ PDNS_setgid=pdns \