Skip to content

Commit 7adf767

Browse files
committed
Fix dockerhub workflow
1 parent 983f402 commit 7adf767

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/workflows/dockerhub.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ jobs:
1313
env:
1414
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
1515
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
16+
GITHUB_REPOSITORY_NAME: ${GITHUB_REPOSITORY#*/}
1617
run: docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
1718
- name: Prepare
1819
run: mv kanjuro/Dockerfile ./
1920
- name: Build
20-
run: docker build . --tag ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY:$(git rev-parse HEAD)
21+
run: docker build . --tag ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY_NAME:$(git rev-parse HEAD)
2122
- name: Push
22-
run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY:$(git rev-parse HEAD)
23+
run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY_NAME:$(git rev-parse HEAD)

.github/workflows/release.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ jobs:
1111
env:
1212
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
1313
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
14+
GITHUB_REPOSITORY_NAME: ${GITHUB_REPOSITORY#*/}
1415
run: docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
1516
- name: Pull image
16-
run: docker pull ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY:$GITHUB_SHA
17+
run: docker pull ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY_NAME:$GITHUB_SHA
1718
- name: Publish release tag
1819
run: |
19-
docker tag ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY:$GITHUB_SHA ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY:${{ github.ref_name }}
20-
docker push ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY:${{ github.ref_name }}
20+
docker tag ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY_NAME:$GITHUB_SHA ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY_NAME:${{ github.ref_name }}
21+
docker push ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY_NAME:${{ github.ref_name }}
2122
- name: Publish latest tag
2223
run: |
23-
docker tag ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY:$GITHUB_SHA ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY:latest
24-
docker push ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY:latest
24+
docker tag ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY_NAME:$GITHUB_SHA ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY_NAME:latest
25+
docker push ${{ secrets.DOCKERHUB_USERNAME }}/$GITHUB_REPOSITORY_NAME:latest

0 commit comments

Comments
 (0)