Skip to content

Commit c23bb39

Browse files
Minor changes in README.md and Xamarin startup config
1 parent 9b68ab5 commit c23bb39

7 files changed

Lines changed: 5 additions & 137 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ MAC DEV MACHINE
4949
### Installing and configuring Docker in your development machine
5050

5151
#### Set needed assigned Memory and CPU to Docker
52-
In this application (January 2017 version) we run 1 instance of SQL Server running as a container plus 6 ASP.NET Core apps/services and 1 Redis server all of them running as Docker containers. So, especially because of SQL Server requirements on memory, it is important to set Docker up properly with enough memory RAM and CPU assigned to it or you will get difficult errors when starting the containers with "docker-compose up".
53-
Once Docker for Windows/Mac is installed in your machine, enter into its Settings and the Advanced menu option so you are able to adjust it to the new values (Memory: Around 6GB and CPU:4) as shown in the image. Usually you might need a 16GB or 12GB memory machine for this configuration. If you have a less powerful machine, you can try with a lower configuration and/or by not starting certain containers like the basket and Redis. But if you don't start all the containers, the application will not fully function properly, of course.
52+
In this application (January 2017 version) we run 1 instance of SQL Server running as a container with multiple databases (one DB per microservice), plus 6 ASP.NET Core apps/services and 1 Redis server, all of them running as Docker containers. So, especially because of SQL Server requirements on memory, it is important to set Docker up properly with enough memory RAM and CPU assigned to it or you will get difficult errors when starting the containers with "docker-compose up".
53+
Once Docker for Windows/Mac is installed in your machine, enter into its Settings and the Advanced menu option so you are able to adjust it to the minimum amount of memory and CPU (Memory: Around 4096MB and CPU:3) as shown in the image. Usually you might need a 16GB memory machine for this configuration if you also want to run the Android emulator for the Xamarin app at the same time. If you have a less powerful machine, you can try with a lower configuration and/or by not starting certain containers like the basket and Redis. But if you don't start all the containers, the application will not fully function properly, of course.
5454

5555
<img src="img/docker_settings.png">
5656

README.md.saved.bak

Lines changed: 0 additions & 132 deletions
This file was deleted.

img/docker_settings.png

1.35 KB
Loading
45.4 KB
Loading

src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public App()
2525

2626
private void InitApp()
2727
{
28-
UseMockServices = true;
28+
UseMockServices = false;
2929

3030
ViewModelLocator.Instance.UpdateDependencies(UseMockServices);
3131
}

src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class GlobalSetting
88
public GlobalSetting()
99
{
1010
AuthToken = "INSERT AUTHENTICATION TOKEN";
11-
BaseEndpoint = "http://13.88.8.119";
11+
BaseEndpoint = "http://10.106.144.28";
1212
}
1313

1414
public static GlobalSetting Instance

src/Web/WebSPA/eShopOnContainers.WebSPA/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66

77
### Install NPM
8-
The SPA application is using a newer version of NPM than the one provided by Visual Studio 2015 (npm 2.7.4 currently), so you need to install the latest stable version of NPM,like npm .
8+
The SPA application is using a newer version of NPM than the one provided by Visual Studio 2015 (npm 2.7.4 currently), so you need to install the latest stable version of NPM.
99

1010
NPM is bundled with NODE.JS. Installing NPM and NODE is pretty straightforward by using the installer package available at https://nodejs.org/en/
1111

0 commit comments

Comments
 (0)