Skip to content

Introduce bicep param for acrImageTag #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
picccard wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Introduce bicep param for acrImageTag #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf4d295
add parameter acrImageTag to functionApp and appService modules
picccard Jun 26, 2024
be10839
add acrImageTag to main bicep
picccard Jun 26, 2024
189507b
Update main.parameters.example.json
picccard Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions deploy/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ param deployAsFunc bool = false
@description('Flag to Deploy IPAM as a Container')
param deployAsContainer bool = false

@description('IPAM Container Image Tag to use')
param acrImageTag string = 'latest'

@description('IPAM-UI App Registration Client/App ID')
param uiAppId string = '00000000-0000-0000-0000-000000000000'

Expand Down Expand Up @@ -151,6 +154,7 @@ module appService './modules/appService.bicep' = if (!deployAsFunc) {
managedIdentityClientId: managedIdentity.outputs.clientId
workspaceId: logAnalyticsWorkspace.outputs.workspaceId
deployAsContainer: deployAsContainer
acrImageTag: acrImageTag
privateAcr: privateAcr
privateAcrUri: privateAcr ? containerRegistry.outputs.acrUri : ''
}
Expand All @@ -174,6 +178,7 @@ module functionApp './modules/functionApp.bicep' = if (deployAsFunc) {
storageAccountName: resourceNames.storageAccountName
workspaceId: logAnalyticsWorkspace.outputs.workspaceId
deployAsContainer: deployAsContainer
acrImageTag: acrImageTag
privateAcr: privateAcr
privateAcrUri: privateAcr ? containerRegistry.outputs.acrUri : ''
}
Expand Down
3 changes: 3 additions & 0 deletions deploy/main.parameters.example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
"deployAsContainer": {
"value": false
},
"acrImageTag": {
"value": "latest"
},
"privateAcr": {
"value": false
},
Expand Down
5 changes: 4 additions & 1 deletion deploy/modules/appService.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ param workspaceId string
@description('Flag to Deploy IPAM as a Container')
param deployAsContainer bool = false

@description('IPAM Container Image Tag to use')
param acrImageTag string = 'latest'

@description('Flag to Deploy Private Container Registry')
param privateAcr bool

Expand Down Expand Up @@ -83,7 +86,7 @@ resource appService 'Microsoft.Web/sites@2021-02-01' = {
acrUseManagedIdentityCreds: privateAcr ? true : false
acrUserManagedIdentityID: privateAcr ? managedIdentityClientId : null
alwaysOn: true
linuxFxVersion: deployAsContainer ? 'DOCKER|${acrUri}/ipam:latest' : 'PYTHON|${pythonVersion}'
linuxFxVersion: deployAsContainer ? 'DOCKER|${acrUri}/ipam:${acrImageTag}' : 'PYTHON|${pythonVersion}'
appCommandLine: !deployAsContainer ? 'bash ./init.sh 8000' : null
healthCheckPath: '/api/status'
appSettings: concat(
Expand Down
5 changes: 4 additions & 1 deletion deploy/modules/functionApp.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ param workspaceId string
@description('Flag to Deploy IPAM as a Container')
param deployAsContainer bool = false

@description('IPAM Container Image Tag to use')
param acrImageTag string = 'latest'

@description('Flag to Deploy Private Container Registry')
param privateAcr bool

Expand Down Expand Up @@ -87,7 +90,7 @@ resource functionApp 'Microsoft.Web/sites@2021-03-01' = {
siteConfig: {
acrUseManagedIdentityCreds: privateAcr ? true : false
acrUserManagedIdentityID: privateAcr ? managedIdentityClientId : null
linuxFxVersion: deployAsContainer ? 'DOCKER|${acrUri}/ipamfunc:latest' : 'PYTHON|${pythonVersion}'
linuxFxVersion: deployAsContainer ? 'DOCKER|${acrUri}/ipamfunc:${acrImageTag}' : 'PYTHON|${pythonVersion}'
healthCheckPath: '/api/status'
appSettings: concat(
[
Expand Down