Skip to content

Commit

Permalink
ci: update CI after repo move
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
  • Loading branch information
sagikazarmark authored and aslafy-z committed May 22, 2023
1 parent 9ede3ca commit 1bab814
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 20 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,8 @@ jobs:
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}

- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
username: ${{ github.actor }}
password: ${{ github.token }}

- name: Determine tag or commit
uses: haya14busa/action-cond@v1
Expand All @@ -64,5 +58,4 @@ jobs:
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
tags: |
ghcr.io/banzaicloud/logging-operator:${{ steps.imagetag.outputs.value }}
banzaicloud/logging-operator:${{ steps.imagetag.outputs.value }}
ghcr.io/kube-logging/logging-operator:${{ steps.imagetag.outputs.value }}
7 changes: 3 additions & 4 deletions .github/workflows/docker_fluentd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@ jobs:
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}

username: ${{ github.actor }}
password: ${{ github.token }}
- name: Determine tag or commit
uses: haya14busa/action-cond@v1
id: refortag
Expand All @@ -55,7 +54,7 @@ jobs:
uses: docker/build-push-action@v3
with:
context: fluentd-image/${{ steps.pathfromtag.outputs.value }}/
tags: ghcr.io/banzaicloud/fluentd:${{ steps.imagetag.outputs.value }}
tags: ghcr.io/kube-logging/fluentd:${{ steps.imagetag.outputs.value }}
file: fluentd-image/${{ steps.pathfromtag.outputs.value }}/Dockerfile
platforms: ${{ env.PLATFORMS }}
push: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/drain_watch_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}
username: ${{ github.actor }}
password: ${{ github.token }}
- name: Determine image tag
id: imagetag
run: echo "::set-output name=value::$(echo ${GITHUB_REF##*/} | sed 's/fluentd-drain-watch-//g')"
Expand All @@ -41,7 +41,7 @@ jobs:
uses: docker/build-push-action@v3
with:
context: drain-watch-image/
tags: ghcr.io/banzaicloud/fluentd-drain-watch:${{ steps.imagetag.outputs.value }}
tags: ghcr.io/kube-logging/fluentd-drain-watch:${{ steps.imagetag.outputs.value }}
file: drain-watch-image/Dockerfile
platforms: ${{ env.PLATFORMS }}
push: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/node-exporter-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}
username: ${{ github.actor }}
password: ${{ github.token }}
- name: Determine image tag
id: imagetag
run: echo "::set-output name=value::$(echo ${GITHUB_REF##*/} | sed 's/node-exporter-//g')"
Expand All @@ -41,7 +41,7 @@ jobs:
uses: docker/build-push-action@v3
with:
context: node-exporter-image/
tags: ghcr.io/banzaicloud/node-exporter:${{ steps.imagetag.outputs.value }}
tags: ghcr.io/kube-logging/node-exporter:${{ steps.imagetag.outputs.value }}
file: node-exporter-image/Dockerfile
platforms: ${{ env.PLATFORMS }}
push: true
Expand Down

0 comments on commit 1bab814

Please sign in to comment.