From 8c8e4cfe960a4d3f6e61e53afcb5e3375a6fc4c3 Mon Sep 17 00:00:00 2001 From: Nathan Surfus Date: Sat, 23 Sep 2017 13:58:19 -0500 Subject: [PATCH 1/3] Fixed miroservices spelling mistake --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e88368522..c0218730f 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ The microservices are different in type, meaning different internal architecture

-Additional miroservice styles with other frameworks and No-SQL databases will be added, eventually. This is a great opportunity for pull requests from the community, like a new microservice using Nancy, or even other languages like Node, Go, Python or data containers with MongoDB with Azure DocDB compatibility, PostgreSQL, RavenDB, Event Store, MySql, etc. You name it! :) +Additional microservice styles with other frameworks and No-SQL databases will be added, eventually. This is a great opportunity for pull requests from the community, like a new microservice using Nancy, or even other languages like Node, Go, Python or data containers with MongoDB with Azure DocDB compatibility, PostgreSQL, RavenDB, Event Store, MySql, etc. You name it! :) > ### Important Note on Database Servers/Containers > In this solution's current configuration for a development environment, the SQL databases are automatically deployed with sample data into a single SQL Server for Linux container (a single shared Docker container for SQL databases) so the whole solution can be up and running without any dependency to any cloud or specific server. Each database could also be deployed as a single Docker container, but then you'd need more then 8GB or memory RAM assigned to Docker in your development machine in order to be able to run 3 SQL Server Docker containers in your Docker Linux host in "Docker for Windows" or "Docker for Mac" development environments. From aca7779fd91b613b284028a4960d18fa942e817e Mon Sep 17 00:00:00 2001 From: jzeferino Date: Mon, 25 Sep 2017 21:59:59 +0100 Subject: [PATCH 2/3] Fixed header typo. --- src/Mobile/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mobile/README.md b/src/Mobile/README.md index 632593518..4a12698b1 100644 --- a/src/Mobile/README.md +++ b/src/Mobile/README.md @@ -10,7 +10,7 @@ eShopOnContainers is a reference app whose imagined purpose is to serve the mobi 1. A Xamarin.Forms mobile app for iOS, Android and Windows. 2. Several .NET Web API microservices deployed as Docker containers. -##Xamarin.Forms App (eShopOnContainers) +### Xamarin.Forms App (eShopOnContainers) This project exercises the following platforms, frameworks or features: From 9bbf29fc04890709e8d57f66b8e608e18e964ded Mon Sep 17 00:00:00 2001 From: Igor Sychev Date: Mon, 18 Sep 2017 09:26:04 +0300 Subject: [PATCH 3/3] Explicitly specifying parameters for az acs creat Non-preview parameters specified --- k8s/gen-k8s-env.ps1 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/k8s/gen-k8s-env.ps1 b/k8s/gen-k8s-env.ps1 index 5276262f5..fffe1546f 100644 --- a/k8s/gen-k8s-env.ps1 +++ b/k8s/gen-k8s-env.ps1 @@ -4,7 +4,10 @@ [parameter(Mandatory=$false)][string]$registryName, [parameter(Mandatory=$true)][string]$orchestratorName, [parameter(Mandatory=$true)][string]$dnsName, - [parameter(Mandatory=$true)][string]$createAcr=$true + [parameter(Mandatory=$true)][string]$createAcr=$true, + [parameter(Mandatory=$false)][int]$agentCount=2, + [parameter(Mandatory=$false)][string]$agentVMSize="Standard_D2_v2", + [parameter(Mandatory=$false)][int]$masterCount=1 ) # Create resource group @@ -19,7 +22,7 @@ if ($createAcr -eq $true) { # Create kubernetes orchestrator Write-Host "Creating kubernetes orchestrator..." -ForegroundColor Yellow -az acs create --orchestrator-type=kubernetes --resource-group $resourceGroupName --name=$orchestratorName --dns-prefix=$dnsName --generate-ssh-keys +az acs create --orchestrator-type=kubernetes --resource-group $resourceGroupName --name=$orchestratorName --dns-prefix=$dnsName --generate-ssh-keys --agent-count=$agentCount --agent-vm-size=$agentVMSize --master-count=$masterCount # Retrieve kubernetes cluster configuration and save it under ~/.kube/config az acs kubernetes get-credentials --resource-group=$resourceGroupName --name=$orchestratorName