Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2025-12-20 02:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1846 from pi-hole/development

Browse Source 
Development
This commit is contained in:
Adam Warner
2025-06-12 17:11:22 +02:00
committed by GitHub
parent 68dca72435 5f0bd3ac76
commit 8e04e6b209
3 changed files with 26 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
.github/actions/login-repo/action.yml vendored
View File

@@ -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 }}

1
.github/dependabot.yml vendored
View File

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

38
.github/workflows/build-and-publish.yml vendored
View File

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