From 84129e9f73d29a1b3e51cd97e984de47b564428d Mon Sep 17 00:00:00 2001 From: Peter Schiffer <3899107+pschiffe@users.noreply.github.com> Date: Tue, 2 Jan 2024 20:09:28 +0100 Subject: [PATCH] Rename pdns dir to pdns-mysql --- .github/dependabot.yml | 2 +- .github/workflows/docker-image-pr.yml | 24 +++++++++---------- ...=> docker-image-tag-pdns-mysql-alpine.yml} | 6 ++--- ...=> docker-image-tag-pdns-mysql-fedora.yml} | 6 ++--- .github/workflows/docker-image.yml | 24 +++++++++---------- README.md | 18 +++++++------- ...playbook.yml => ansible-playbook-mysql.yml | 4 ++-- ...er-compose.yml => docker-compose-mysql.yml | 0 {pdns => pdns-mysql}/Dockerfile | 0 {pdns => pdns-mysql}/Dockerfile.alpine | 0 {pdns => pdns-mysql}/docker-entrypoint.sh | 0 {pdns => pdns-mysql}/pdns.conf.tpl | 0 12 files changed, 42 insertions(+), 42 deletions(-) rename .github/workflows/{docker-image-tag-pdns-alpine.yml => docker-image-tag-pdns-mysql-alpine.yml} (90%) rename .github/workflows/{docker-image-tag-pdns-fedora.yml => docker-image-tag-pdns-mysql-fedora.yml} (90%) rename ansible-playbook.yml => ansible-playbook-mysql.yml (99%) rename docker-compose.yml => docker-compose-mysql.yml (100%) rename {pdns => pdns-mysql}/Dockerfile (100%) rename {pdns => pdns-mysql}/Dockerfile.alpine (100%) rename {pdns => pdns-mysql}/docker-entrypoint.sh (100%) rename {pdns => pdns-mysql}/pdns.conf.tpl (100%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8a37de8..e2878c7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,7 @@ version: 2 updates: - package-ecosystem: "docker" - directory: "/pdns" + directory: "/pdns-mysql" schedule: interval: "monthly" - package-ecosystem: "docker" diff --git a/.github/workflows/docker-image-pr.yml b/.github/workflows/docker-image-pr.yml index d7f37d6..7e7777f 100644 --- a/.github/workflows/docker-image-pr.yml +++ b/.github/workflows/docker-image-pr.yml @@ -46,7 +46,7 @@ jobs: - name: Image digest run: echo ${{ steps.docker_build_recursor_alpine.outputs.digest }} - test-pdns-latest: + test-pdns-mysql-latest: runs-on: ubuntu-latest steps: - name: Check Out Repo @@ -54,19 +54,19 @@ jobs: - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v3 - - name: Build PDNS latest - id: docker_build_pdns_latest + - name: Build PDNS mysql latest + id: docker_build_pdns_mysql_latest uses: docker/build-push-action@v5 with: - context: ./pdns - file: ./pdns/Dockerfile + context: ./pdns-mysql + file: ./pdns-mysql/Dockerfile builder: ${{ steps.buildx.outputs.name }} push: false tags: pdns-mysql:latest - name: Image digest - run: echo ${{ steps.docker_build_pdns_latest.outputs.digest }} + run: echo ${{ steps.docker_build_pdns_mysql_latest.outputs.digest }} - test-pdns-alpine: + test-pdns-mysql-alpine: runs-on: ubuntu-latest steps: - name: Check Out Repo @@ -74,17 +74,17 @@ jobs: - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v3 - - name: Build PDNS alpine - id: docker_build_pdns_alpine + - name: Build PDNS mysql alpine + id: docker_build_pdns_mysql_alpine uses: docker/build-push-action@v5 with: - context: ./pdns - file: ./pdns/Dockerfile.alpine + context: ./pdns-mysql + file: ./pdns-mysql/Dockerfile.alpine builder: ${{ steps.buildx.outputs.name }} push: false tags: pdns-mysql:alpine - name: Image digest - run: echo ${{ steps.docker_build_pdns_alpine.outputs.digest }} + run: echo ${{ steps.docker_build_pdns_mysql_alpine.outputs.digest }} test-pdns-admin: runs-on: ubuntu-latest diff --git a/.github/workflows/docker-image-tag-pdns-alpine.yml b/.github/workflows/docker-image-tag-pdns-mysql-alpine.yml similarity index 90% rename from .github/workflows/docker-image-tag-pdns-alpine.yml rename to .github/workflows/docker-image-tag-pdns-mysql-alpine.yml index e9505f0..9524788 100644 --- a/.github/workflows/docker-image-tag-pdns-alpine.yml +++ b/.github/workflows/docker-image-tag-pdns-mysql-alpine.yml @@ -33,12 +33,12 @@ jobs: id: vars run: echo ::set-output name=version::${GITHUB_REF##*-} - - name: Build and push PDNS + - name: Build and push PDNS mysql id: docker_build_pdns uses: docker/build-push-action@v5 with: - context: ./pdns - file: ./pdns/Dockerfile.alpine + context: ./pdns-mysql + file: ./pdns-mysql/Dockerfile.alpine platforms: linux/amd64,linux/arm64 builder: ${{ steps.buildx.outputs.name }} push: true diff --git a/.github/workflows/docker-image-tag-pdns-fedora.yml b/.github/workflows/docker-image-tag-pdns-mysql-fedora.yml similarity index 90% rename from .github/workflows/docker-image-tag-pdns-fedora.yml rename to .github/workflows/docker-image-tag-pdns-mysql-fedora.yml index 135627b..1ab7d21 100644 --- a/.github/workflows/docker-image-tag-pdns-fedora.yml +++ b/.github/workflows/docker-image-tag-pdns-mysql-fedora.yml @@ -33,12 +33,12 @@ jobs: id: vars run: echo ::set-output name=version::${GITHUB_REF##*-} - - name: Build and push PDNS + - name: Build and push PDNS mysql id: docker_build_pdns uses: docker/build-push-action@v5 with: - context: ./pdns - file: ./pdns/Dockerfile + context: ./pdns-mysql + file: ./pdns-mysql/Dockerfile platforms: linux/amd64,linux/arm64 builder: ${{ steps.buildx.outputs.name }} push: true diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index a68e9ba..de4d62d 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -62,7 +62,7 @@ jobs: - name: Image digest run: echo ${{ steps.docker_build_recursor_alpine.outputs.digest }} - build-pdns-latest: + build-pdns-mysql-latest: runs-on: ubuntu-latest steps: - name: Check Out Repo @@ -77,20 +77,20 @@ jobs: with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - name: Build and push PDNS latest - id: docker_build_pdns_latest + - name: Build and push PDNS mysql latest + id: docker_build_pdns_mysql_latest uses: docker/build-push-action@v5 with: - context: ./pdns - file: ./pdns/Dockerfile + context: ./pdns-mysql + file: ./pdns-mysql/Dockerfile platforms: linux/amd64,linux/arm64 builder: ${{ steps.buildx.outputs.name }} push: true tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-mysql:latest - name: Image digest - run: echo ${{ steps.docker_build_pdns_latest.outputs.digest }} + run: echo ${{ steps.docker_build_pdns_mysql_latest.outputs.digest }} - build-pdns-alpine: + build-pdns-mysql-alpine: runs-on: ubuntu-latest steps: - name: Check Out Repo @@ -105,18 +105,18 @@ jobs: with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - name: Build and push PDNS alpine - id: docker_build_pdns_alpine + - name: Build and push PDNS mysql alpine + id: docker_build_pdns_mysql_alpine uses: docker/build-push-action@v5 with: - context: ./pdns - file: ./pdns/Dockerfile.alpine + context: ./pdns-mysql + file: ./pdns-mysql/Dockerfile.alpine platforms: linux/amd64,linux/arm64 builder: ${{ steps.buildx.outputs.name }} push: true tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-mysql:alpine - name: Image digest - run: echo ${{ steps.docker_build_pdns_alpine.outputs.digest }} + run: echo ${{ steps.docker_build_pdns_mysql_alpine.outputs.digest }} build-pdns-admin: runs-on: ubuntu-latest diff --git a/README.md b/README.md index c07f736..eb0c0c3 100644 --- a/README.md +++ b/README.md @@ -178,16 +178,16 @@ docker run -d -p 80:8080 -p 443:8443 -p 443:8443/udp --name pdns-admin \ pschiffe/pdns-admin ``` -## ansible-playbook.yml - -Included ansible playbook can be used to build and run the containers from this repo. Run it with: -``` -ansible-playbook ansible-playbook.yml -``` - -## docker-compose.yml +## Docker Compose Included docker compose file contains example configuration of how to use these containers: ``` -docker-compose up -d +docker-compose up -d -f docker-compose-mysql.yml +``` + +## Ansible playbook + +Included ansible playbook can be used to build and run the containers from this repo. Run it with: +``` +ansible-playbook ansible-playbook-mysql.yml ``` diff --git a/ansible-playbook.yml b/ansible-playbook-mysql.yml similarity index 99% rename from ansible-playbook.yml rename to ansible-playbook-mysql.yml index 053f3f6..ea6aba0 100644 --- a/ansible-playbook.yml +++ b/ansible-playbook-mysql.yml @@ -107,7 +107,7 @@ force_source: true build: pull: true - path: ./pdns + path: ./pdns-mysql tags: - pdns @@ -120,7 +120,7 @@ force_source: true build: pull: true - path: ./pdns + path: ./pdns-mysql dockerfile: Dockerfile.alpine tags: - pdns diff --git a/docker-compose.yml b/docker-compose-mysql.yml similarity index 100% rename from docker-compose.yml rename to docker-compose-mysql.yml diff --git a/pdns/Dockerfile b/pdns-mysql/Dockerfile similarity index 100% rename from pdns/Dockerfile rename to pdns-mysql/Dockerfile diff --git a/pdns/Dockerfile.alpine b/pdns-mysql/Dockerfile.alpine similarity index 100% rename from pdns/Dockerfile.alpine rename to pdns-mysql/Dockerfile.alpine diff --git a/pdns/docker-entrypoint.sh b/pdns-mysql/docker-entrypoint.sh similarity index 100% rename from pdns/docker-entrypoint.sh rename to pdns-mysql/docker-entrypoint.sh diff --git a/pdns/pdns.conf.tpl b/pdns-mysql/pdns.conf.tpl similarity index 100% rename from pdns/pdns.conf.tpl rename to pdns-mysql/pdns.conf.tpl