Improve debug experience

Author: amolenk

.dockerignore

@@ -21,7 +21,5 @@
 **/npm-debug.log
 **/obj
 **/secrets.dev.yaml
-**/values.dev.yaml
-**/WebSPA/wwwroot
 LICENSE
 **/README*.md

deploy/compose/.env .env

@@ -1,4 +1,4 @@
-# Compose supports declaring default environment variables in an environment file named .env placed in the folder docker-compose command is executed from (current working directory).
+# Compose supports declaring default environment variables in an environment file named .env placed in the folder docker-compose command is executed from (current working directory).
 # Compose expects each line in an env file to be in VAR=VAL format. Lines beginning with # (i.e. comments) are ignored, as are blank lines.
 # Note: Values present in the environment at runtime will always override those defined inside the .env file. Similarly, values passed via command-line arguments take precedence as well.
 

.vscode/launch.json

@@ -1,13 +1,13 @@
 {
-  "configurations": [
-    {
-      "name": "Docker .NET Core Launch",
-      "type": "docker",
-      "request": "launch",
-      "preLaunchTask": "docker-run: debug",
-      "netCore": {
-        "appProject": "${workspaceFolder}/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj"
-      }
-    }
-  ]
+    "configurations": [
+        {
+            "name": "Docker .NET Core Attach (Preview)",
+            "type": "docker",
+            "request": "attach",
+            "platform": "netCore",
+            "sourceFileMap": {
+                "/src": "${workspaceFolder}"
+            }
+        }
+    ]
 }

.vscode/tasks.json

@@ -13,6 +13,7 @@ $outfile = "DockerfileSolutionRestore.txt"
 Write-Output "" > $outfile 
 Add-Content -Path $outfile "# Create this ""restore-solution"" section by running ./Create-DockerfileSolutionRestore.ps1, to optimize build cache reuse"
 Select-String -Path $solution -Pattern ', "(.*?\.csproj)"' | ForEach-Object { $_.Matches.Groups[1].Value.Replace("\", "/") } | Sort-Object | ForEach-Object {"COPY [""$_"", """ + $_.Substring(0, $_.LastIndexOf("/") + 1) + """]"} | Out-File -FilePath $outfile -Append
+Add-Content -Path $outfile "COPY [""docker-compose.dcproj"", ""./""]"
 Add-Content -Path $outfile "COPY [""NuGet.config"", ""./""]"
 Add-Content -Path $outfile "COPY [""$solution"", ""./""]"
 Add-Content -Path $outfile "RUN dotnet restore ""$solution"""

Create-DockerfileSolutionRestore.ps1

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" Sdk="Microsoft.Docker.Sdk" DefaultTargets="Build">
+  <PropertyGroup Label="Globals">
+    <ProjectVersion>2.1</ProjectVersion>
+    <DockerTargetOS>Linux</DockerTargetOS>
+    <ProjectGuid>{250B824E-6A72-4D6E-8287-CC73F40410E9}</ProjectGuid>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="docker-compose.override.yml">
+      <DependentUpon>docker-compose.yml</DependentUpon>
+    </None>
+    <None Include="docker-compose.yml" />
+    <None Include=".dockerignore" />
+    <None Include=".env" />
+  </ItemGroup>
+</Project>

DockerfileSolutionRestore.txt

@@ -259,7 +259,7 @@ services:
 
   webshoppingapigw:
     volumes:
-      - ./Envoy/config/webshopping:/etc/envoy
+      - ./src/ApiGateways/Envoy:/etc/envoy
     ports:
     - "5202:80"
     - "15202:8001"