Browse Source

Revert "catalog loads in Docker"

This reverts commit c160af2179.
pull/168/head
BillWagner 7 years ago
committed by Bill Wagner
parent
commit
8953baf655
3 changed files with 41 additions and 1 deletions
  1. +16
    -0
      src/Web/Catalog.WebForms/docker-compose.override.yml
  2. +13
    -0
      src/Web/Catalog.WebForms/docker-compose.vs.debug.yml
  3. +12
    -1
      src/Web/Catalog.WebForms/docker-compose.yml

+ 16
- 0
src/Web/Catalog.WebForms/docker-compose.override.yml View File

@ -1,6 +1,22 @@
version: '2.1' version: '2.1'
services: services:
sql.data:
environment:
- SA_PASSWORD=Pass@word
- ACCEPT_EULA=Y
ports:
- "5433:1433"
catalog.api:
environment:
- ASPNETCORE_ENVIRONMENT=Development
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
#- ExternalCatalogBaseUrl=http://13.88.8.119:5101 #Remote: VM Needs to have public access at 5105.
- ExternalCatalogBaseUrl=http://localhost:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
ports:
- "5101:5101"
catalog.webforms: catalog.webforms:
ports: ports:
- "80:80" - "80:80"


+ 13
- 0
src/Web/Catalog.WebForms/docker-compose.vs.debug.yml View File

@ -11,3 +11,16 @@ services:
- ~\msvsmon:C:\msvsmon:ro - ~\msvsmon:C:\msvsmon:ro
labels: labels:
- "com.microsoft.visualstudio.targetoperatingsystem=windows" - "com.microsoft.visualstudio.targetoperatingsystem=windows"
catalog.api:
image: eshop/catalog.api:dev
build:
args:
source: ${DOCKER_BUILD_SOURCE}
environment:
- DOTNET_USE_POLLING_FILE_WATCHER=1
volumes:
- ../../Services/Catalog/Catalog.API:C:\app
- ~\msvsmon:C:\msvsmon:ro
labels:
- "com.microsoft.visualstudio.targetoperatingsystem=windows"

+ 12
- 1
src/Web/Catalog.WebForms/docker-compose.yml View File

@ -6,5 +6,16 @@ services:
build: build:
context: .\Catalog.WebForms context: .\Catalog.WebForms
dockerfile: Dockerfile dockerfile: Dockerfile
depends_on:
- catalog.api
catalog.api:
image: eshop/catalog.api
build:
context: ../../Services/Catalog/Catalog.API
dockerfile: Dockerfile.nanowin
depends_on:
- sql.data
sql.data:
image: microsoft/mssql-server-windows

Loading…
Cancel
Save