simplify/merge workflow

This commit is contained in:
Chris Kruining 2024-11-18 14:25:15 +01:00
parent 516c744a72
commit 43b161b413
No known key found for this signature in database
GPG key ID: EB894A3560CCCAD2
6 changed files with 29 additions and 52 deletions

View file

@ -3,10 +3,11 @@ import { Context } from 'types.bicep'
targetScope = 'resourceGroup'
param context Context
param registry resource'Microsoft.ContainerRegistry/registries@2023-07-01'
param version string
@secure()
param registryUrl string
var appName = 'app'
var version = 'latest'
resource environment 'Microsoft.App/managedEnvironments@2024-03-01' = {
name: 'cea-${context.locationAbbreviation}-${context.environment}-${context.projectName}'
@ -65,7 +66,7 @@ resource app 'Microsoft.App/containerApps@2024-03-01' = {
registries: [
{
identity: 'system'
server: 'acreuwprdcalque.azurecr.io'
server: registryUrl
}
]
}
@ -73,7 +74,7 @@ resource app 'Microsoft.App/containerApps@2024-03-01' = {
template: {
containers: [
{
image: 'acreuwprdcalque.azurecr.io/${context.projectName}-${appName}:${version}'
image: '${registryUrl}/${context.projectName}-${appName}:${version}'
name: '${context.projectName}-${appName}'
resources: {
cpu: json('0.25')

View file

@ -6,6 +6,9 @@ param locationAbbreviation string
param location string
param environment string
param projectName string
param version string
@secure()
param registryUrl string
param deployedAt string = utcNow('yyyyMMdd')
var context = {
@ -42,6 +45,7 @@ module app 'app.bicep' = {
scope: calqueResourceGroup
params: {
context: context
registry: registry.outputs.registry
version: version
registryUrl: registryUrl
}
}

View file

@ -4,3 +4,5 @@ param locationAbbreviation = 'euw'
param location = 'westeurope'
param environment = 'prd'
param projectName = 'calque'
param version = 'latest'
param registryUrl = '__PLACEHOLDER__'

View file

@ -21,5 +21,3 @@ resource registry 'Microsoft.ContainerRegistry/registries@2023-07-01' = {
}
}
}
output registry resource'Microsoft.ContainerRegistry/registries@2023-07-01' = registry