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

Author: ramon-tomas-c

README.md

@@ -3,7 +3,7 @@ Sample .NET Core reference application, powered by Microsoft, based on a simplif
 **Note for Pull Requests**: We accept pull request from the community. When doing it, please do it onto the DEV branch which is the consolidated work-in-progress branch. Do not request it onto Master, if possible.
 
 ## Moved to .NET Core 2.0 "wave"
-We have moved to .NET Core 2.0!
+We have moved to .NET Core 2.0 already!
 
 * Branch `dev` is in .NET Core 2.0.
 * Branch `master` is *still* in .NET Core 1.1 (but it will be updated soon)

cli-mac/build-bits.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# List of microservices here needs to be updated to include all the new microservices (Marketing, etc.)
+
 projectList=(
     "../src/Services/Catalog/Catalog.API"
     "../src/Services/Basket/Basket.API"
@@ -38,3 +40,5 @@ fi
 
 # No need to build the images, docker build or docker compose will
 # do that using the images and containers defined in the docker-compose.yml file.
+#
+#

docker-compose.dcproj

@@ -5,7 +5,7 @@
     <DockerLaunchBrowser>True</DockerLaunchBrowser>
     <DockerServiceUrl>http://localhost:5100</DockerServiceUrl>
     <DockerServiceName>webmvc</DockerServiceName>
-    <DockerTargetOS>Windows</DockerTargetOS>
+    <DockerTargetOS>Linux</DockerTargetOS>
     <ProjectVersion>2.0</ProjectVersion>
   </PropertyGroup>
   <ItemGroup>