outposts: fix GIT_BUILD_HASH not being set correctly

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-05-13 17:49:11 +02:00
parent a2181c3bf0
commit 8362507bdf

View file

@ -113,13 +113,21 @@ stages:
inputs: inputs:
containerRegistry: 'beryjuorg-harbor' containerRegistry: 'beryjuorg-harbor'
repository: 'authentik/outpost-proxy' repository: 'authentik/outpost-proxy'
command: 'buildAndPush' command: 'build'
Dockerfile: 'outpost/proxy.Dockerfile' Dockerfile: 'outpost/proxy.Dockerfile'
buildContext: 'outpost/' buildContext: 'outpost/'
tags: | tags: |
gh-$(branchName) gh-$(branchName)
gh-$(Build.SourceVersion) gh-$(Build.SourceVersion)
arguments: '--build-arg GIT_BUILD_HASH=$(Build.SourceVersion)' arguments: '--build-arg GIT_BUILD_HASH=$(Build.SourceVersion)'
- task: Docker@2
inputs:
containerRegistry: 'beryjuorg-harbor'
repository: 'authentik/outpost-proxy'
command: 'push'
tags: |
gh-$(branchName)
gh-$(Build.SourceVersion)
- job: ldap_build_docker - job: ldap_build_docker
pool: pool:
vmImage: 'ubuntu-latest' vmImage: 'ubuntu-latest'
@ -141,10 +149,18 @@ stages:
inputs: inputs:
containerRegistry: 'beryjuorg-harbor' containerRegistry: 'beryjuorg-harbor'
repository: 'authentik/outpost-ldap' repository: 'authentik/outpost-ldap'
command: 'buildAndPush' command: 'build'
Dockerfile: 'outpost/ldap.Dockerfile' Dockerfile: 'outpost/ldap.Dockerfile'
buildContext: 'outpost/' buildContext: 'outpost/'
tags: | tags: |
gh-$(branchName) gh-$(branchName)
gh-$(Build.SourceVersion) gh-$(Build.SourceVersion)
arguments: '--build-arg GIT_BUILD_HASH=$(Build.SourceVersion)' arguments: '--build-arg GIT_BUILD_HASH=$(Build.SourceVersion)'
- task: Docker@2
inputs:
containerRegistry: 'beryjuorg-harbor'
repository: 'authentik/outpost-ldap'
command: 'push'
tags: |
gh-$(branchName)
gh-$(Build.SourceVersion)