From 632a190a494fd25c79a2aa2465ca98eb4b373cf4 Mon Sep 17 00:00:00 2001 From: pschff <3899107+pschiffe@users.noreply.github.com> Date: Mon, 27 Dec 2021 22:18:26 +0100 Subject: [PATCH] We are already on PDNS version 4.5 resolves: #65 --- .../docker-image-tag-pdns-alpine-45.yml | 39 +++++++++++++++++++ .../docker-image-tag-pdns-fedora-45.yml | 39 +++++++++++++++++++ .../docker-image-tag-recursor-alpine-45.yml | 39 +++++++++++++++++++ .../docker-image-tag-recursor-fedora-45.yml | 39 +++++++++++++++++++ docker-compose.yml | 2 +- examples/kubernetes/admin-dashboard.yaml | 2 +- pdns-recursor/Dockerfile | 2 +- pdns-recursor/Dockerfile.alpine | 2 +- pdns/Dockerfile | 2 +- pdns/Dockerfile.alpine | 2 +- 10 files changed, 162 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/docker-image-tag-pdns-alpine-45.yml create mode 100644 .github/workflows/docker-image-tag-pdns-fedora-45.yml create mode 100644 .github/workflows/docker-image-tag-recursor-alpine-45.yml create mode 100644 .github/workflows/docker-image-tag-recursor-fedora-45.yml diff --git a/.github/workflows/docker-image-tag-pdns-alpine-45.yml b/.github/workflows/docker-image-tag-pdns-alpine-45.yml new file mode 100644 index 0000000..34a0bfe --- /dev/null +++ b/.github/workflows/docker-image-tag-pdns-alpine-45.yml @@ -0,0 +1,39 @@ +name: Docker Image CI pdns-mysql 4.5 alpine + +on: + push: + tags: [ 'pdns-mysql-alpine-4.5' ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + + - name: Check Out Repo + uses: actions/checkout@v2 + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + + - name: Build and push PDNS + id: docker_build_pdns + uses: docker/build-push-action@v2 + with: + context: ./pdns + file: ./pdns/Dockerfile.alpine + builder: ${{ steps.buildx.outputs.name }} + push: true + tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-mysql:4.5-alpine + + - name: Image digest + run: echo ${{ steps.docker_build_pdns.outputs.digest }} diff --git a/.github/workflows/docker-image-tag-pdns-fedora-45.yml b/.github/workflows/docker-image-tag-pdns-fedora-45.yml new file mode 100644 index 0000000..76dab0c --- /dev/null +++ b/.github/workflows/docker-image-tag-pdns-fedora-45.yml @@ -0,0 +1,39 @@ +name: Docker Image CI pdns-mysql 4.5 latest + +on: + push: + tags: [ 'pdns-mysql-fedora-4.5' ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + + - name: Check Out Repo + uses: actions/checkout@v2 + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + + - name: Build and push PDNS + id: docker_build_pdns + uses: docker/build-push-action@v2 + with: + context: ./pdns + file: ./pdns/Dockerfile + builder: ${{ steps.buildx.outputs.name }} + push: true + tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-mysql:4.5 + + - name: Image digest + run: echo ${{ steps.docker_build_pdns.outputs.digest }} diff --git a/.github/workflows/docker-image-tag-recursor-alpine-45.yml b/.github/workflows/docker-image-tag-recursor-alpine-45.yml new file mode 100644 index 0000000..043c2c4 --- /dev/null +++ b/.github/workflows/docker-image-tag-recursor-alpine-45.yml @@ -0,0 +1,39 @@ +name: Docker Image CI pdns-recursor 4.5 alpine + +on: + push: + tags: [ 'pdns-recursor-alpine-4.5' ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + + - name: Check Out Repo + uses: actions/checkout@v2 + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + + - name: Build and push PDNS Recursor + id: docker_build_recursor + uses: docker/build-push-action@v2 + with: + context: ./pdns-recursor + file: ./pdns-recursor/Dockerfile.alpine + builder: ${{ steps.buildx.outputs.name }} + push: true + tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-recursor:4.5-alpine + + - name: Image digest + run: echo ${{ steps.docker_build_recursor.outputs.digest }} diff --git a/.github/workflows/docker-image-tag-recursor-fedora-45.yml b/.github/workflows/docker-image-tag-recursor-fedora-45.yml new file mode 100644 index 0000000..018c7c3 --- /dev/null +++ b/.github/workflows/docker-image-tag-recursor-fedora-45.yml @@ -0,0 +1,39 @@ +name: Docker Image CI pdns-recursor 4.5 latest + +on: + push: + tags: [ 'pdns-recursor-fedora-4.5' ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + + - name: Check Out Repo + uses: actions/checkout@v2 + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + + - name: Build and push PDNS Recursor + id: docker_build_recursor + uses: docker/build-push-action@v2 + with: + context: ./pdns-recursor + file: ./pdns-recursor/Dockerfile + builder: ${{ steps.buildx.outputs.name }} + push: true + tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-recursor:4.5 + + - name: Image digest + run: echo ${{ steps.docker_build_recursor.outputs.digest }} diff --git a/docker-compose.yml b/docker-compose.yml index 0ece120..e12a043 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -100,7 +100,7 @@ services: - /etc/localtime:/etc/localtime:ro environment: - PDNS_ADMIN_SQLA_DB_PASSWORD='my-secret-pw' - - PDNS_VERSION=4.4 + - PDNS_VERSION=4.5 - PDNS_API_KEY=secret depends_on: - mariadb diff --git a/examples/kubernetes/admin-dashboard.yaml b/examples/kubernetes/admin-dashboard.yaml index 384dfaa..c1d2f75 100644 --- a/examples/kubernetes/admin-dashboard.yaml +++ b/examples/kubernetes/admin-dashboard.yaml @@ -58,7 +58,7 @@ spec: - name: PDNS_API_URL value: "http://master-api-pdns:8081/" - name: PDNS_VERSION - value: "4.4" + value: "4.5" - name: PDNS_API_KEY valueFrom: secretKeyRef: diff --git a/pdns-recursor/Dockerfile b/pdns-recursor/Dockerfile index 7851299..270dca5 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.4 \ +ENV VERSION=4.5 \ PDNS_setuid=pdns-recursor \ PDNS_setgid=pdns-recursor \ PDNS_daemon=no diff --git a/pdns-recursor/Dockerfile.alpine b/pdns-recursor/Dockerfile.alpine index 34458f2..db16490 100644 --- a/pdns-recursor/Dockerfile.alpine +++ b/pdns-recursor/Dockerfile.alpine @@ -12,7 +12,7 @@ RUN mkdir -p /etc/pdns/api.d \ && mkdir -p /var/run/pdns-recursor \ && chown -R recursor: /var/run/pdns-recursor -ENV VERSION=4.4 \ +ENV VERSION=4.5 \ PDNS_setuid=recursor \ PDNS_setgid=recursor \ PDNS_daemon=no diff --git a/pdns/Dockerfile b/pdns/Dockerfile index c8d0f12..9331bee 100644 --- a/pdns/Dockerfile +++ b/pdns/Dockerfile @@ -12,7 +12,7 @@ RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \ RUN pip3 install --no-cache-dir envtpl -ENV VERSION=4.4 \ +ENV VERSION=4.5 \ PDNS_guardian=yes \ PDNS_setuid=pdns \ PDNS_setgid=pdns \ diff --git a/pdns/Dockerfile.alpine b/pdns/Dockerfile.alpine index c843cb3..fcf5b80 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.4 \ +ENV VERSION=4.5 \ PDNS_guardian=yes \ PDNS_setuid=pdns \ PDNS_setgid=pdns \