Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@arealmaas
arealmaas committed Oct 1, 2024
1 parent 933d298 commit 479a16d
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 6 deletions.
6 changes: 5 additions & 1 deletion .azure/applications/graphql/main.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ param location string
@minLength(3)
param apimIp string

@description('The suffix for the revision of the container app')
@minLength(3)
param revisionSuffix string

@description('CPU and memory resources for the container app')
param resources object?

Expand Down Expand Up @@ -87,7 +91,7 @@ module containerApp '../../modules/containerApp/main.bicep' = {
apimIp: apimIp
tags: tags
resources: resources
revisionSuffix: imageTag
revisionSuffix: revisionSuffix
}
}

Expand Down
1 change: 1 addition & 0 deletions .azure/applications/graphql/prod.bicepparam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ param environment = 'prod'
param location = 'norwayeast'
param apimIp = '51.120.88.54'
param imageTag = readEnvironmentVariable('IMAGE_TAG')
param revisionSuffix = readEnvironmentVariable('REVISION_SUFFIX')

// secrets
param environmentKeyVaultName = readEnvironmentVariable('AZURE_ENVIRONMENT_KEY_VAULT_NAME')
Expand Down
1 change: 1 addition & 0 deletions .azure/applications/graphql/staging.bicepparam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ param environment = 'staging'
param location = 'norwayeast'
param apimIp = '51.13.86.131'
param imageTag = readEnvironmentVariable('IMAGE_TAG')
param revisionSuffix = readEnvironmentVariable('REVISION_SUFFIX')

// secrets
param environmentKeyVaultName = readEnvironmentVariable('AZURE_ENVIRONMENT_KEY_VAULT_NAME')
Expand Down
1 change: 1 addition & 0 deletions .azure/applications/graphql/test.bicepparam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ param environment = 'test'
param location = 'norwayeast'
param apimIp = '51.120.88.69'
param imageTag = readEnvironmentVariable('IMAGE_TAG')
param revisionSuffix = readEnvironmentVariable('REVISION_SUFFIX')

// secrets
param environmentKeyVaultName = readEnvironmentVariable('AZURE_ENVIRONMENT_KEY_VAULT_NAME')
Expand Down
6 changes: 5 additions & 1 deletion .azure/applications/web-api-eu/main.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ param location string
@minLength(3)
param apimIp string

@description('The suffix for the revision of the container app')
@minLength(3)
param revisionSuffix string

@description('CPU and memory resources for the container app')
param resources object?

Expand Down Expand Up @@ -90,7 +94,7 @@ module containerApp '../../modules/containerApp/main.bicep' = {
apimIp: apimIp
tags: tags
resources: resources
revisionSuffix: imageTag
revisionSuffix: revisionSuffix
}
}

Expand Down
1 change: 1 addition & 0 deletions .azure/applications/web-api-eu/prod.bicepparam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ param environment = 'prod'
param location = 'norwayeast'
param apimIp = '51.120.88.54'
param imageTag = readEnvironmentVariable('IMAGE_TAG')
param revisionSuffix = readEnvironmentVariable('REVISION_SUFFIX')

// secrets
param environmentKeyVaultName = readEnvironmentVariable('AZURE_ENVIRONMENT_KEY_VAULT_NAME')
Expand Down
1 change: 1 addition & 0 deletions .azure/applications/web-api-eu/staging.bicepparam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ param environment = 'staging'
param location = 'norwayeast'
param apimIp = '51.13.86.131'
param imageTag = readEnvironmentVariable('IMAGE_TAG')
param revisionSuffix = readEnvironmentVariable('REVISION_SUFFIX')

// secrets
param environmentKeyVaultName = readEnvironmentVariable('AZURE_ENVIRONMENT_KEY_VAULT_NAME')
Expand Down
1 change: 1 addition & 0 deletions .azure/applications/web-api-eu/test.bicepparam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ param environment = 'test'
param location = 'norwayeast'
param apimIp = '51.120.88.69'
param imageTag = readEnvironmentVariable('IMAGE_TAG')
param revisionSuffix = readEnvironmentVariable('REVISION_SUFFIX')

// secrets
param environmentKeyVaultName = readEnvironmentVariable('AZURE_ENVIRONMENT_KEY_VAULT_NAME')
Expand Down
4 changes: 4 additions & 0 deletions .azure/applications/web-api-so/main.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ param location string
@minLength(3)
param apimIp string

