Rename pdns dir to pdns-mysql

pschiffe · Jan 2, 2024 · 84129e9 · 84129e9
1 parent 2b264c1
commit 84129e9
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 39 deletions.
diff --git 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
@@ -46,45 +46,45 @@ 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
         uses: actions/checkout@v4
       - 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
         uses: actions/checkout@v4
       - 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/...orkflows/docker-image-tag-pdns-alpine.yml → ...ws/docker-image-tag-pdns-mysql-alpine.yml b/...orkflows/docker-image-tag-pdns-alpine.yml → ...ws/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/...orkflows/docker-image-tag-pdns-fedora.yml → ...ws/docker-image-tag-pdns-mysql-fedora.yml b/...orkflows/docker-image-tag-pdns-fedora.yml → ...ws/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
@@ -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
@@ -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
+## Docker Compose
 
-Included ansible playbook can be used to build and run the containers from this repo. Run it with:
+Included docker compose file contains example configuration of how to use these containers:
 ```
-ansible-playbook ansible-playbook.yml
+docker-compose up -d -f docker-compose-mysql.yml
 ```
 
-## docker-compose.yml
+## Ansible playbook
 
-Included docker compose file contains example configuration of how to use these containers:
+Included ansible playbook can be used to build and run the containers from this repo. Run it with:
 ```
-docker-compose up -d
+ansible-playbook ansible-playbook-mysql.yml
 ```
diff --git a/ansible-playbook.yml → ansible-playbook-mysql.yml b/ansible-playbook.yml → 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 → docker-compose-mysql.yml b/docker-compose.yml → docker-compose-mysql.yml
diff --git a/pdns/Dockerfile → pdns-mysql/Dockerfile b/pdns/Dockerfile → pdns-mysql/Dockerfile
diff --git a/pdns/Dockerfile.alpine → pdns-mysql/Dockerfile.alpine b/pdns/Dockerfile.alpine → pdns-mysql/Dockerfile.alpine
diff --git a/pdns/docker-entrypoint.sh → pdns-mysql/docker-entrypoint.sh b/pdns/docker-entrypoint.sh → pdns-mysql/docker-entrypoint.sh
diff --git a/pdns/pdns.conf.tpl → pdns-mysql/pdns.conf.tpl b/pdns/pdns.conf.tpl → pdns-mysql/pdns.conf.tpl