Browse Source

same SQL for catalog and ordering

pull/49/merge
Carlos Cañizares Estévez 8 years ago
parent
commit
44f238f3fd
5 changed files with 10 additions and 18 deletions
  1. +6
    -14
      docker-compose.yml
  2. +1
    -1
      src/Services/Basket/Basket.API/Program.cs
  3. +1
    -1
      src/Services/Catalog/Catalog.API/settings.json
  4. +1
    -1
      src/Services/Identity/eShopOnContainers.Identity/Program.cs
  5. +1
    -1
      src/Services/Ordering/Ordering.API/settings.json

+ 6
- 14
docker-compose.yml View File

@ -77,35 +77,27 @@ services:
catalog.api: catalog.api:
image: eshop/catalog.api image: eshop/catalog.api
environment: environment:
- ConnectionString=Server=catalog.data;Database=CatalogDB;User Id=sa;Password=Pass@word
- ConnectionString=Server=business.data;Database=CatalogDB;User Id=sa;Password=Pass@word
ports: ports:
- "5101:80" - "5101:80"
depends_on: depends_on:
- catalog.data
catalog.data:
image: microsoft/mssql-server-linux
environment:
- SA_PASSWORD=Pass@word
- ACCEPT_EULA=Y
ports:
- "5434:1433"
- business.data
ordering.api: ordering.api:
image: eshop/ordering.api image: eshop/ordering.api
environment: environment:
- ConnectionString=Server=ordering.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
- ConnectionString=Server=business.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
- identityUrl=http://identity.service:5105 #local - identityUrl=http://identity.service:5105 #local
#- identityUrl=http://104.40.62.65:5105 #remote #- identityUrl=http://104.40.62.65:5105 #remote
ports: ports:
- "5102:5102" - "5102:5102"
depends_on: depends_on:
- ordering.data
- business.data
ordering.data:
business.data:
image: microsoft/mssql-server-linux image: microsoft/mssql-server-linux
environment: environment:
- SA_PASSWORD=Pass@word - SA_PASSWORD=Pass@word
- ACCEPT_EULA=Y - ACCEPT_EULA=Y
ports: ports:
- "5432:1433"
- "5434:1433"

+ 1
- 1
src/Services/Basket/Basket.API/Program.cs View File

@ -15,7 +15,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseKestrel() .UseKestrel()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseUrls("http://0.0.0.0:5003")
.UseUrls("http://0.0.0.0:5103")
.UseIISIntegration() .UseIISIntegration()
.UseStartup<Startup>() .UseStartup<Startup>()
.Build(); .Build();


+ 1
- 1
src/Services/Catalog/Catalog.API/settings.json View File

@ -1,5 +1,5 @@
{ {
"ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=CatalogDB;User Id=sa;Password=Pass@word",
"ConnectionString": "Server=tcp:127.0.0.1,5434;Initial Catalog=CatalogDB;User Id=sa;Password=Pass@word",
"Logging": { "Logging": {
"IncludeScopes": false, "IncludeScopes": false,
"LogLevel": { "LogLevel": {


+ 1
- 1
src/Services/Identity/eShopOnContainers.Identity/Program.cs View File

@ -13,7 +13,7 @@ namespace eShopOnContainers.Identity
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseKestrel() .UseKestrel()
.UseUrls("http://0.0.0.0:5000")
.UseUrls("http://0.0.0.0:5105")
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISIntegration() .UseIISIntegration()
.UseStartup<Startup>() .UseStartup<Startup>()


+ 1
- 1
src/Services/Ordering/Ordering.API/settings.json View File

@ -1,4 +1,4 @@
{ {
"ConnectionString": "Server=tcp:127.0.0.1,5432;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;",
"ConnectionString": "Server=tcp:127.0.0.1,5434;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;",
"IdentityUrl": "http://localhost:5105" "IdentityUrl": "http://localhost:5105"
} }

Loading…
Cancel
Save