Unai Zorrilla Castro
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c5bdda2f5
							
						
					 | 
					
						
						
							
							Improve build-bits-linux.sh (removed dotnet restore (doing with publish now)  and set quiet on verbosity in order to reduce issues with System.Console.dll on build container). Remove unnecesary namespace on Identity.Api startup.cs
						
						
						
						
						
						
					 | 
					
						2017-09-06 18:43:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomàs
							
						 
					 | 
					
						
						
						
						
							
						
						
							34a8ad3171
							
						
					 | 
					
						
						
							
							Merge branch 'netcore2' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	cli-linux/build-bits-linux.sh
#	docker-compose.ci.build.yml
#	src/Services/Location/Locations.API/Dockerfile.nanowin
#	src/Services/Marketing/Marketing.API/Dockerfile.nanowin
#	src/Services/Payment/Payment.API/Dockerfile.nanowin
#	src/Web/WebStatus/Dockerfile.nanowin 
						
						
					 | 
					
						2017-09-05 16:12:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							9eaa81cbdb
							
						
					 | 
					
						
						
							
							Saved with Linux EOL
						
						
						
						
						
						
					 | 
					
						2017-08-24 19:41:30 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d42dfeb39
							
						
					 | 
					
						
						
							
							Workaround (dotnet CLI set with verbosity minimal) so we don't get stdout errors when compiling from the Docker Linux "build containers" when doing the CLI build.
						
						
						
						
						
						
						
						Related bug: https://github.com/Microsoft/msbuild/issues/2153#issuecomment-305375162 
						
						
					 | 
					
						2017-08-24 19:33:15 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							0369d8a958
							
						
					 | 
					
						
						
							
							Workaround (dotnet CLI set with verbosity minimal) so we don't get stdout errors when compiling from the Docker Linux "build containers" when doing the CLI build.
						
						
						
						
						
						
						
						Related bug: https://github.com/Microsoft/msbuild/issues/2153#issuecomment-305375162 
						
						
					 | 
					
						2017-08-24 19:33:08 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							6ee4edcebb
							
						
					 | 
					
						
						
							
							Fixing Linux Script files to have UNIX line ending instead of WINDOWS. Somehow it was reverted.
						
						
						
						
						
						
					 | 
					
						2017-08-06 12:32:44 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							7258a58f5b
							
						
					 | 
					
						
						
							
							All docker compose to version 2.1 that seems to work in vsts hosted linux build agent
						
						
						
						
						
						
					 | 
					
						2017-07-04 14:52:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3e63c11aa
							
						
					 | 
					
						
						
							
							Merge from eShopOnContainers Dev
						
						
						
						
						
						
					 | 
					
						2017-06-26 13:51:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd42c17cd1
							
						
					 | 
					
						
						
							
							Buildfiles to mitigate msbuild issue - https://github.com/Microsoft/msbuild/issues/2153
						
						
						
						
						
						
					 | 
					
						2017-06-21 12:38:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							2af88e74c8
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'eShopOnContainers/dev' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	README.md
#	docs/Enterprise-Application-Patterns-using-XamarinForms.pdf
#	docs/architecting-and-developing-containerized-and-microservice-based-net-applications-ebook-early-draft.pdf 
						
						
					 | 
					
						2017-05-05 10:05:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9f7b3de15
							
						
					 | 
					
						
						
							
							fix error on docker-compose invoke
						
						
						
						
						
						
					 | 
					
						2017-04-25 13:35:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							ea248b5563
							
						
					 | 
					
						
						
							
							Run containers in detached mode
						
						
						
						
						
						
					 | 
					
						2017-04-25 12:51:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							1cc9e82259
							
						
					 | 
					
						
						
							
							Run script for release managment
						
						
						
						
						
						
					 | 
					
						2017-04-25 12:28:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andre Passos
							
						 
					 | 
					
						
						
						
						
							
						
						
							db1fa9fd5c
							
						
					 | 
					
						
						
							
							update to angular-cli and angular 4
						
						
						
						
						
						
					 | 
					
						2017-04-13 13:06:22 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							e05cbfa809
							
						
					 | 
					
						
						
							
							Added WebStatus to cli build scripts.
						
						
						
						
						
						
						
						Removed old script build for windows. 
						
						
					 | 
					
						2017-04-07 10:49:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2999a46fb
							
						
					 | 
					
						
						
							
							Added docker-compose.prod.yml for testing with Xamarin app in remote devices, like in a WiFi, of for running the Web Apps from remote Browsers.
						
						
						
						
						
						
						
						Start the solution with:
docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
Also, some clean-up. 
						
						
					 | 
					
						2017-03-09 21:49:45 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							e8c5eb1eb5
							
						
					 | 
					
						
						
							
							Fix bug/issue in SPA when building from build-container and it is not compatible in Linux with previous SPS content, so needs to run npm rebuild node-sass first
						
						
						
						
						
						
					 | 
					
						2017-03-06 15:32:15 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							f9e670425a
							
						
					 | 
					
						
						
							
							Cleaning up the docker-compose.override.yml by getting rid of commented URLs for a production enviroment
						
						
						
						
						
						
					 | 
					
						2017-03-03 17:33:12 -08:00 | 
					
					
						
						
							
							
							
						
					 |