diff --git a/Deploy-to-Local-Kubernetes.md b/Deploy-to-Local-Kubernetes.md index f852189..e0be249 100644 --- a/Deploy-to-Local-Kubernetes.md +++ b/Deploy-to-Local-Kubernetes.md @@ -67,7 +67,7 @@ If you also enable the "Show system containers" checkbox, you can see Kubernetes Your Docker Desktop Kubernetes installation already contains [kubectl](https://kubernetes.io/docs/reference/kubectl/overview/), which is the CLI to run Kubernetes commands and you'll need for the rest of steps here. -**IMPORTANT:** You'll also have to increase the memory allocated to Docker to at least **6144 MB**, because you'll have 70+ containers running after deploying eShopOnContainers. +**IMPORTANT:** You'll also have to increase the memory allocated to Docker to at least **6.25 GB**, because you'll have 70+ containers running after deploying eShopOnContainers. ## Install Helm diff --git a/System-requirements.md b/System-requirements.md index 7be1764..3986bed 100644 --- a/System-requirements.md +++ b/System-requirements.md @@ -14,8 +14,8 @@ To run Hyper-V you also need: ### Software requirements for Windows -- Docker Community Edition (aka. Docker for Windows) - Requires Windows 10 Pro 64 bits and Hyper-V enabled. -- Latest **.NET Core 2.2 SDK** from: https://www.microsoft.com/net/download +- Docker Desktop Community Edition (aka. Docker for Windows) - Requires Windows 10 Pro 64 bits and Hyper-V enabled. +- Latest **.NET Core 3.1 SDK** from: https://www.microsoft.com/net/download - (Optional) Visual Studio 2017 **15.8** or later (Visual Studio 2019 recommended) – Much better for debugging multi-containers apps - (Optional) Visual Studio Code. @@ -36,8 +36,8 @@ If your system is OK with the Docker requirements above, you'll be fine for VS t ### Software requirements for Mac -- Docker Community Edition (a.k.a. Docker for Mac) - Requires OS X El Capitan 10.11 or newer macOS. -- Latest **.NET Core 2.2 SDK** from: https://www.microsoft.com/net/download +- Docker Desktop Community Edition (a.k.a. Docker for Mac) - Requires OS X El Capitan 10.11 or newer macOS. +- Latest **.NET Core 3.1 SDK** from: https://www.microsoft.com/net/download - (Optional) Visual Studio for Mac. - (Optional) Visual Studio Code. diff --git a/Windows-setup.md b/Windows-setup.md index 26956c5..039d398 100644 --- a/Windows-setup.md +++ b/Windows-setup.md @@ -44,13 +44,12 @@ So it's important to configure enough memory RAM and CPU to Docker. Once Docker for Windows is installed, go to the **Settings > Advanced** option, from the Docker icon in the system tray, to configure the minimum amount of memory and CPU like so: -- Memory: 6144 MB +- Memory: 6.25 GB - CPU: 2 This amount of memory is the recommended minimum to run the app, and that's why you need a 16GB RAM machine for optimal configuration. -![] -![](images/Docker-setup/eshoponcontainers-docker-configuration-memory-cpu.png) +![](images/Docker-setup/eshoponcontainers-docker-configuration-memory-cpu-latest.png) ### Shared drives @@ -58,13 +57,13 @@ This step is optional but recommended, as Docker sometimes needs to access the s This is not really necessary when building from the CLI, but it's mandatory when building from Visual Studio to access the code to build. -The drive you'll need to share depends on where you place your source code. +The drive you'll need to share depends on where you place your source code. For e.g : -![](images/Docker-setup/eshoponcontainers-docker-configuration-shared-drives.png) +![](images/Docker-setup/eshoponcontainers-docker-configuration-shared-drives-latest.png) ## Configure local networking -IMPORTANT: Ports 5100 to 5105 must be open in the local Firewall, so authentication to the STS (Security Token Service container, based on IdentityServer) can be done through the 10.0.75.1 IP, which should be available and already setup by Docker. These ports are also needed for client remote apps like Xamarin app or SPA app in a remote browser. +IMPORTANT: Ports **5100** to **5105** must be open in the local Firewall, so authentication to the STS (Security Token Service container, based on IdentityServer) can be done through the 10.0.75.1 IP, which should be available and already setup by Docker. These ports are also needed for client remote apps like Xamarin app or SPA app in a remote browser. You can manually create a rule in your local firewall in your development machine or you can just run the **add-firewall-rules-for-sts-auth-thru-docker.ps1** script available in the solution's **`deploy\windows\`** folder. diff --git a/images/Docker-setup/eshoponcontainers-docker-configuration-memory-cpu-latest.png b/images/Docker-setup/eshoponcontainers-docker-configuration-memory-cpu-latest.png new file mode 100644 index 0000000..b7c1e39 Binary files /dev/null and b/images/Docker-setup/eshoponcontainers-docker-configuration-memory-cpu-latest.png differ diff --git a/images/Docker-setup/eshoponcontainers-docker-configuration-shared-drives-latest.png b/images/Docker-setup/eshoponcontainers-docker-configuration-shared-drives-latest.png new file mode 100644 index 0000000..ba42302 Binary files /dev/null and b/images/Docker-setup/eshoponcontainers-docker-configuration-shared-drives-latest.png differ