Skip to content

Commit ee8ce51

Browse files
Merge pull request #473 from PrabhaQuest/release-8_2_0
Release 8_2_0
2 parents 473b685 + ef080c9 commit ee8ce51

3 files changed

Lines changed: 7 additions & 11 deletions

File tree

build-publish.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
- template: pipeline-templates/linux-build-steps.yml
7676
- task: AzureKeyVault@2
7777
inputs:
78-
azureSubscription: 'OneIdentity.RD.SBox.Safeguard-ServiceConnection'
78+
azureSubscription: 'SafeguardOpenSource'
7979
KeyVaultName: 'SafeguardBuildSecrets'
8080
SecretsFilter: 'DockerHubAccessToken,DockerHubPassword'
8181
displayName: 'Get Docker Hub Access Token from Sandbox Azure Key Vault'
@@ -87,9 +87,6 @@ jobs:
8787
script: |
8888
docker login -u danpetersonoi --password-stdin <<<$(DockerHubAccessToken) 2>/dev/null
8989
90-
docker tag oneidentity/safeguard-devops:$(VersionString)-alpine3.12 oneidentity/safeguard-devops:$(VersionString)-alpine
91-
docker tag oneidentity/safeguard-devops:$(VersionString)-alpine3.12 oneidentity/safeguard-devops:latest
92-
docker push oneidentity/safeguard-devops:$(VersionString)-alpine3.12
9390
docker push oneidentity/safeguard-devops:$(VersionString)-alpine
9491
docker push oneidentity/safeguard-devops:latest
9592
@@ -109,7 +106,7 @@ jobs:
109106
- template: pipeline-templates/linux-build-steps.yml
110107
- task: AzureKeyVault@2
111108
inputs:
112-
azureSubscription: 'OneIdentity.RD.SBox.Safeguard-ServiceConnection'
109+
azureSubscription: 'SafeguardOpenSource'
113110
KeyVaultName: 'SafeguardBuildSecrets'
114111
SecretsFilter: 'DockerHubAccessToken,DockerHubPassword'
115112
displayName: 'Get Docker Hub Access Token from Sandbox Azure Key Vault'
@@ -121,8 +118,6 @@ jobs:
121118
script: |
122119
docker login -u danpetersonoi --password-stdin <<<$(DockerHubAccessToken) 2>/dev/null
123120
124-
docker tag oneidentity/safeguard-devops:$(VersionString)-ubuntu20.04 oneidentity/safeguard-devops:$(VersionString)-ubuntu
125-
docker push oneidentity/safeguard-devops:$(VersionString)-ubuntu20.04
126121
docker push oneidentity/safeguard-devops:$(VersionString)-ubuntu
127122
128123
docker logout

pipeline-templates/global-variables.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# azure pipeline Reached heap limit Allocation failed - JavaScript heap out of memory The command "npm install" exited with code 134
1313
variables:
1414
- name: semanticVersion
15-
value: "8.0.0"
15+
value: "8.2.0"
1616
- name: isPrerelease
1717
value: ${{ true }}
1818
- name: isReleaseBranch

pipeline-templates/linux-build-steps.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ steps:
1414

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

0 commit comments

Comments
 (0)