Skip to content

Commit ba481c2

Browse files
committed
Login to ghcr alongside with Docker Hub
1 parent 8238be9 commit ba481c2

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
run: ./build.sh
3535
env:
3636
IMAGE_NAME: ${{ matrix.IMAGE_NAME }}
37-
DOCKER_USER: ${{ secrets.DOCKER_USER }}
38-
DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
37+
DHDOCKER_USER: ${{ secrets.DOCKER_USER }}
38+
DHDOCKER_PASS: ${{ secrets.DOCKER_PASS }}
3939
COMMIT_FROM: ${{ github.event.before }}
4040
COMMIT_TO: ${{ github.event.after }}
4141
GITHUB_EVENT: ${{ github.event_name }}

build.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@ has_modified(){
77

88
script=build-${IMAGE_NAME}.sh
99
if has_modified $script || [[ $GITHUB_EVENT == "schedule" ]] || true ; then
10-
docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
10+
# Docker Hub
11+
if [ -n "$DHDOCKER_USER" ]; then
12+
docker login -u "$DHDOCKER_USER" -p "$DHDOCKER_PASS"
13+
echo "Logged in to Docker Hub"
14+
fi
15+
# GitHub Container Registry
16+
if [ -n "$GITHUB_TOKEN" ]; then
17+
echo $GITHUB_TOKEN | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
18+
echo "Logged in to GitHub Container Registry"
19+
fi
1120
. $script
1221
fi

0 commit comments

Comments
 (0)