From c38d576e86598e5bbb17c3e39137848919f4f866 Mon Sep 17 00:00:00 2001
From: Cesar De la Torre Llorente <cesardl@microsoft.com>
Date: Fri, 11 May 2018 19:22:23 -0700
Subject: [PATCH 1/2] Deleted the docker-compose.ci.build.yml file as we don't
 need it anymore since we're using DOCKER MULTI-STAGE BUILDS.

---
 docker-compose.ci.build.yml | 19 -------------------
 docker-compose.dcproj       |  1 -
 2 files changed, 20 deletions(-)
 delete mode 100644 docker-compose.ci.build.yml

diff --git a/docker-compose.ci.build.yml b/docker-compose.ci.build.yml
deleted file mode 100644
index 747e8e583..000000000
--- a/docker-compose.ci.build.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: '3.4'
-
-services:
-  ci-build:
-    image: microsoft/aspnetcore-build:2.0.2    #Depending on the bug below, you can also try this other SDK image: microsoft/aspnetcore-build:1.0-2.0-2017-10 or microsoft/aspnetcore-build:1.0-2.0
-    volumes:
-      - .:/src
-      - ./cli-linux:/cli-linux
-    working_dir: /src
-
-
-#   Next line is using the .sln file to compile all the projects. 
-#   Sometime there is an issue in msbuild exits the process before finishing building the bits: (https://github.com/Microsoft/msbuild/issues/2153)
-#   Random error: error MSB4017: The build stopped unexpectedly be cause of an unexpected logger failure.
-    command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish"
-
-#    NOTE: Using build-bits-linux.sh from Linux build container exits before ending.
-    #command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && pushd /cli-linux && ./build-bits-linux.sh /src"
-    
\ No newline at end of file
diff --git a/docker-compose.dcproj b/docker-compose.dcproj
index d1f485b05..296c4b5e0 100644
--- a/docker-compose.dcproj
+++ b/docker-compose.dcproj
@@ -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>

From 4eb73f8e23a8db060ab462cb63fc483ae7aad6ed Mon Sep 17 00:00:00 2001
From: Cesar De la Torre Llorente <cesardl@microsoft.com>
Date: Fri, 11 May 2018 19:35:28 -0700
Subject: [PATCH 2/2] Fixed bug in configuration.json for Ocelot API Gateways.
 ReRoutes for the Marketing microservices shound't be present in the
 configuration.json for the Shopping API Gateways, only for the Marketing API
 Gateways.

---
 .../apigw/configuration.json                  | 24 -------------------
 .../Web.Bff.Shopping/apigw/configuration.json | 24 -------------------
 2 files changed, 48 deletions(-)

diff --git a/src/ApiGateways/Mobile.Bff.Shopping/apigw/configuration.json b/src/ApiGateways/Mobile.Bff.Shopping/apigw/configuration.json
index 870690ed4..0fd6d9024 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/apigw/configuration.json
+++ b/src/ApiGateways/Mobile.Bff.Shopping/apigw/configuration.json
@@ -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": []
       }
   
     ],
diff --git a/src/ApiGateways/Web.Bff.Shopping/apigw/configuration.json b/src/ApiGateways/Web.Bff.Shopping/apigw/configuration.json
index 63aeb7752..3828ef3cf 100644
--- a/src/ApiGateways/Web.Bff.Shopping/apigw/configuration.json
+++ b/src/ApiGateways/Web.Bff.Shopping/apigw/configuration.json
@@ -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": []
     }
 
   ],