Merge branch 'master' into xamarin

Author: David Britch

.gitignore

@@ -6,6 +6,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+.vscode/
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

README.md

@@ -1,5 +1,6 @@
 # eShopOnContainers - Microservices Architecture and Containers based Reference Application (**BETA state** - Visual Studio 2017 and CLI environments compatible)
 Sample .NET Core reference application, powered by Microsoft, based on a simplified microservices architecture and Docker containers. <p>
+**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.
 
 > ### DISCLAIMER
 > **IMPORTANT:** The current state of this sample application is **BETA**, consider it version a 0.1 foundational version, therefore, many areas could be improved and change significantly while refactoring current code and implementing new features. **Feedback with improvements and pull requests from the community will be highly appreciated and accepted.** 

cli-linux/build-bits-linux.sh

@@ -1,18 +1,17 @@
-
-projectList=(
-    "/src/Services/Catalog/Catalog.API"
-    "/src/Services/Basket/Basket.API"
-    "/src/Services/Ordering/Ordering.API"
-    "/src/Services/Identity/Identity.API"
-    "/src/Web/WebMVC"
-    "/src/Web/WebSPA"
-    "/src/Web/WebStatus
+#!/bin/bash
+declare -a projectList=(
+    '../src/Services/Catalog/Catalog.API'
+    '../src/Services/Basket/Basket.API'
+    '../src/Services/Ordering/Ordering.API'
+    '../src/Services/Identity/Identity.API'
+    '../src/Web/WebMVC'
+    '../src/Web/WebSPA'
+    '../src/Web/WebStatus'
 )
 
 # Build SPA app
-pushd $(pwd)/src/Web/WebSPA
-npm rebuild node-sass
-npm run build:prod
+# pushd $(pwd)../src/Web/WebSPA
+# npm run build:prod
 
 for project in "${projectList[@]}"
 do
@@ -28,13 +27,13 @@ do
 done
 
 # remove old docker images:
-#images=$(docker images --filter=reference="eshop/*" -q)
-#if [ -n "$images" ]; then
-#    docker rm $(docker ps -a -q) -f
-#    echo "Deleting eShop images in local Docker repo"
-#    echo $images
-#    docker rmi $(docker images --filter=reference="eshop/*" -q) -f
-#fi
+images=$(docker images --filter=reference="eshop/*" -q)
+if [ -n "$images" ]; then
+    docker rm $(docker ps -a -q) -f
+    echo "Deleting eShop images in local Docker repo"
+    echo $images
+    docker rmi $(docker images --filter=reference="eshop/*" -q) -f
+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-windows.yml

@@ -2,7 +2,7 @@ version: '2.1'
 
 services:
   basket.api:
-    image: eshop/basket.api
+    image: eshop/basket.api-win
     build:
       context: ./src/Services/Basket/Basket.API
       dockerfile: Dockerfile.nanowin
@@ -11,31 +11,31 @@ services:
       - identity.api
 
   catalog.api:
-    image: eshop/catalog.api
+    image: eshop/catalog.api-win
     build:
       context: ./src/Services/Catalog/Catalog.API
       dockerfile: Dockerfile.nanowin
     depends_on:
       - sql.data
 
   identity.api:
-    image: eshop/identity.api
+    image: eshop/identity.api-win
     build:
       context: ./src/Services/Identity/Identity.API
       dockerfile: Dockerfile.nanowin
     depends_on:
       - sql.data
 
   ordering.api:
-    image: eshop/ordering.api
+    image: eshop/ordering.api-win
     build:
       context: ./src/Services/Ordering/Ordering.API
       dockerfile: Dockerfile.nanowin
     depends_on:
       - sql.data
 
   webspa:
-    image: eshop/webspa
+    image: eshop/webspa-win
     build:
       context: ./src/Web/WebSPA
       dockerfile: Dockerfile.nanowin
@@ -44,7 +44,7 @@ services:
       - basket.api
 
   webmvc:
-    image: eshop/webmvc
+    image: eshop/webmvc-win
     build:
       context: ./src/Web/WebMVC
       dockerfile: Dockerfile.nanowin
@@ -58,18 +58,18 @@ services:
     image: microsoft/mssql-server-windows
 
   basket.data:
-    image: redis
-    build:
-      context: ./_docker/redis
-      dockerfile: Dockerfile.nanowin
+    image: eshop/redis-win
+#    build:
+#      context: ./_docker/redis
+#      dockerfile: Dockerfile.nanowin
     ports:
         - "6379:6379"
 
   rabbitmq:
-    image: rabbitmq
-    build:
-      context: ./_docker/rabbitmq
-      dockerfile: Dockerfile.nanowin  
+    image: eshop/rabbitmq-win
+#    build:
+#      context: ./_docker/rabbitmq
+#      dockerfile: Dockerfile.nanowin  
     ports:
         - "5672:5672"
 

docker-compose.ci.build.yml

@@ -6,5 +6,5 @@ services:
     volumes:
       - .:/src
     working_dir: /src
-    command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && pushd ./../../.. && dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish"
+    command: /bin/bash -c "dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish"