Skip to content

Commit a33d02c

Browse files
Merge pull request #28 from christianacca/cc/new-container-app
New container app
2 parents d9936c3 + fc01e14 commit a33d02c

File tree

93 files changed

+75668
-100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+75668
-100
lines changed

.github/workflows/__app-deploy.yml

+26
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
environment-name: ${{ inputs.environment-name }}
5252

5353
- uses: kanga333/variable-mapper@3681b75f5c6c00162721168fb91ab74925eaebcb # <- v0.3.0
54+
name: Map variables
5455
with:
5556
mode: fill
5657
key: "${{ inputs.environment-name }}"
@@ -88,6 +89,8 @@ jobs:
8889
"ApplicationInsights_AutoCollectActionArgs": "${{ env.Convention_IsTestEnv }}",
8990
"gha_step_deploy_api_envVarsSelector": "Api_*,ApplicationInsights_*,CentralIdentity_*,EnvironmentInfo_*",
9091
"gha_step_deploy_api_imageToDeploy": "${{ inputs.docker-registry }}/${{ env.Convention_SubProducts_Api_ImageName }}:${{ inputs.docker-image-tag }}",
92+
"gha_step_deploy_app_envVarsSelector": "App_*,ApplicationInsights_*",
93+
"gha_step_deploy_app_imageToDeploy": "${{ inputs.docker-registry }}/${{ env.Convention_SubProducts_App_ImageName }}:${{ inputs.docker-image-tag }}",
9194
"EnvironmentInfo_EnvId": "${{ inputs.environment-name }}",
9295
"EnvironmentInfo_InfraVersion": "${{ env.Infra_Version }}",
9396
"InternalApi_Database_DataSource": "${{ env.Convention_SubProducts_Sql_Primary_DataSource }}",
@@ -135,6 +138,29 @@ jobs:
135138
resourceGroup: ${{ env.Convention_AppResourceGroup_ResourceName }}
136139
testRevision: true
137140

141+
- name: Deploy App (primary region)
142+
uses: christianacca/container-apps-revision-action@v1
143+
with:
144+
containerAppName: ${{ env.Convention_SubProducts_App_Primary_ResourceName }}
145+
envVarsSelector: ${{ env.gha_step_deploy_app_envVarsSelector }}
146+
envVarKeyTransform: _=>__
147+
healthRequestPath: ${{ env.Convention_SubProducts_App_DefaultHealthPath }}
148+
imageToDeploy: ${{ env.gha_step_deploy_app_imageToDeploy }}
149+
resourceGroup: ${{ env.Convention_AppResourceGroup_ResourceName }}
150+
testRevision: true
151+
152+
- name: Deploy App (failover region)
153+
if: ${{ env.Convention_SubProducts_App_Failover_ResourceName != null }}
154+
uses: christianacca/container-apps-revision-action@v1
155+
with:
156+
containerAppName: ${{ env.Convention_SubProducts_App_Failover_ResourceName }}
157+
envVarsSelector: ${{ env.gha_step_deploy_app_envVarsSelector }}
158+
envVarKeyTransform: _=>__
159+
healthRequestPath: ${{ env.Convention_SubProducts_App_DefaultHealthPath }}
160+
imageToDeploy: ${{ env.gha_step_deploy_app_imageToDeploy }}
161+
resourceGroup: ${{ env.Convention_AppResourceGroup_ResourceName }}
162+
testRevision: true
163+
138164
- name: Azure Function App (internalapi) - Deploy
139165
uses: Azure/functions-action@v1
140166
with:

WebApiStarterTemplate.sln

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3+
#
34
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Template.Api", "src\Template.Api\Template.Api.csproj", "{305991B7-8A22-4E11-8F90-6F9D5AC16A87}"
45
EndProject
56
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Template.Functions", "src\Template.Functions\Template.Functions.csproj", "{DD561531-4F91-4534-AACD-D7769EE1A141}"
@@ -8,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Template.Shared", "src\Temp
89
EndProject
910
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.ManagedIdentity", "src\Azure.ManagedIdentity\Azure.ManagedIdentity.csproj", "{6C8356A7-59CF-4CC7-9C9D-CA235E1D1F33}"
1011
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Template.App", "src\Template.App\Template.App.csproj", "{6A20EA9B-C08B-4686-887E-607E06DADA2D}"
13+
EndProject
1114
Global
1215
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1316
Debug|Any CPU = Debug|Any CPU
@@ -30,5 +33,9 @@ Global
3033
{6C8356A7-59CF-4CC7-9C9D-CA235E1D1F33}.Debug|Any CPU.Build.0 = Debug|Any CPU
3134
{6C8356A7-59CF-4CC7-9C9D-CA235E1D1F33}.Release|Any CPU.ActiveCfg = Release|Any CPU
3235
{6C8356A7-59CF-4CC7-9C9D-CA235E1D1F33}.Release|Any CPU.Build.0 = Release|Any CPU
36+
{6A20EA9B-C08B-4686-887E-607E06DADA2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{6A20EA9B-C08B-4686-887E-607E06DADA2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{6A20EA9B-C08B-4686-887E-607E06DADA2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{6A20EA9B-C08B-4686-887E-607E06DADA2D}.Release|Any CPU.Build.0 = Release|Any CPU
3340
EndGlobalSection
3441
EndGlobal

docs/CONTRIBUTING.md

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* [API design conventions](#api-design-conventions)
88
* [Typical tasks](#typical-tasks)
99
* [Working with EF Core migrations](#working-with-ef-core-migrations)
10+
* [Adding a new application](#adding-a-new-application)
1011
<!-- TOC -->
1112

1213
This document is the a contribution guide for the AIG backend stack project. _It is a work in progress._
@@ -106,3 +107,7 @@ dotnet ef migrations remove -p src/Template.Shared -s src/Template.Api
106107
Remove-Item -Force -ErrorAction Continue ./obj/CreateOrUpdateDb.sql
107108
dotnet ef migrations script -i -o obj/CreateOrUpdateDb.sql -p src/Template.Shared -s src/Template.Api
108109
```
110+
111+
### Adding a new application
112+
113+
Set guide [here](./add-application.md)

0 commit comments

Comments
 (0)