tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://github.com/volosoft/abp

pull/818/head
Halil ibrahim Kalkan 8 years ago
parent
b7f9b40db9 1a0eaf471c
commit
6fc733c39d
2 changed files with 22 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      samples/MicroserviceDemo/README.md
  2. 38
      samples/MicroserviceDemo/docker-compose.override.yml

6
samples/MicroserviceDemo/README.md
View File

@ -13,6 +13,6 @@ $ docker-compose up -d
``` ```
### Accessing the Web User Interfaces ### Accessing the Web User Interfaces
- AuthServer: `http://127.0.0.1:64899` - AuthServer: `http://localhost:64999`
- PublicWebsite: `http://127.0.0.1:63897` - PublicWebsite: `http://localhost:53435`
- BackendAdminApp: `http://127.0.0.1:63899` - BackendAdminApp: `http://localhost:51954`

38
samples/MicroserviceDemo/docker-compose.override.yml
View File

@ -24,7 +24,7 @@ services:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
- AuthServer__Authority=http://auth-server:64899 - AuthServer__Authority=http://auth-server:64999
- ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false - ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
- Redis__Configuration=redis - Redis__Configuration=redis
- ReRoutes__0__DownstreamHostAndPorts__Host=identity-service - ReRoutes__0__DownstreamHostAndPorts__Host=identity-service
@ -35,14 +35,14 @@ services:
- ReRoutes__2__DownstreamHostAndPorts__Port=80 - ReRoutes__2__DownstreamHostAndPorts__Port=80
- GlobalConfiguration__BaseUrl=http://internal-gateway - GlobalConfiguration__BaseUrl=http://internal-gateway
ports: ports:
- 65029:80 - 65129:80
backend-admin-app-gateway: backend-admin-app-gateway:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
- RemoteServices__Default__BaseUrl=http://backend-admin-app-gateway/ - RemoteServices__Default__BaseUrl=http://backend-admin-app-gateway/
- AuthServer__Authority=http://auth-server:64899 - AuthServer__Authority=http://auth-server:64999
- ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false - ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
- Redis__Configuration=redis - Redis__Configuration=redis
- ReRoutes__0__DownstreamHostAndPorts__Host=identity-service - ReRoutes__0__DownstreamHostAndPorts__Host=identity-service
@ -51,13 +51,13 @@ services:
- ReRoutes__1__DownstreamHostAndPorts__Port=80 - ReRoutes__1__DownstreamHostAndPorts__Port=80
- GlobalConfiguration__BaseUrl=http://backend-admin-app-gateway - GlobalConfiguration__BaseUrl=http://backend-admin-app-gateway
ports: ports:
- 65015:80 - 65115:80
public-website-gateway: public-website-gateway:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
- AuthServer__Authority=http://auth-server:64899 - AuthServer__Authority=http://auth-server:64999
- ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false - ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
- Redis__Configuration=redis - Redis__Configuration=redis
- ReRoutes__0__DownstreamHostAndPorts__Host=product-service - ReRoutes__0__DownstreamHostAndPorts__Host=product-service
@ -66,69 +66,69 @@ services:
- ReRoutes__1__DownstreamHostAndPorts__Port=80 - ReRoutes__1__DownstreamHostAndPorts__Port=80
- GlobalConfiguration__BaseUrl=http://public-website-gateway - GlobalConfiguration__BaseUrl=http://public-website-gateway
ports: ports:
- 64797:80 - 64897:80
blogging-service: blogging-service:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
- AuthServer__Authority=http://auth-server:64899 - AuthServer__Authority=http://auth-server:64999
- ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false - ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
- ConnectionStrings__Blogging=mongodb://mongodb|MsDemo_Blogging - ConnectionStrings__Blogging=mongodb://mongodb|MsDemo_Blogging
- Redis__Configuration=redis - Redis__Configuration=redis
- RabbitMQ__Connections__Default__HostName=rabbitmq - RabbitMQ__Connections__Default__HostName=rabbitmq
ports: ports:
- 62057:80 - 62157:80
identity-service: identity-service:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
- AuthServer__Authority=http://auth-server:64899 - AuthServer__Authority=http://auth-server:64999
- ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false - ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
- Redis__Configuration=redis - Redis__Configuration=redis
- RabbitMQ__Connections__Default__HostName=rabbitmq - RabbitMQ__Connections__Default__HostName=rabbitmq
ports: ports:
- 63468:80 - 63568:80
product-service: product-service:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
- AuthServer__Authority=http://auth-server:64899 - AuthServer__Authority=http://auth-server:64999
- ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false - ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
- ConnectionStrings__ProductManagement=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false - ConnectionStrings__ProductManagement=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
- Redis__Configuration=redis - Redis__Configuration=redis
- RabbitMQ__Connections__Default__HostName=rabbitmq - RabbitMQ__Connections__Default__HostName=rabbitmq
ports: ports:
- 60144:80 - 60244:80
auth-server: auth-server:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:64899 - ASPNETCORE_URLS=http://0.0.0.0:64999
- ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false - ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
- Redis__Configuration=redis - Redis__Configuration=redis
- RabbitMQ__Connections__Default__HostName=rabbitmq - RabbitMQ__Connections__Default__HostName=rabbitmq
ports: ports:
- 64899:64899 - 64999:64999
backend-admin-app: backend-admin-app:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
- AuthServer__Authority=http://auth-server:64899 - AuthServer__Authority=http://auth-server:64999
- RemoteServices__Default__BaseUrl=http://backend-admin-app-gateway/ - RemoteServices__Default__BaseUrl=http://backend-admin-app-gateway/
- Redis__Configuration=redis - Redis__Configuration=redis
ports: ports:
- 63899:80 - 51954:80
console-client-demo: console-client-demo:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
- RemoteServices__Default__BaseUrl=http://internal-gateway/ - RemoteServices__Default__BaseUrl=http://internal-gateway/
- IdentityClients__Default__Authority=http://auth-server:64899 - IdentityClients__Default__Authority=http://auth-server:64999
ports: ports:
- 63898:80 - 63898:80
@ -136,8 +136,8 @@ services:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
- AuthServer__Authority=http://auth-server:64899 - AuthServer__Authority=http://auth-server:64999
- RemoteServices__Default__BaseUrl=http://public-website-gateway/ - RemoteServices__Default__BaseUrl=http://public-website-gateway/
- Redis__Configuration=redis - Redis__Configuration=redis
ports: ports:
- 63897:80 - 53435:80
Write Preview
Loading…
Cancel
Save