Skip to content

Commit

Permalink
removed container variables
Browse files Browse the repository at this point in the history
  • Loading branch information
jananivMS committed May 7, 2020
1 parent c494823 commit ade4806
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
14 changes: 1 addition & 13 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,25 +57,13 @@ stages:
command: 'login'
checkLatest: true

- bash: |
sed 's/\[AZURE_CLIENT_ID\]/'$AZURE_CLIENT_ID'/' devops/Dockerfile > outdock
sed 's/\[AZURE_CLIENT_SECRET\]/'$AZURE_CLIENT_SECRET'/' outdock > outdock1
sed 's/\[AZURE_TENANT_ID\]/'$AZURE_TENANT_ID'/' outdock1 > outdock2
sed 's/\[AZURE_SUBSCRIPTION_ID\]/'$AZURE_SUBSCRIPTION_ID'/' outdock2 > outdock3
sed 's/\[AZURE_OPERATOR_KEYVAULT\]/'$AZURE_OPERATOR_KEYVAULT'/' outdock3 > outdock4
sed 's/\[CLUSTERNAME\]/'$CLUSTERNAME'/' outdock4 > outdock5
sed 's/\[RESOURCEGROUP\]/'$RESOURCEGROUP'/' outdock5 > outdock6
env:
AZURE_CLIENT_SECRET: $(AZURE_SP_SECRET)
displayName: Set container variables
- task: Docker@2
displayName: Build and push Docker image
inputs:
containerRegistry: 'ASO-ACR'
repository: '$(imageRepository)'
command: 'buildAndPush'
Dockerfile: 'outdock6'
Dockerfile: 'devops/Dockerfile'
buildContext: '$(System.DefaultWorkingDirectory)'
tags: '$(tag)'

Expand Down
6 changes: 0 additions & 6 deletions devops/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ WORKDIR /

COPY . ./

ENV AZURE_CLIENT_ID [AZURE_CLIENT_ID]
ENV AZURE_CLIENT_SECRET [AZURE_CLIENT_SECRET]
ENV AZURE_SUBSCRIPTION_ID [AZURE_SUBSCRIPTION_ID]
ENV AZURE_TENANT_ID [AZURE_TENANT_ID]
ENV AZURE_OPERATOR_KEYVAULT [AZURE_OPERATOR_KEYVAULT]

ENV REQUEUE_AFTER "30"

ENTRYPOINT ["/manager"]

0 comments on commit ade4806

Please sign in to comment.