Skip to content

Commit ee7e8c3

Browse files
authored
Update Caddy workflow for GHCR integration
1 parent eff7a69 commit ee7e8c3

1 file changed

Lines changed: 23 additions & 14 deletions

File tree

.github/workflows/caddy.yaml

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@ name: caddy
33
on:
44
workflow_dispatch:
55
push:
6-
branches:
6+
branches:
77
- caddy
88

9+
permissions:
10+
contents: read
11+
packages: write
12+
913
env:
10-
IMAGE_NAME: ftd5x/caddy
14+
IMAGE_NAME: ghcr.io/f-td5x/caddy
1115

1216
jobs:
1317
build:
@@ -19,27 +23,30 @@ jobs:
1923
runner: ubuntu-latest
2024
- platform: linux/arm64
2125
runner: ubuntu-24.04-arm
26+
2227
runs-on: ${{ matrix.runner }}
28+
2329
steps:
2430
- name: Checkout
2531
uses: actions/checkout@v4
2632
with:
27-
repository: "f-td5x/Dockerfiles"
33+
repository: "f-td5x/dockerfiles"
2834
ref: "caddy"
2935

30-
- name: Login to DockerHub
36+
- name: Log in to GHCR
3137
uses: docker/login-action@v3
3238
with:
33-
username: ${{ secrets.DOCKER_USERNAME }}
34-
password: ${{ secrets.DOCKER_PASSWORD }}
39+
registry: ghcr.io
40+
username: ${{ github.actor }}
41+
password: ${{ secrets.GITHUB_TOKEN }}
3542

3643
- name: Set up Docker Buildx
3744
uses: docker/setup-buildx-action@v3
3845

3946
- name: Prepare platform name for artifacts
4047
run: |
4148
platform=${{ matrix.platform }}
42-
echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
49+
echo "PLATFORM_PAIR=${platform//\//-}" >> "$GITHUB_ENV"
4350
4451
- name: Build and push by digest
4552
id: build
@@ -54,7 +61,7 @@ jobs:
5461

5562
- name: Export digest
5663
run: |
57-
mkdir -p ${{ runner.temp }}/digests
64+
mkdir -p "${{ runner.temp }}/digests"
5865
digest="${{ steps.build.outputs.digest }}"
5966
touch "${{ runner.temp }}/digests/${digest#sha256:}"
6067
@@ -69,6 +76,7 @@ jobs:
6976
merge:
7077
runs-on: ubuntu-latest
7178
needs: build
79+
7280
steps:
7381
- name: Download digests
7482
uses: actions/download-artifact@v4
@@ -77,11 +85,12 @@ jobs:
7785
pattern: digests-*
7886
merge-multiple: true
7987

80-
- name: Login to DockerHub
88+
- name: Log in to GHCR
8189
uses: docker/login-action@v3
8290
with:
83-
username: ${{ secrets.DOCKER_USERNAME }}
84-
password: ${{ secrets.DOCKER_PASSWORD }}
91+
registry: ghcr.io
92+
username: ${{ github.actor }}
93+
password: ${{ secrets.GITHUB_TOKEN }}
8594

8695
- name: Set up Docker Buildx
8796
uses: docker/setup-buildx-action@v3
@@ -90,8 +99,8 @@ jobs:
9099
working-directory: ${{ runner.temp }}/digests
91100
run: |
92101
docker buildx imagetools create \
93-
-t ${{ env.IMAGE_NAME }}:latest \
102+
-t "${{ env.IMAGE_NAME }}:latest" \
94103
$(printf '${{ env.IMAGE_NAME }}@sha256:%s ' *)
95104
96-
- name: Inspect image (optional, for logs)
97-
run: docker buildx imagetools inspect ${{ env.IMAGE_NAME }}:latest
105+
- name: Inspect image
106+
run: docker buildx imagetools inspect "${{ env.IMAGE_NAME }}:latest"

0 commit comments

Comments
 (0)