@description('The suffix for the revision of the container app')
@minLength(3)
param revisionSuffix string

@description('CPU and memory resources for the container app')
param resources object?

Expand Down
1 change: 1 addition & 0 deletions .azure/applications/web-api-so/prod.bicepparam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ param environment = 'prod'
param location = 'norwayeast'
param apimIp = '51.120.88.54'
param imageTag = readEnvironmentVariable('IMAGE_TAG')
param revisionSuffix = readEnvironmentVariable('REVISION_SUFFIX')

// secrets
param environmentKeyVaultName = readEnvironmentVariable('AZURE_ENVIRONMENT_KEY_VAULT_NAME')
Expand Down
1 change: 1 addition & 0 deletions .azure/applications/web-api-so/staging.bicepparam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ param environment = 'staging'
param location = 'norwayeast'
param apimIp = '51.13.86.131'
param imageTag = readEnvironmentVariable('IMAGE_TAG')
param revisionSuffix = readEnvironmentVariable('REVISION_SUFFIX')

// secrets
param environmentKeyVaultName = readEnvironmentVariable('AZURE_ENVIRONMENT_KEY_VAULT_NAME')
Expand Down
1 change: 1 addition & 0 deletions .azure/applications/web-api-so/test.bicepparam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ param environment = 'test'
param location = 'norwayeast'
param apimIp = '51.120.88.69'
param imageTag = readEnvironmentVariable('IMAGE_TAG')
param revisionSuffix = readEnvironmentVariable('REVISION_SUFFIX')

// secrets
param environmentKeyVaultName = readEnvironmentVariable('AZURE_ENVIRONMENT_KEY_VAULT_NAME')
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/action-deploy-apps.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ jobs:
env:
# parameters
IMAGE_TAG: ${{ inputs.version }}
REVISION_SUFFIX: "${{ github.run_id }}-${{ inputs.version }}-${{ github.run_attempt}}"
# secrets
AZURE_CONTAINER_APP_ENVIRONMENT_NAME: ${{ secrets.AZURE_CONTAINER_APP_ENVIRONMENT_NAME }}
AZURE_ENVIRONMENT_KEY_VAULT_NAME: ${{ secrets.AZURE_ENVIRONMENT_KEY_VAULT_NAME }}
Expand All @@ -97,7 +96,6 @@ jobs:
env:
# parameters
IMAGE_TAG: ${{ inputs.version }}
REVISION_SUFFIX: "${{ github.run_id }}-${{ inputs.version }}-${{ github.run_attempt}}"
# secrets
AZURE_CONTAINER_APP_ENVIRONMENT_NAME: ${{ secrets.AZURE_CONTAINER_APP_ENVIRONMENT_NAME }}
AZURE_ENVIRONMENT_KEY_VAULT_NAME: ${{ secrets.AZURE_ENVIRONMENT_KEY_VAULT_NAME }}
Expand Down Expand Up @@ -256,7 +254,6 @@ jobs:
env:
# parameters
IMAGE_TAG: ${{ inputs.version }}
REVISION_SUFFIX: "${{ github.run_id }}-${{ inputs.version }}-${{ github.run_attempt}}"
# secrets
AZURE_CONTAINER_APP_ENVIRONMENT_NAME: ${{ secrets.AZURE_CONTAINER_APP_ENVIRONMENT_NAME }}
AZURE_ENVIRONMENT_KEY_VAULT_NAME: ${{ secrets.AZURE_ENVIRONMENT_KEY_VAULT_NAME }}
Expand All @@ -279,7 +276,6 @@ jobs:
env:
# parameters
IMAGE_TAG: ${{ inputs.version }}
REVISION_SUFFIX: "${{ github.run_id }}-${{ inputs.version }}-${{ github.run_attempt}}"
# secrets
AZURE_CONTAINER_APP_ENVIRONMENT_NAME: ${{ secrets.AZURE_CONTAINER_APP_ENVIRONMENT_NAME }}
AZURE_ENVIRONMENT_KEY_VAULT_NAME: ${{ secrets.AZURE_ENVIRONMENT_KEY_VAULT_NAME }}
Expand Down

0 comments on commit 479a16d

Please sign in to comment.