Amending changes from @TomChv

Signed-off-by: Sujay Pillai <sujayopillai@gmail.com>
This commit is contained in:
Sujay Pillai 2021-08-12 01:44:03 +08:00
parent d74753bca7
commit a99fc52eeb
2 changed files with 6 additions and 6 deletions

View File

@ -35,14 +35,14 @@ let defaultVersion = "2.27.1@sha256:1e117183100c9fce099ebdc189d73e506e7b02d2b73d
image: docker.#Pull & { image: docker.#Pull & {
from: "mcr.microsoft.com/azure-cli:\(version)" from: "mcr.microsoft.com/azure-cli:\(version)"
} }
always: true always: true
command: """ command: """
az login --service-principal -u "$(cat /run/secrets/appId)" -p "$(cat /run/secrets/password)" -t "$(cat /run/secrets/tenantId)" az login --service-principal -u "$(cat /run/secrets/appId)" -p "$(cat /run/secrets/password)" -t "$(cat /run/secrets/tenantId)"
az account set -s "$(cat /run/secrets/subscriptionId)" az account set -s "$(cat /run/secrets/subscriptionId)"
""" """
secret: { secret: {
"/run/secrets/appId": config.appId "/run/secrets/appId": config.appId
"/run/secrets/password": config.password "/run/secrets/password": config.password

View File

@ -33,7 +33,7 @@ import (
""" """
env: { env: {
AZURE_DEFAULTS_GROUP: rgName AZURE_DEFAULTS_GROUP: rgName
AZURE_DEFAULTS_LOCATION: rgLocation AZURE_DEFAULTS_LOCATION: rgLocation
} }
} }
@ -41,8 +41,8 @@ import (
// Resource Id // Resource Id
id: ({ id: ({
os.#File & { os.#File & {
from: ctr from: ctr
path: "/resourceGroupId" path: "/resourceGroupId"
} }
}).contents }).contents
} }