mirror of
https://github.com/pschiffe/docker-pdns.git
synced 2024-09-21 07:05:00 +02:00
Minor updates (#59)
* 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
GitHub
parent
540d21dab6
commit
c9247f4b32
11 changed files with 29 additions and 35 deletions
4
.github/workflows/docker-image-pr.yml
vendored
4
.github/workflows/docker-image-pr.yml
vendored
|
|
@ -53,7 +53,7 @@ jobs:
|
|||
file: ./pdns/Dockerfile
|
||||
builder: ${{ steps.buildx.outputs.name }}
|
||||
push: false
|
||||
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns:latest
|
||||
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-mysql:latest
|
||||
|
||||
- name: Image digest
|
||||
run: echo ${{ steps.docker_build_pdns_latest.outputs.digest }}
|
||||
|
|
@ -66,7 +66,7 @@ jobs:
|
|||
file: ./pdns/Dockerfile.alpine
|
||||
builder: ${{ steps.buildx.outputs.name }}
|
||||
push: false
|
||||
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns:alpine
|
||||
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-mysql:alpine
|
||||
|
||||
- name: Image digest
|
||||
run: echo ${{ steps.docker_build_pdns_alpine.outputs.digest }}
|
||||
|
|
|
|||
4
.github/workflows/docker-image.yml
vendored
4
.github/workflows/docker-image.yml
vendored
|
|
@ -59,7 +59,7 @@ jobs:
|
|||
file: ./pdns/Dockerfile
|
||||
builder: ${{ steps.buildx.outputs.name }}
|
||||
push: true
|
||||
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns:latest
|
||||
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-mysql:latest
|
||||
|
||||
- name: Image digest
|
||||
run: echo ${{ steps.docker_build_pdns_latest.outputs.digest }}
|
||||
|
|
@ -72,7 +72,7 @@ jobs:
|
|||
file: ./pdns/Dockerfile.alpine
|
||||
builder: ${{ steps.buildx.outputs.name }}
|
||||
push: true
|
||||
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns:alpine
|
||||
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-mysql:alpine
|
||||
|
||||
- name: Image digest
|
||||
run: echo ${{ steps.docker_build_pdns_alpine.outputs.digest }}
|
||||
|
|
|
|||
18
README.md
18
README.md
|
|
@ -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.
|
||||
|
||||
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 .
|
||||
|
||||
All images are available on Docker Hub:
|
||||
|
|
@ -18,9 +16,7 @@ https://hub.docker.com/r/pschiffe/pdns-admin-static/
|
|||
|
||||
## pdns-mysql
|
||||
|
||||
[](https://microbadger.com/images/pschiffe/pdns-mysql "Get your own version badge on microbadger.com") [](http://microbadger.com/images/pschiffe/pdns-mysql "Get your own image badge on microbadger.com")
|
||||
|
||||
[](https://microbadger.com/images/pschiffe/pdns-mysql:alpine "Get your own version badge on microbadger.com") [](https://microbadger.com/images/pschiffe/pdns-mysql:alpine "Get your own image badge on microbadger.com")
|
||||
  
|
||||
|
||||
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
|
||||
|
||||
[](https://microbadger.com/images/pschiffe/pdns-recursor "Get your own version badge on microbadger.com") [](https://microbadger.com/images/pschiffe/pdns-recursor "Get your own image badge on microbadger.com")
|
||||
|
||||
[](https://microbadger.com/images/pschiffe/pdns-recursor:alpine "Get your own version badge on microbadger.com") [](https://microbadger.com/images/pschiffe/pdns-recursor:alpine "Get your own image badge on microbadger.com")
|
||||
  
|
||||
|
||||
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
|
||||
|
||||
[](https://microbadger.com/images/pschiffe/pdns-admin-uwsgi:ngoduykhanh "Get your own version badge on microbadger.com") [](https://microbadger.com/images/pschiffe/pdns-admin-ngoduykhanh:alpine "Get your own image badge on microbadger.com")
|
||||
 
|
||||
|
||||
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 \
|
||||
--link mariadb:mysql --link pdns-master:pdns \
|
||||
-v pdns-admin-upload:/opt/powerdns-admin/upload \
|
||||
pschiffe/pdns-admin-uwsgi:ngoduykhanh
|
||||
pschiffe/pdns-admin-uwsgi
|
||||
```
|
||||
|
||||
## pdns-admin-static
|
||||
|
||||
[](https://microbadger.com/images/pschiffe/pdns-admin-static:ngoduykhanh "Get your own version badge on microbadger.com") [](https://microbadger.com/images/pschiffe/pdns-admin-static:ngoduykhanh "Get your own image badge on microbadger.com")
|
||||
 
|
||||
|
||||
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 \
|
||||
--link pdns-admin-uwsgi:pdns-admin-uwsgi \
|
||||
pschiffe/pdns-admin-static:ngoduykhanh
|
||||
pschiffe/pdns-admin-static
|
||||
```
|
||||
|
||||
## ansible-playbook.yml
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
- name: db
|
||||
docker_container:
|
||||
name: pdns-mariadb
|
||||
image: mariadb:10.5
|
||||
image: mariadb:10.6
|
||||
pull: true
|
||||
state: '{{ c_state }}'
|
||||
networks_cli_compatible: true
|
||||
|
|
@ -188,7 +188,7 @@
|
|||
- name: build pdns-admin base
|
||||
docker_image:
|
||||
name: pschiffe/pdns-admin-base
|
||||
tag: ngoduykhanh
|
||||
tag: latest
|
||||
state: '{{ i_state }}'
|
||||
source: build
|
||||
force_source: true
|
||||
|
|
@ -201,7 +201,7 @@
|
|||
- name: build pdns-admin backend
|
||||
docker_image:
|
||||
name: pschiffe/pdns-admin-uwsgi
|
||||
tag: ngoduykhanh
|
||||
tag: latest
|
||||
state: '{{ i_state }}'
|
||||
source: build
|
||||
force_source: true
|
||||
|
|
@ -214,7 +214,7 @@
|
|||
- name: build pdns-admin frontent
|
||||
docker_image:
|
||||
name: pschiffe/pdns-admin-static
|
||||
tag: ngoduykhanh
|
||||
tag: latest
|
||||
state: '{{ i_state }}'
|
||||
source: build
|
||||
force_source: true
|
||||
|
|
@ -227,7 +227,7 @@
|
|||
- name: pdns-admin backend
|
||||
docker_container:
|
||||
name: pdns-admin-uwsgi
|
||||
image: pschiffe/pdns-admin-uwsgi:ngoduykhanh
|
||||
image: pschiffe/pdns-admin-uwsgi
|
||||
state: '{{ c_state }}'
|
||||
networks_cli_compatible: true
|
||||
networks:
|
||||
|
|
@ -238,7 +238,7 @@
|
|||
- /etc/localtime:/etc/localtime:ro
|
||||
env:
|
||||
PDNS_ADMIN_SQLA_DB_PASSWORD: "'my-secret-pw'"
|
||||
PDNS_VERSION: "4.3"
|
||||
PDNS_VERSION: "4.4"
|
||||
PDNS_API_KEY: "secret"
|
||||
tags:
|
||||
- pdns-admin
|
||||
|
|
@ -246,7 +246,7 @@
|
|||
- name: pdns-admin frontend
|
||||
docker_container:
|
||||
name: pdns-admin-static
|
||||
image: pschiffe/pdns-admin-static:ngoduykhanh
|
||||
image: pschiffe/pdns-admin-static
|
||||
state: '{{ c_state }}'
|
||||
networks_cli_compatible: true
|
||||
networks:
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ services:
|
|||
- /etc/localtime:/etc/localtime:ro
|
||||
|
||||
mariadb:
|
||||
image: mariadb:10.5
|
||||
image: mariadb:10.6
|
||||
networks:
|
||||
pdns:
|
||||
aliases:
|
||||
|
|
@ -91,7 +91,7 @@ services:
|
|||
- pdns-master
|
||||
|
||||
pdns-admin-uwsgi:
|
||||
image: pschiffe/pdns-admin-uwsgi:ngoduykhanh
|
||||
image: pschiffe/pdns-admin-uwsgi
|
||||
networks:
|
||||
pdns:
|
||||
aliases:
|
||||
|
|
@ -100,14 +100,14 @@ services:
|
|||
- /etc/localtime:/etc/localtime:ro
|
||||
environment:
|
||||
- PDNS_ADMIN_SQLA_DB_PASSWORD='my-secret-pw'
|
||||
- PDNS_VERSION=4.3
|
||||
- PDNS_VERSION=4.4
|
||||
- PDNS_API_KEY=secret
|
||||
depends_on:
|
||||
- mariadb
|
||||
- pdns-master
|
||||
|
||||
pdns-admin-static:
|
||||
image: pschiffe/pdns-admin-static:ngoduykhanh
|
||||
image: pschiffe/pdns-admin-static
|
||||
networks:
|
||||
- pdns
|
||||
ports:
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ spec:
|
|||
- "pdns-admin-uwsgi"
|
||||
containers:
|
||||
- name: pdns-admin-static
|
||||
image: pschiffe/pdns-admin-static:ngoduykhanh
|
||||
image: pschiffe/pdns-admin-static
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 80
|
||||
|
|
@ -39,7 +39,7 @@ spec:
|
|||
cpu: 50m
|
||||
memory: 64Mi
|
||||
- name: pdns-admin-uwsgi
|
||||
image: pschiffe/pdns-admin-uwsgi:ngoduykhanh
|
||||
image: pschiffe/pdns-admin-uwsgi
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
- name: PDNS_ADMIN_SQLA_DB_HOST
|
||||
|
|
@ -58,7 +58,7 @@ spec:
|
|||
- name: PDNS_API_URL
|
||||
value: "http://master-api-pdns:8081/"
|
||||
- name: PDNS_VERSION
|
||||
value: "4.2.1"
|
||||
value: "4.4"
|
||||
- name: PDNS_API_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ spec:
|
|||
spec:
|
||||
containers:
|
||||
- name: mariadb-pdns
|
||||
image: mariadb:10.4
|
||||
image: mariadb:10.6
|
||||
imagePullPolicy: Always
|
||||
env:
|
||||
- name: MYSQL_ROOT_PASSWORD
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM pschiffe/pdns-admin-base:ngoduykhanh
|
||||
FROM pschiffe/pdns-admin-base
|
||||
|
||||
RUN dnf -y --setopt=install_weak_deps=False install \
|
||||
nginx \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM pschiffe/pdns-admin-base:ngoduykhanh
|
||||
FROM pschiffe/pdns-admin-base
|
||||
|
||||
RUN dnf -y --setopt=install_weak_deps=False install \
|
||||
mariadb \
|
||||
|
|
|
|||
|
|
@ -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.3 \
|
||||
ENV VERSION=4.4 \
|
||||
PDNS_setuid=pdns-recursor \
|
||||
PDNS_setgid=pdns-recursor \
|
||||
PDNS_daemon=no
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ RUN apk add --no-cache \
|
|||
|
||||
RUN pip3 install --no-cache-dir envtpl
|
||||
|
||||
ENV VERSION=4.3 \
|
||||
ENV VERSION=4.4 \
|
||||
PDNS_guardian=yes \
|
||||
PDNS_setuid=pdns \
|
||||
PDNS_setgid=pdns \
|
||||
|
|
|
|||
Loading…
Reference in a new issue