Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions build-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- template: pipeline-templates/linux-build-steps.yml
- task: AzureKeyVault@2
inputs:
azureSubscription: 'OneIdentity.RD.SBox.Safeguard-ServiceConnection'
azureSubscription: 'SafeguardOpenSource'
KeyVaultName: 'SafeguardBuildSecrets'
SecretsFilter: 'DockerHubAccessToken,DockerHubPassword'
displayName: 'Get Docker Hub Access Token from Sandbox Azure Key Vault'
Expand All @@ -87,9 +87,6 @@ jobs:
script: |
docker login -u danpetersonoi --password-stdin <<<$(DockerHubAccessToken) 2>/dev/null

docker tag oneidentity/safeguard-devops:$(VersionString)-alpine3.12 oneidentity/safeguard-devops:$(VersionString)-alpine
docker tag oneidentity/safeguard-devops:$(VersionString)-alpine3.12 oneidentity/safeguard-devops:latest
docker push oneidentity/safeguard-devops:$(VersionString)-alpine3.12
docker push oneidentity/safeguard-devops:$(VersionString)-alpine
docker push oneidentity/safeguard-devops:latest

Expand All @@ -109,7 +106,7 @@ jobs:
- template: pipeline-templates/linux-build-steps.yml
- task: AzureKeyVault@2
inputs:
azureSubscription: 'OneIdentity.RD.SBox.Safeguard-ServiceConnection'
azureSubscription: 'SafeguardOpenSource'
KeyVaultName: 'SafeguardBuildSecrets'
SecretsFilter: 'DockerHubAccessToken,DockerHubPassword'
displayName: 'Get Docker Hub Access Token from Sandbox Azure Key Vault'
Expand All @@ -121,8 +118,6 @@ jobs:
script: |
docker login -u danpetersonoi --password-stdin <<<$(DockerHubAccessToken) 2>/dev/null

docker tag oneidentity/safeguard-devops:$(VersionString)-ubuntu20.04 oneidentity/safeguard-devops:$(VersionString)-ubuntu
docker push oneidentity/safeguard-devops:$(VersionString)-ubuntu20.04
docker push oneidentity/safeguard-devops:$(VersionString)-ubuntu

docker logout
Expand Down
2 changes: 1 addition & 1 deletion pipeline-templates/global-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# azure pipeline Reached heap limit Allocation failed - JavaScript heap out of memory The command "npm install" exited with code 134
variables:
- name: semanticVersion
value: "8.0.0"
value: "8.2.0"
- name: isPrerelease
value: ${{ true }}
- name: isReleaseBranch
Expand Down
7 changes: 4 additions & 3 deletions pipeline-templates/linux-build-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ steps:

- task: Bash@3
inputs:
targetType: 'filePath'
filePath: '$(System.DefaultWorkingDirectory)/build-docker.sh'
arguments: $(imageType) $(VersionString)
targetType: 'inline'
script: |
$(System.DefaultWorkingDirectory)/build-docker.sh $(imageType) $(VersionString)
docker tag oneidentity/safeguard-devops:$(VersionString)-$(imageType) oneidentity/safeguard-devops:latest
failOnStderr: true
displayName: 'Building docker image'