diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index ce30d10be4..1326e3a7de 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,14 +1,22 @@ version: '2' services: + + mongodb: + image: tutum/mongodb + environment: + - AUTH=no + abpidentity_httpapihost: image: abpidentity/httpapihost environment: - ASPNETCORE_ENVIRONMENT=Staging + abpdesk_web: image: abpdesk/web environment: - ASPNETCORE_ENVIRONMENT=Staging + load_balancer: image: haproxy:1.7.1 volumes: diff --git a/docker/up.ps1 b/docker/up.ps1 index 267d114cc0..49ee1ee616 100644 --- a/docker/up.ps1 +++ b/docker/up.ps1 @@ -1,4 +1,5 @@ docker rm $(docker ps -aq) +docker-compose up -d mongodb docker-compose up -d abpidentity_httpapihost docker-compose up -d abpdesk_web sleep 2 diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/appsettings.Staging.json b/src/AbpDesk/AbpDesk.Web.Mvc/appsettings.Staging.json index 1dad7f3b34..7e25fee278 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/appsettings.Staging.json +++ b/src/AbpDesk/AbpDesk.Web.Mvc/appsettings.Staging.json @@ -1,11 +1,11 @@ { "ConnectionStrings": { - "Default": "Server=192.168.1.36;Database=AbpDesk;User=sa;Password=123qwe;", - "AbpDeskMongoBlog": "mongodb://192.168.1.36:27017|AbpDeskBlog" + "Default": "Server=10.0.75.1;Database=AbpDesk;User=sa;Password=123qwe;", + "AbpDeskMongoBlog": "mongodb://outputs_mongodb_1:27017|AbpDeskBlog" }, "AbpIdentity": { - "HttpProxy": { + "HttpApiClient": { "ApiUrlBase": "http://outputs_abpidentity_httpapihost_1/" } } -} +} \ No newline at end of file diff --git a/src/Volo.Abp.Identity.HttpApi.Host/appsettings.Staging.json b/src/Volo.Abp.Identity.HttpApi.Host/appsettings.Staging.json index 3a6dc58fce..a8d2e43f7e 100644 --- a/src/Volo.Abp.Identity.HttpApi.Host/appsettings.Staging.json +++ b/src/Volo.Abp.Identity.HttpApi.Host/appsettings.Staging.json @@ -1,5 +1,5 @@ { "ConnectionStrings": { - "Default": "Server=192.168.1.36;Database=AbpDesk;User=sa;Password=123qwe;" + "Default": "Server=10.0.75.1;Database=AbpDesk;User=sa;Password=123qwe;" } -} +} \ No newline at end of file