Fix github action due to org change.

This commit is contained in:
Tomofumi Hayashi 2021-04-27 05:07:36 +09:00 committed by Doug Smith
parent 65a6e9b414
commit cb38860d42
3 changed files with 26 additions and 28 deletions

View File

@ -16,7 +16,7 @@ jobs:
with: with:
context: . context: .
push: false push: false
tags: dougbtv/whereabouts tags: ghcr.io/${{ github.repository }}:latest-amd64
file: Dockerfile file: Dockerfile
build-openshift: build-openshift:
@ -52,5 +52,5 @@ jobs:
with: with:
context: . context: .
push: false push: false
tags: dougbtv/whereabouts:latest-arm64 tags: ghcr.io/${{ github.repository }}:latest-arm64
file: Dockerfile.arm64 file: Dockerfile.arm64

View File

@ -4,7 +4,7 @@ on:
branches: branches:
- master - master
env: env:
image-push-owner: 'dougbtv' image-push-owner: 'k8snetworkplumbingwg'
jobs: jobs:
push-amd64: push-amd64:
name: Image push/amd64 name: Image push/amd64
@ -17,20 +17,20 @@ jobs:
uses: docker/setup-buildx-action@v1 uses: docker/setup-buildx-action@v1
- name: Login to Container Registry - name: Login to Container Registry
if: github.repository_owner == 'dougbtv' if: github.repository_owner == 'k8snetworkplumbingwg'
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
#registry: ghcr.io registry: ghcr.io
username: ${{ github.repository_owner }} username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }} password: ${{ secrets.GITHUB_TOKEN }}
- name: Push container image - name: Push container image
if: github.repository_owner == 'dougbtv' if: github.repository_owner == 'k8snetworkplumbingwg'
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
context: . context: .
push: true push: true
tags: dougbtv/whereabouts:latest tags: ghcr.io/${{ github.repository }}:latest-amd64
file: Dockerfile file: Dockerfile
push-origin: push-origin:
@ -44,18 +44,18 @@ jobs:
uses: docker/setup-buildx-action@v1 uses: docker/setup-buildx-action@v1
- name: Login to Container Registry - name: Login to Container Registry
if: github.repository_owner == 'dougbtv' if: github.repository_owner == 'k8snetworkplumbingwg'
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
#registry: ghcr.io registry: ghcr.io
username: ${{ github.repository_owner }} username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }} password: ${{ secrets.GITHUB_TOKEN }}
- name: Push container image - name: Push container image
if: github.repository_owner == 'dougbtv' if: github.repository_owner == 'k8snetworkplumbingwg'
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
context: . context: .
push: true push: true
tags: dougbtv/whereabouts-ocp:latest tags: ghcr.io/${{ github.repository }}:latest-ocp
file: Dockerfile.openshift file: Dockerfile.openshift

View File

@ -4,7 +4,7 @@ on:
tags: tags:
- v* - v*
env: env:
image-push-owner: 'dougbtv' image-push-owner: 'k8snetworkplumbingwg'
jobs: jobs:
push-amd64: push-amd64:
name: Image push/amd64 name: Image push/amd64
@ -17,23 +17,22 @@ jobs:
uses: docker/setup-buildx-action@v1 uses: docker/setup-buildx-action@v1
- name: Login to Container Registry - name: Login to Container Registry
if: github.repository_owner == 'dougbtv' if: github.repository_owner == 'k8snetworkplumbingwg'
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
#registry: ghcr.io registry: ghcr.io
username: ${{ github.repository_owner }} username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }} password: ${{ secrets.GITHUB_TOKEN }}
- name: Docker meta - name: Docker meta
id: docker_meta id: docker_meta
uses: crazy-max/ghaction-docker-meta@v1 uses: crazy-max/ghaction-docker-meta@v1
with: with:
#images: ghcr.io/${{ github.repository }} images: ghcr.io/${{ github.repository }}
images: dougbtv/whereabouts
tag-latest: false tag-latest: false
- name: Push container image - name: Push container image
if: github.repository_owner == 'dougbtv' if: github.repository_owner == 'k8snetworkplumbingwg'
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
context: . context: .
@ -53,23 +52,22 @@ jobs:
uses: docker/setup-buildx-action@v1 uses: docker/setup-buildx-action@v1
- name: Login to Container Registry - name: Login to Container Registry
if: github.repository_owner == 'dougbtv' if: github.repository_owner == 'k8snetworkplumbingwg'
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
#registry: ghcr.io registry: ghcr.io
username: ${{ github.repository_owner }} username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }} password: ${{ secrets.GITHUB_TOKEN }}
- name: Docker meta - name: Docker meta
id: docker_meta id: docker_meta
uses: crazy-max/ghaction-docker-meta@v1 uses: crazy-max/ghaction-docker-meta@v1
with: with:
#images: ghcr.io/${{ github.repository }} images: ghcr.io/${{ github.repository }}
images: dougbtv/whereabouts
tag-latest: false tag-latest: false
- name: Push container image - name: Push container image
if: github.repository_owner == 'dougbtv' if: github.repository_owner == 'k8snetworkplumbingwg'
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
context: . context: .