Merge pull request #388 from afelix-95/main

Update repo to match instructions updates in DevOps labs

Author: LuizMacedo

.ado/eshoponweb-cd-webapp-code.yml

@@ -40,7 +40,7 @@ stages:
         resourceGroupName: '$(resource-group)'
         location: '$(location)'
         templateLocation: 'Linked artifact'
-        csmFile: '$(Pipeline.Workspace)/Bicep/$(templateFile)'
+        csmFile: '$(Pipeline.Workspace)/eshoponweb-ci/Bicep/$(templateFile)'
         overrideParameters: '-webAppName $(webappname) -location $(location)'
         deploymentMode: 'Incremental'
         deploymentOutputs: 'asp-json'
@@ -53,7 +53,7 @@ stages:
         azureSubscription: '$(azureserviceconnection)'
         appType: 'webApp'
         WebAppName: '$(webappname)'
-        packageForLinux: '$(Pipeline.Workspace)/Website/Web.zip'
+        packageForLinux: '$(Pipeline.Workspace)/eshoponweb-ci/Website/Web.zip'
 
 
 

.ado/eshoponweb-ci-dockercompose.yml

@@ -54,7 +54,7 @@ stages:
           Write-Host "##vso[task.setvariable variable=acrloginserver;]$value"
           echo $acrloginserver
     # docker compose build images
-    - task: DockerCompose@0
+    - task: DockerCompose@1
       displayName: Build Docker Compose
       inputs:
         containerregistrytype: 'Azure Container Registry'
@@ -65,7 +65,7 @@ stages:
         action: 'Build services'
         additionalImageTags: '$(Build.BuildNumber)'
         includeLatestTag: true
-    - task: DockerCompose@0
+    - task: DockerCompose@1
       displayName: Push Docker Compose
       inputs:
         containerregistrytype: 'Azure Container Registry'

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.4'
-
 services:
   eshopwebmvc:
     image: ${DOCKER_REGISTRY-}eshopwebmvc

infra/webapp.bicep

@@ -1,5 +1,5 @@
 param webAppName string = uniqueString(resourceGroup().id) // Generate unique String for web app name
-param sku string = 'B1' // The SKU of App Service Plan
+param sku string = 'S1' // The SKU of App Service Plan
 param location string = resourceGroup().location
 
 var appServicePlanName = toLower('AppServicePlan-${webAppName}')