diff --git a/04.-Setting-eShopOnContainer-solution-up-in-a-Mac,-VS-for-Mac-or-with-CLI-environment--(dotnet-CLI,-Docker-CLI-and-VS-Code).md b/04.-Setting-eShopOnContainer-solution-up-in-a-Mac,-VS-for-Mac-or-with-CLI-environment--(dotnet-CLI,-Docker-CLI-and-VS-Code).md index e8f0fe7..59bfce3 100644 --- a/04.-Setting-eShopOnContainer-solution-up-in-a-Mac,-VS-for-Mac-or-with-CLI-environment--(dotnet-CLI,-Docker-CLI-and-VS-Code).md +++ b/04.-Setting-eShopOnContainer-solution-up-in-a-Mac,-VS-for-Mac-or-with-CLI-environment--(dotnet-CLI,-Docker-CLI-and-VS-Code).md @@ -1,14 +1,6 @@ -# Option A: Use Visual Studio for Mac -The quickest path to get eShopOnContainers running on your Mac is by using VS for Mac which will install most of the pre-requisites you need. +# Global prerequisite: Docker for Mac - - -# Option B: Use a CLI environment (dotnet CLI, Docker CLI with the bash shell) and VS Code as plain editor - -## Prerequisites - -1. [Docker for Mac](https://docs.docker.com/docker-for-mac/install/). The stable channel is fine. -1. [Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/). +Install [Docker for Mac](https://docs.docker.com/docker-for-mac/install/). The stable channel is fine. ## Configure Docker for Mac @@ -22,19 +14,36 @@ Depending on how many apps you are running in your Mac you might need to assign ### Folder shares in Docker for Mac If your projects are placed within the /Users folder, you don't need to configure anything additional, as that is a pre-shared folder. However, if you place your projects under a different path, like /MyRootProjects, then you'd need to add that shared folder to Docker's configuration, here: +![image](https://user-images.githubusercontent.com/1712635/32018085-9b8f66ee-b97d-11e7-8dd2-3e20e1bcee56.png) + + +# Option A: Use Visual Studio for Mac +The quickest path to get eShopOnContainers running on your Mac is by using VS for Mac which will install most of the pre-requisites you need. ## Prerequisites +1. [Docker for Mac](https://docs.docker.com/docker-for-mac/install/). (You should already have this installed) +1. [Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/). + +## Install Visual Studio for Mac +When installing it, you can select between multiple workloads or platforms. +Make sure you select the .NET Core platform: +![image](https://user-images.githubusercontent.com/1712635/32018392-951e1bce-b97e-11e7-946c-94ae9269c5f8.png) + +Before completing the VS for Mac installation, it will demand you to install XCode, that is needed for multiple dependencies. +If you install Android as a target platform, Java will also be installed as a dependency for building mobile apps for Android. +For running just the Docker containers and web apps, you'd just need the .NET Core platform. +but if you want to try the eShopOnContainers mobile app, that requires Xamarin and therefore, the iOS and Android platforms, too. But those are optional for this Wiki walkthrough. + +# Option B: Use a CLI environment (dotnet CLI, Docker CLI with the bash shell) and VS Code as plain editor + +## Prerequisites + +1. [Docker for Mac](https://docs.docker.com/docker-for-mac/install/). You should already have this. 1. A Git client. The [git-scm site](https://git-scm.com/download/gui/mac) maintains a great list of clients. -1. [Docker for Mac](https://docs.docker.com/docker-for-mac/install/). The stable channel is fine. 1. [Node.js](http://nodejs.org). The stable channel is fine as well. 1. [.NET Core and SDK](http://dot.net). Install the SDK and runtime. - -The SQL Server image for Docker requires more memory to run. You will need to update your Docker settings to allocate at least 4 GB of memory: - -[[img/docker-config-mac.png]] - -Depending on how many apps you are running in your Mac you might need to assign more memory to Docker in the Mac. Usually, 4GB should suffice, but we got feedback from devs who needed to assign up to 8GB of ram to Docker in the Mac. +1. Bower and other dependencies needed by the MVC and SPA web apps ## Building the application