reference unique ACR registries
This commit is contained in:
Родитель
0f6c9ec418
Коммит
3994d4aef2
|
@ -23,12 +23,12 @@ jobs:
|
|||
with:
|
||||
azPSVersion: "3.1.0"
|
||||
inlineScript: |
|
||||
az deployment group create -n ghactionbgtasks${{ github.sha }} -g ${{ secrets.AZURE_RESOURCE_GROUP_NAME }} --template-file deploy/Services/acr.bicep --parameters acrName=${{secrets.ACR_NAME}}
|
||||
az deployment group create -n ghactionbgtasks${{ github.sha }} -g ${{ secrets.AZURE_RESOURCE_GROUP_NAME }} --template-file deploy/Services/acr.bicep --parameters acrName=${{secrets.ACR_NAME}}${{ inputs.environment }}
|
||||
|
||||
- name: Login to ACR
|
||||
uses: docker/login-action@v2.1.0
|
||||
with:
|
||||
registry: ${{ secrets.ACR_NAME }}.azurecr.io
|
||||
registry: ${{ secrets.ACR_NAME }}${{ inputs.environment }}.azurecr.io
|
||||
username: ${{ fromJson(secrets.AZURE_CREDENTIALS).clientId }}
|
||||
password: ${{ fromJson(secrets.AZURE_CREDENTIALS).clientSecret }}
|
||||
|
||||
|
@ -54,7 +54,7 @@ jobs:
|
|||
az deployment group create -n ghaction${{ github.sha }} `
|
||||
--resource-group ${{secrets.AZURE_RESOURCE_GROUP_NAME}} `
|
||||
--template-file deploy/Services/api.bicep `
|
||||
--parameters acrName=${{ secrets.ACR_NAME }} imageTag=${{ github.sha }} administratorLogin=${{secrets.PODCASTDB_USER_LOGIN}} administratorLoginPassword=${{secrets.PODCASTDB_USER_PASSWORD}} storageAccountName=${{ secrets.STORAGE_NAME }} serverName=${{secrets.PODCASTDB_SERVER_NAME}} kubernetesEnvName=${{secrets.KUBERNETES_ENV_NAME}} workspaceName=${{secrets.WORKSPACE_NAME}} apiName=${{secrets.API_RESOURCE_NAME}} updaterName=${{secrets.UPDATER_RESOURCE_NAME}}
|
||||
--parameters acrName=${{ secrets.ACR_NAME }}${{ inputs.environment }} imageTag=${{ github.sha }} administratorLogin=${{secrets.PODCASTDB_USER_LOGIN}} administratorLoginPassword=${{secrets.PODCASTDB_USER_PASSWORD}} storageAccountName=${{ secrets.STORAGE_NAME }} serverName=${{secrets.PODCASTDB_SERVER_NAME}} kubernetesEnvName=${{secrets.KUBERNETES_ENV_NAME}} workspaceName=${{secrets.WORKSPACE_NAME}} apiName=${{secrets.API_RESOURCE_NAME}} updaterName=${{secrets.UPDATER_RESOURCE_NAME}}
|
||||
if( $LASTEXITCODE -ne 0 ) { exit -1 }
|
||||
|
||||
- name: Upload Images
|
||||
|
|
|
@ -145,7 +145,7 @@ resource apiContainerApp 'Microsoft.App/containerApps@2022-03-01' = {
|
|||
template: {
|
||||
containers: [
|
||||
{
|
||||
image: '${acr.properties.loginServer}podcastapi:${imageTag}'
|
||||
image: '${acr.properties.loginServer}/podcastapi:${imageTag}'
|
||||
name: 'podcastapi'
|
||||
resources: {
|
||||
cpu: 1
|
||||
|
@ -223,7 +223,7 @@ resource ingestionContainerApp 'Microsoft.App/containerApps@2022-03-01' = if (de
|
|||
template: {
|
||||
containers: [
|
||||
{
|
||||
image: '${acr.properties.loginServer}podcastingestion:1.0.0'
|
||||
image: '${acr.properties.loginServer}/podcastingestion:1.0.0'
|
||||
name: 'podcastingestion'
|
||||
resources: {
|
||||
cpu: 1
|
||||
|
@ -299,7 +299,7 @@ resource updaterContainerApp 'Microsoft.App/containerApps@2022-03-01' = {
|
|||
template: {
|
||||
containers: [
|
||||
{
|
||||
image: '${acr.properties.loginServer}podcastupdaterworker:1.0.0'
|
||||
image: '${acr.properties.loginServer}/podcastupdaterworker:1.0.0'
|
||||
name: 'podcastupdater'
|
||||
resources: {
|
||||
cpu: 1
|
||||
|
|
Загрузка…
Ссылка в новой задаче