Skip to content
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

Jump to bottom

Add changes to pipeline #149

Merged
merged 4 commits into from
Sep 29, 2023
Merged

Add changes to pipeline #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
183fbf5
Add changes to pipeline
ElYusubov Sep 29, 2023
51016c7
Test the updated id on workflow
ElYusubov Sep 29, 2023
fde9c17
Add acr web app to main deployment
ElYusubov Sep 29, 2023
dc3fe0b
Remove acr reference from main deployment bicep
ElYusubov Sep 29, 2023
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
9 changes: 4 additions & 5 deletions .github/workflows/main.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ name: deploy-main-site
concurrency: test-company

on:
push:
branches:
- main
- 'release/**'
pull_request:
branches: [main]

env:
AZURE_RESOURCEGROUP_NAME: BicepTest-RG
Expand Down Expand Up @@ -58,7 +56,8 @@ jobs:
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
enable-AzPSSession: true
- uses: azure/arm-deploy@v1
name: Deploy website
id: deploy
name: Deploy resources
with:
failOnStdErr: false
deploymentName: ${{ github.run_number }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shiftleft-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: SL Scan
on:
push:
branches: [ main ]
pull_request:
# pull_request:
# The branches below must be a subset of the branches above
# branches: [ main ]
# schedule:
Expand Down
12 changes: 11 additions & 1 deletion deploy/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ resource appServiceApp 'Microsoft.Web/sites@2021-01-15' = {
location: location
properties: {
serverFarmId: appServicePlan.id
httpsOnly: false
httpsOnly: true
siteConfig: {
appSettings: [
{
Expand Down Expand Up @@ -101,4 +101,14 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-04-01' = {
}
}

// Using ACR
// module acrPrivateWebApp 'br/LatamDemo:webapp:v2.0.0'= {
// name: 'acrWebApp-deploy-v2'
// params: {
// location: 'westus'
// appServiceAppName: 'acrwebapp-new-westus'
// appServicePlanName: 'asp-acrwebapp-westus'
// }
// }

output appServiceAppHostName string = appServiceApp.properties.defaultHostName
Loading