Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit abbae8f

Browse files
committedMar 26, 2025
only use ghcr
1 parent ca3f90c commit abbae8f

File tree

2 files changed

+6
-25
lines changed

2 files changed

+6
-25
lines changed
 

‎.github/workflows/build-docker-image-alpine.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
workflow_dispatch:
77
inputs:
88
build_version:
9-
description: 'Caddy version to build (without v prefix, e.g., 2.8.0)'
9+
description: "Caddy version to build (without v prefix, e.g., 2.8.0)"
1010
required: false
1111

1212
permissions:
@@ -38,12 +38,6 @@ jobs:
3838
username: ${{ github.actor }}
3939
password: ${{ secrets.GITHUB_TOKEN }}
4040

41-
- name: Login to Docker Hub
42-
uses: docker/login-action@v3
43-
with:
44-
username: ${{ secrets.DOCKERHUB_USERNAME }}
45-
password: ${{ secrets.DOCKERHUB_TOKEN }}
46-
4741
- name: Convert Repository Owner to Lowercase
4842
run: |
4943
echo "GITHUB_REPOSITORY_OWNER: ${GITHUB_REPOSITORY_OWNER}"
@@ -90,7 +84,7 @@ jobs:
9084
sleep $SLEEP_INTERVAL
9185
RETRY_COUNT=$((RETRY_COUNT + 1))
9286
done
93-
87+
9488
if [ $RETRY_COUNT -lt $MAX_RETRIES ]; then
9589
echo "DEPENDENCIES_AVAILABILITY=true" >> $GITHUB_ENV
9690
fi
@@ -120,16 +114,12 @@ jobs:
120114
tags: |
121115
ghcr.io/${{ env.REPO_OWNER }}/caddy-cloudflare:${{ env.VERSION }}-alpine
122116
ghcr.io/${{ env.REPO_OWNER }}/caddy-cloudflare:alpine
123-
${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare:${{ env.VERSION }}-alpine
124-
${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare:alpine
125117
126118
- name: Clean up Docker images
127119
if: env.DEPENDENCIES_AVAILABILITY == 'true'
128120
run: |
129121
docker rmi ghcr.io/${{ env.REPO_OWNER }}/caddy-cloudflare:${{ env.VERSION }}-alpine || true
130122
docker rmi ghcr.io/${{ env.REPO_OWNER }}/caddy-cloudflare:alpine || true
131-
docker rmi ${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare:${{ env.VERSION }}-alpine || true
132-
docker rmi ${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare:alpine || true
133123
docker builder prune --force
134124
135125
- name: Create GitHub Release
@@ -142,4 +132,4 @@ jobs:
142132
release_name: "Caddy Alpine v${{ env.VERSION }}"
143133
body: "New Caddy release detected. See the full release notes [here](https://github.com/caddyserver/caddy/releases/tag/v${{ env.VERSION }})."
144134
draft: false
145-
prerelease: false
135+
prerelease: false

‎.github/workflows/build-docker-image-standard.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
workflow_dispatch:
77
inputs:
88
build_version:
9-
description: 'Caddy version to build (without v prefix, e.g., 2.8.0)'
9+
description: "Caddy version to build (without v prefix, e.g., 2.8.0)"
1010
required: false
1111

1212
permissions:
@@ -38,12 +38,6 @@ jobs:
3838
username: ${{ github.actor }}
3939
password: ${{ secrets.GITHUB_TOKEN }}
4040

41-
- name: Login to Docker Hub
42-
uses: docker/login-action@v3
43-
with:
44-
username: ${{ secrets.DOCKERHUB_USERNAME }}
45-
password: ${{ secrets.DOCKERHUB_TOKEN }}
46-
4741
- name: Convert Repository Owner to Lowercase
4842
run: |
4943
echo "GITHUB_REPOSITORY_OWNER: ${GITHUB_REPOSITORY_OWNER}"
@@ -90,7 +84,7 @@ jobs:
9084
sleep $SLEEP_INTERVAL
9185
RETRY_COUNT=$((RETRY_COUNT + 1))
9286
done
93-
87+
9488
if [ $RETRY_COUNT -lt $MAX_RETRIES ]; then
9589
echo "DEPENDENCIES_AVAILABILITY=true" >> $GITHUB_ENV
9690
fi
@@ -120,14 +114,11 @@ jobs:
120114
tags: |
121115
ghcr.io/${{ env.REPO_OWNER }}/caddy-cloudflare:${{ env.VERSION }}
122116
ghcr.io/${{ env.REPO_OWNER }}/caddy-cloudflare:latest
123-
${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare:${{ env.VERSION }}
124-
${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare:latest
125117
126118
- name: Clean up Docker images
127119
if: env.DEPENDENCIES_AVAILABILITY == 'true'
128120
run: |
129121
docker rmi ghcr.io/${{ env.REPO_OWNER }}/caddy-cloudflare:${{ env.VERSION }} || true
130-
docker rmi ${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare:${{ env.VERSION }} || true
131122
docker builder prune --force
132123
133124
- name: Create GitHub Release
@@ -140,4 +131,4 @@ jobs:
140131
release_name: "Caddy v${{ env.VERSION }}"
141132
body: "New Caddy release detected. See the full release notes [here](https://github.com/caddyserver/caddy/releases/tag/v${{ env.VERSION }})."
142133
draft: false
143-
prerelease: false
134+
prerelease: false

0 commit comments

Comments
 (0)
Please sign in to comment.