Merge branch 'master' of https://github.com/dotnet/eShopOnContainers.wiki
						commit
						fdc08eb650
					
				@ -1,5 +1,10 @@
 | 
				
			|||||||
## Setting eShopOnContainers up in a Visual Studio 2017 development machine
 | 
					## Setting eShopOnContainers up in a Visual Studio 2017 development machine
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### GitHub branch to use
 | 
				
			||||||
 | 
					As of February 20th, the branch to use with VS 2017 (.CSPROJ support) is the branch: vs2017 :
 | 
				
			||||||
 | 
					https://github.com/dotnet/eShopOnContainers/tree/vs2017  
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Software requirements
 | 
				
			||||||
Software installation requirements for a Windows dev machine with Visual Studio 2017 and Docker for Windows:
 | 
					Software installation requirements for a Windows dev machine with Visual Studio 2017 and Docker for Windows:
 | 
				
			||||||
- <a href='https://docs.docker.com/docker-for-windows/install/'>Docker for Windows</a> with the concrete configuration specified below.
 | 
					- <a href='https://docs.docker.com/docker-for-windows/install/'>Docker for Windows</a> with the concrete configuration specified below.
 | 
				
			||||||
- <a href='https://www.visualstudio.com/vs/'>Visual Studio 2017</a> (Latest version) with the workloads specified below.
 | 
					- <a href='https://www.visualstudio.com/vs/'>Visual Studio 2017</a> (Latest version) with the workloads specified below.
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,11 @@
 | 
				
			|||||||
## Setting eShopOnContainers up in a CLI and Windows based development machine
 | 
					## Setting eShopOnContainers up in a CLI and Windows based development machine
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### GitHub branch to use
 | 
				
			||||||
 | 
					As of February 20th, the branch to use with .NET Core CLI and Docker CLI with .CSPROJ projects support is the branch: vs2017 :
 | 
				
			||||||
 | 
					https://github.com/dotnet/eShopOnContainers/tree/vs2017  
 | 
				
			||||||
 | 
					(It is the same code than used with VS 2017)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Software requirements
 | 
				
			||||||
Software installation requirements for a Windows dev machine with CLI SDKs, Docker for Windows and Visual Studio Code or any other editor.
 | 
					Software installation requirements for a Windows dev machine with CLI SDKs, Docker for Windows and Visual Studio Code or any other editor.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
WINDOWS DEV MACHINE
 | 
					WINDOWS DEV MACHINE
 | 
				
			||||||
@ -109,7 +115,7 @@ These steps are easily performed by running a convenient script already created
 | 
				
			|||||||
    <img src="img/cli-windows/build-bits-3-catalog-bits.png">
 | 
					    <img src="img/cli-windows/build-bits-3-catalog-bits.png">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### Buil Images and Deploy containers into your Docker host
 | 
					### Build Images and Deploy containers into your Docker host
 | 
				
			||||||
You can build the Docker images and deploy the containers to a regularDocker host by using the Docker CLI tool `docker-compose up` which is very convenient for multi-container applications as it can build all the Docker images for you and then spin-up all the multiple containers of your application, all with a single command.
 | 
					You can build the Docker images and deploy the containers to a regularDocker host by using the Docker CLI tool `docker-compose up` which is very convenient for multi-container applications as it can build all the Docker images for you and then spin-up all the multiple containers of your application, all with a single command.
 | 
				
			||||||
If you don't want to deploy the containers but only build the images, you can do so by running `docker-compose build`
 | 
					If you don't want to deploy the containers but only build the images, you can do so by running `docker-compose build`
 | 
				
			||||||
These are the steps:
 | 
					These are the steps:
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user