trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: fix images not being pushed with correct tags 

* ci: debug

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* ci: fix branch and sha

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens L 2021-09-01 16:19:29 +02:00 committed by GitHub
parent 371feb9a31
commit 933336c38b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci-main.yml vendored
View File

@ -197,7 +197,7 @@ jobs:
with: with:
push: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }} push: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }}
tags: | tags: |
beryju.org/authentik/server:gh-${{ steps.ev.outputs.branchName }}, beryju.org/authentik/server:gh-${{ steps.ev.outputs.branchName }}
beryju.org/authentik/server:gh-${{ env.GITHUB_SHA }} beryju.org/authentik/server:gh-${{ steps.ev.outputs.sha }}
build-args: | build-args: |
GIT_BUILD_HASH=${{ env.GITHUB_SHA }} GIT_BUILD_HASH=${{ steps.ev.outputs.sha }}

8
.github/workflows/ci-outpost.yml vendored
View File

@ -57,10 +57,10 @@ jobs:
with: with:
push: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }} push: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }}
tags: | tags: |
beryju.org/authentik/outpost-${{ matrix.type }}:gh-${{ steps.ev.outputs.branchName }}, beryju.org/authentik/outpost-${{ matrix.type }}:gh-${{ steps.ev.outputs.branchName }}
beryju.org/authentik/outpost-${{ matrix.type }}:gh-${{ steps.ev.outputs.branchName }}-${{ steps.ev.outputs.timestamp }}, beryju.org/authentik/outpost-${{ matrix.type }}:gh-${{ steps.ev.outputs.branchName }}-${{ steps.ev.outputs.timestamp }}
beryju.org/authentik/outpost-${{ matrix.type }}:gh-${{ env.GITHUB_SHA }} beryju.org/authentik/outpost-${{ matrix.type }}:gh-${{ steps.ev.outputs.sha }}
file: ${{ matrix.type }}.Dockerfile file: ${{ matrix.type }}.Dockerfile
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
build-args: | build-args: |
GIT_BUILD_HASH=${{ env.GITHUB_SHA }} GIT_BUILD_HASH=${{ steps.ev.outputs.sha }}

7
scripts/gh_do_set_branch.py
View File

@ -4,10 +4,13 @@ from time import time
env_pr_branch = "GITHUB_HEAD_REF" env_pr_branch = "GITHUB_HEAD_REF"
default_branch = "GITHUB_REF" default_branch = "GITHUB_REF"
sha = "GITHUB_SHA"
branch_name = os.environ[default_branch] branch_name = os.environ[default_branch]
if env_pr_branch in os.environ: if os.environ.get(env_pr_branch, "") != "":
branch_name = os.environ[env_pr_branch].replace("/", "-") branch_name = os.environ[env_pr_branch]
branch_name = branch_name.replace("refs/heads/", "").replace("/", "-")
print("##[set-output name=branchName]%s" % branch_name) print("##[set-output name=branchName]%s" % branch_name)
print("##[set-output name=timestamp]%s" % int(time())) print("##[set-output name=timestamp]%s" % int(time()))
print("##[set-output name=sha]%s" % os.environ[sha])