Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev

Author: eiximenis

docker-compose.ci.build.yml

@@ -11,7 +11,6 @@
   </PropertyGroup>
   <ItemGroup>
     <None Include=".dockerignore" />
-    <None Include="docker-compose.ci.build.yml" />
     <None Include="docker-compose.override.yml">
       <DependentUpon>docker-compose.yml</DependentUpon>
     </None>

docker-compose.dcproj

@@ -96,18 +96,6 @@
         "UpstreamPathTemplate": "/catalog-api/{everything}",
         "UpstreamHttpMethod": []
       },
-      {
-        "DownstreamPathTemplate": "/{everything}",
-        "DownstreamScheme": "http",
-        "DownstreamHostAndPorts": [
-          {
-            "Host": "marketing.api",
-            "Port": 80
-          }
-        ],
-        "UpstreamPathTemplate": "/marketing-api/{everything}",
-        "UpstreamHttpMethod": []
-      },
       {
         "DownstreamPathTemplate": "/{everything}",
         "DownstreamScheme": "http",
@@ -119,18 +107,6 @@
         ],
         "UpstreamPathTemplate": "/payment-api/{everything}",
         "UpstreamHttpMethod": []
-      },
-      {
-        "DownstreamPathTemplate": "/{everything}",
-        "DownstreamScheme": "http",
-        "DownstreamHostAndPorts": [
-          {
-            "Host": "locations.api",
-            "Port": 80
-          }
-        ],
-        "UpstreamPathTemplate": "/location-api/{everything}",
-        "UpstreamHttpMethod": []
       }
 
     ],

src/ApiGateways/Mobile.Bff.Shopping/apigw/configuration.json

@@ -108,18 +108,6 @@
       "UpstreamPathTemplate": "/catalog-api/{everything}",
       "UpstreamHttpMethod": []
     },
-    {
-      "DownstreamPathTemplate": "/{everything}",
-      "DownstreamScheme": "http",
-      "DownstreamHostAndPorts": [
-        {
-          "Host": "marketing.api",
-          "Port": 80
-        }
-      ],
-      "UpstreamPathTemplate": "/marketing-api/{everything}",
-      "UpstreamHttpMethod": []
-    },
     {
       "DownstreamPathTemplate": "/{everything}",
       "DownstreamScheme": "http",
@@ -131,18 +119,6 @@
       ],
       "UpstreamPathTemplate": "/payment-api/{everything}",
       "UpstreamHttpMethod": []
-    },
-    {
-      "DownstreamPathTemplate": "/{everything}",
-      "DownstreamScheme": "http",
-      "DownstreamHostAndPorts": [
-        {
-          "Host": "locations.api",
-          "Port": 80
-        }
-      ],
-      "UpstreamPathTemplate": "/location-api/{everything}",
-      "UpstreamHttpMethod": []
     }
 
   ],