Skip to content

Commit 06ba590

Browse files
Merge pull request #245 from jembi/fix-merge-action
Fix merge action
2 parents 478d07e + 42fad8d commit 06ba590

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

.github/workflows/actions/build-deploy-images/action.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ inputs:
88
required: true
99
docker-password:
1010
required: true
11-
docker-namespace:
12-
required: false
1311
runs:
1412
using: 'composite'
1513
steps:

.github/workflows/entry-on-merge.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,5 @@ jobs:
3535
with:
3636
docker-push-tag: ${{ steps.get-docker-push-tag.outputs.docker-push-tag }}
3737
docker-host: "docker.io"
38-
docker-username: ${{ secrets.DOCKER_LOCAL_USER_NAME }}
39-
docker-password: ${{ secrets.DOCKER_LOCAL_PASSWORD }}
40-
docker-namespace: ${{ vars.DOCKER_LOCAL_NAMESPACE }}
38+
docker-username: ${{ secrets.DOCKER_HUB_USER_NAME }}
39+
docker-password: ${{ secrets.DOCKER_HUB_PASSWORD }}

.github/workflows/entry-on-release.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,4 @@ jobs:
3434
docker-push-tag: ${{ steps.validate-tag.outputs.docker-push-tag }}
3535
docker-host: "docker.io"
3636
docker-username: ${{ secrets.DOCKER_HUB_USER_NAME }}
37-
docker-password: ${{ secrets.DOCKER_HUB_PASSWORD }}
38-
docker-namespace: ${{ vars.DOCKER_HUB_NAMESPACE }}
37+
docker-password: ${{ secrets.DOCKER_HUB_PASSWORD }}

0 commit comments

Comments
 (0)