Merge remote-tracking branch 'eShopOnContainers/dev' into dev

# Conflicts:
#	k8s/deploy.ps1

Author: eiximenis

README.CICD.k8s.md

@@ -0,0 +1,48 @@
+# Kubernetes CI/CD VSTS
+For k8s CI/CD pipeline delivery a series of tasks must be created in VSTS to deploy k8s in Azure
+
+## Prerequisites
+* A Kubernetes cluster. Follow Azure Container Service's [walkthrough](https://docs.microsoft.com/en-us/azure/container-service/container-service-kubernetes-walkthrough) to create one. 
+* A private Docker registry. Follow Azure Container Registry's [guide](https://docs.microsoft.com/en-us/azure/container-registry/container-registry-get-started-portal) to create one.
+* Optionally, previous steps can be skipped if you run gen-k8s-env.ps1 script to automatically create the azure environment needed for kubernetes deployment. Azure cli 2.0 must be previously installed [installation guide](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli). For example:
+>```
+>./gen-k8s-env -resourceGroupName k8sGroup -location westeurope -registryName k8sregistry -orchestratorName k8s-cluster -dnsName k8s-dns
+>```
+* An `Azure Blob storage`. It is needed for storing the kubernetes config file used by the hosted agent to access to Kubernetes cluster. Example:
+
+<img src="img/k8s/blob_creation.png">
+
+* Upload the `kubernetes config file` to the blob storage previously created. Execute the following command which will download the config file into the directory `c:\Users\<User>\.kube\` and then, upload it to your blob storage: 
+>```
+>https://eshopk8s.blob.core.windows.net/k8s-config/config
+>```
+## Create the VSTS tasks
+1. Create a `Download File` task to download the kubernetes binary `kubectl` to the hosted agent. For example:
+>```
+>https://storage.googleapis.com/kubernetes-release/release/v0.0.1.7.0-alpha.0/bin/windows/386/kubectl.exe
+>```
+<img src="img/k8s/get_kubectlbin_task.png">
+
+2. Create a Download File task to download the kubernetes config file to the hosted agent. For example:
+>```
+>https://eshopk8s.blob.core.windows.net/k8s-config/config
+>```
+<img src="img/k8s/get_kubectlconfig_task.png">
+
+3. Create a powershell task to execute the k8s deployment script. For example:
+
+* Deployment script path
+>```
+>$(System.DefaultWorkingDirectory)/All Microservices/docker-compose/deploy.ps1
+>```
+
+* Deployment script path arguments. Where:
+     - userDockerHub: indicates if Docker Hub is used instead of ACR
+     - deployCI: indicates that it is a CI/CD deployment
+     - execPath: path where the k8s binary is stored
+     - kubeconfigPath: path where the k8s config file is stored
+>```
+>-deployCI $true -useDockerHub $true -execPath '$(System.DefaultWorkingDirectory)/' -kubeconfigPath '$(System.DefaultWorkingDirectory)/'
+>```
+
+<img src="img/k8s/deploy_script_task.png">

_docker/rabbitmq/Dockerfile.nanowin

@@ -10,6 +10,12 @@ projectList=(
     "../src/Web/WebStatus"
 )
 
+
+pushd $(pwd)/../src/Web/WebSPA
+npm install
+npm rebuild node-sass
+popd 
+
 for project in "${projectList[@]}"
 do
     echo -e "\e[33mWorking on $(pwd)/$project"

_docker/rabbitmq/enabled_plugins

@@ -11,65 +11,69 @@ services:
   basket.api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:5103
+      - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=basket.data
-      - identityUrl=http://identity.api:5105              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
+      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
       - EventBusConnection=rabbitmq
     ports:
-      - "5103:5103"
+      - "5103:80"
 
   catalog.api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:5101
+      - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
       - ExternalCatalogBaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101    #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105.	  
       - EventBusConnection=rabbitmq
     ports:
-      - "5101:5101"
+      - "5101:80"
 
   identity.api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:5105
+      - ASPNETCORE_URLS=http://0.0.0.0:80
       - SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104
       - ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word 
       - MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100              #Local: You need to open your local dev-machine firewall at range 5100-5105.  
     ports:
-      - "5105:5105"
+      - "5105:80"
 
   ordering.api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:5102
+      - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
-      - identityUrl=http://identity.api:5105              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
+      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
       - EventBusConnection=rabbitmq
     ports:
-      - "5102:5102"
+      - "5102:80"
 
   webspa:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:5104
+      - ASPNETCORE_URLS=http://0.0.0.0:80
       - CatalogUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101
       - OrderingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
       - IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
       - BasketUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103                
+      - CatalogUrlHC=http://catalog.api/hc
+      - OrderingUrlHC=http://ordering.api/hc
+      - IdentityUrlHC=http://identity.api/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
+      - BasketUrlHC=http://basket.api/hc      
     ports:
-      - "5104:5104"
+      - "5104:80"
 
   webmvc:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:5100
-      - CatalogUrl=http://catalog.api:5101
-      - OrderingUrl=http://ordering.api:5102
-      - BasketUrl=http://basket.api:5103
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - CatalogUrl=http://catalog.api
+      - OrderingUrl=http://ordering.api
+      - BasketUrl=http://basket.api
       - IdentityUrl=http://10.0.75.1:5105        #Local:  Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. 
                                                  #Remote: Use ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser. 
     ports:
-      - "5100:5100"
+      - "5100:80"
 
   sql.data:
     environment:

_docker/rabbitmq/rabbitmq.config

@@ -16,61 +16,65 @@ services:
   basket.api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
-      - ASPNETCORE_URLS=http://0.0.0.0:5103
+      - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=basket.data
-      - identityUrl=http://identity.api:5105              #Local: You need to open your host's firewall at range 5100-5105.  at range 5100-5105. 
+      - identityUrl=http://identity.api              #Local: You need to open your host's firewall at range 5100-5105.  at range 5100-5105. 
     ports:
       - "5103:5103"
 
   catalog.api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
-      - ASPNETCORE_URLS=http://0.0.0.0:5101
+      - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
       - ExternalCatalogBaseUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101    #Local: You need to open your host's firewall at range 5100-5105.  at range 5100-5105.
     ports:
-      - "5101:5101"
+      - "5101:80"
 
   identity.api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
-      - ASPNETCORE_URLS=http://0.0.0.0:5105
+      - ASPNETCORE_URLS=http://0.0.0.0:80
       - SpaClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5104
       - ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word 
       - MvcClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5100              #Local: You need to open your host's firewall at range 5100-5105.  
     ports:
-      - "5105:5105"
+      - "5105:80"
 
   ordering.api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
-      - ASPNETCORE_URLS=http://0.0.0.0:5102
+      - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
       - identityUrl=http://identity.api:5105              #Local: You need to open your host's firewall at range 5100-5105.  at range 5100-5105. 
     ports:
-      - "5102:5102"
+      - "5102:80"
 
   webspa:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
-      - ASPNETCORE_URLS=http://0.0.0.0:5104
+      - ASPNETCORE_URLS=http://0.0.0.0
       - CatalogUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101
       - OrderingUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5102
       - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105              #Local: You need to open your host's firewall at range 5100-5105.  at range 5100-5105. 
       - BasketUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5103                
+      - CatalogUrlHC=http://catalog.api/hc
+      - OrderingUrlHC=http://ordering.api/hc
+      - IdentityUrlHC=http://identity.api/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
+      - BasketUrlHC=http://basket.api/hc            
     ports:
-      - "5104:5104"
+      - "5104:80"
 
   webmvc:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
-      - ASPNETCORE_URLS=http://0.0.0.0:5100
-      - CatalogUrl=http://catalog.api:5101
-      - OrderingUrl=http://ordering.api:5102
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - CatalogUrl=http://catalog.api
+      - OrderingUrl=http://ordering.api
       - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
-      - BasketUrl=http://basket.api:5103
+      - BasketUrl=http://basket.api
     ports:
-      - "5100:5100"
+      - "5100:80"
 
   sql.data:
     environment:

_docker/redis/Dockerfile.nanowin

@@ -58,15 +58,15 @@ services:
     image: microsoft/mssql-server-windows
 
   basket.data:
-    image: eshop/redis-win
+    image: redis:nanoserver
 #    build:
 #      context: ./_docker/redis
 #      dockerfile: Dockerfile.nanowin
     ports:
         - "6379:6379"
 
   rabbitmq:
-    image: eshop/rabbitmq-win
+    image: spring2/rabbitmq
 #    build:
 #      context: ./_docker/rabbitmq
 #      dockerfile: Dockerfile.nanowin  

cli-mac/build-bits.sh

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