From c9247f4b32913f171a587ce802f312584f6f3263 Mon Sep 17 00:00:00 2001 From: Peter Schiffer <3899107+pschiffe@users.noreply.github.com> Date: Wed, 6 Oct 2021 00:00:38 +0200 Subject: [PATCH] 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 --- .github/workflows/docker-image-pr.yml | 4 ++-- .github/workflows/docker-image.yml | 4 ++-- README.md | 18 ++++++------------ ansible-playbook.yml | 14 +++++++------- docker-compose.yml | 8 ++++---- examples/kubernetes/admin-dashboard.yaml | 6 +++--- examples/kubernetes/mariadb.yaml | 2 +- pdns-admin-static-ngoduykhanh/Dockerfile | 2 +- pdns-admin-uwsgi-ngoduykhanh/Dockerfile | 2 +- pdns-recursor/Dockerfile | 2 +- pdns/Dockerfile.alpine | 2 +- 11 files changed, 29 insertions(+), 35 deletions(-) diff --git a/.github/workflows/docker-image-pr.yml b/.github/workflows/docker-image-pr.yml index c40e439..4c288f7 100644 --- a/.github/workflows/docker-image-pr.yml +++ b/.github/workflows/docker-image-pr.yml @@ -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 }} diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 16ea5a5..76a530b 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -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 }} diff --git a/README.md b/README.md index 3177e1f..8245c80 100644 --- a/README.md +++ b/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://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") - -[![](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") +![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://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://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") - -[![](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") +![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://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://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/ @@ -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://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/ @@ -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 diff --git a/ansible-playbook.yml b/ansible-playbook.yml index 4b12c75..081c53f 100644 --- a/ansible-playbook.yml +++ b/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: diff --git a/docker-compose.yml b/docker-compose.yml index a88515c..0ece120 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: diff --git a/examples/kubernetes/admin-dashboard.yaml b/examples/kubernetes/admin-dashboard.yaml index d1142fd..384dfaa 100644 --- a/examples/kubernetes/admin-dashboard.yaml +++ b/examples/kubernetes/admin-dashboard.yaml @@ -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: diff --git a/examples/kubernetes/mariadb.yaml b/examples/kubernetes/mariadb.yaml index a5ef67d..502db38 100644 --- a/examples/kubernetes/mariadb.yaml +++ b/examples/kubernetes/mariadb.yaml @@ -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 diff --git a/pdns-admin-static-ngoduykhanh/Dockerfile b/pdns-admin-static-ngoduykhanh/Dockerfile index 8d73956..2c5cd11 100644 --- a/pdns-admin-static-ngoduykhanh/Dockerfile +++ b/pdns-admin-static-ngoduykhanh/Dockerfile @@ -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 \ diff --git a/pdns-admin-uwsgi-ngoduykhanh/Dockerfile b/pdns-admin-uwsgi-ngoduykhanh/Dockerfile index 33f7a92..bb58f81 100644 --- a/pdns-admin-uwsgi-ngoduykhanh/Dockerfile +++ b/pdns-admin-uwsgi-ngoduykhanh/Dockerfile @@ -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 \ diff --git a/pdns-recursor/Dockerfile b/pdns-recursor/Dockerfile index c2dc122..17f3333 100644 --- a/pdns-recursor/Dockerfile +++ b/pdns-recursor/Dockerfile @@ -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 diff --git a/pdns/Dockerfile.alpine b/pdns/Dockerfile.alpine index 6d15cda..bad9ccb 100644 --- a/pdns/Dockerfile.alpine +++ b/pdns/Dockerfile.alpine @@ -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 \