Merge pull request #1846 from pi-hole/development

Development

.github/actions/login-repo/action.yml

@@ -1,35 +0,0 @@
-name: Login to container registries
-description: Login to container registries Docker Hub and GitHub Container Registry
-
-inputs:
-  # Actions cannot access secrets so pass them in as inputs
-  docker_username:
-    required: true
-    description: The username to use to login to Docker Hub
-  docker_password:
-    required: true
-    description: The password to use to login to Docker Hub
-  ghcr_username:
-    required: true
-    description: The username to use to login to GitHub Container Registry
-  ghcr_password:
-    required: true
-    description: The password to use to login to GitHub Container Registry
-
-runs:
-  using: "composite"
-  steps:
-    -
-      name: Login to Docker Hub
-      uses: docker/login-action@v3
-      with:
-        registry: docker.io
-        username: ${{ inputs.docker_username }}
-        password: ${{ inputs.docker_password }}
-    -
-      name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
-      with:
-        registry: ghcr.io
-        username: ${{ inputs.ghcr_username }}
-        password: ${{ inputs.ghcr_password }}

.github/dependabot.yml

@@ -4,7 +4,6 @@ updates:
   - package-ecosystem: "github-actions"
     directories: 
       - "/"
-      - "/.github/actions/login-repo/"
     schedule:
       interval: "weekly"
       day: saturday

.github/workflows/build-and-publish.yml

@@ -53,13 +53,20 @@ jobs:
             type=ref,event=branch,enable=${{ github.event_name != 'schedule' }}
             type=ref,event=tag
 
-      - name: Login to DockerHub and GitHub Container Registry
-        uses: ./.github/actions/login-repo
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v3
         with:
-          docker_username: ${{ secrets.DOCKERHUB_USER }}
-          docker_password: ${{ secrets.DOCKERHUB_PASS }}
-          ghcr_username: ${{ github.repository_owner }}
-          ghcr_password: ${{ secrets.GITHUB_TOKEN }}
+          registry: docker.io
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_PASS }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -142,13 +149,20 @@ jobs:
             type=ref,event=branch,enable=${{ github.event_name != 'schedule' }}
             type=ref,event=tag
 
-      - name: Login to DockerHub and GitHub Container Registry
-        uses: ./.github/actions/login-repo
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v3
         with:
-          docker_username: ${{ secrets.DOCKERHUB_USER }}
-          docker_password: ${{ secrets.DOCKERHUB_PASS }}
-          ghcr_username: ${{ github.repository_owner }}
-          ghcr_password: ${{ secrets.GITHUB_TOKEN }}
+          registry: docker.io
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_PASS }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create manifest list and push (DockerHub and GitHub Container Registry)
         working-directory: /tmp/digests