From 0b15148306ecba027f4a7a57f7f8c266a9b4312d Mon Sep 17 00:00:00 2001 From: BillWagner Date: Wed, 12 Apr 2017 17:09:21 -0400 Subject: [PATCH] interim checkin --- src/Web/Catalog.WebForms/docker-compose.vs.debug.yml | 3 +-- src/Web/Catalog.WebForms/docker-compose.yml | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Web/Catalog.WebForms/docker-compose.vs.debug.yml b/src/Web/Catalog.WebForms/docker-compose.vs.debug.yml index 83b7bfe55..b93037737 100644 --- a/src/Web/Catalog.WebForms/docker-compose.vs.debug.yml +++ b/src/Web/Catalog.WebForms/docker-compose.vs.debug.yml @@ -2,7 +2,7 @@ version: '2.1' services: catalog.webforms: - image: catalog.webforms:dev + image: eshop/catalog.webforms:dev build: args: source: ${DOCKER_BUILD_SOURCE} @@ -22,6 +22,5 @@ services: volumes: - ../../Services/Catalog/Catalog.API:C:\app - ~\msvsmon:C:\msvsmon:ro - entrypoint: tail -f /dev/null labels: - "com.microsoft.visualstudio.targetoperatingsystem=windows" diff --git a/src/Web/Catalog.WebForms/docker-compose.yml b/src/Web/Catalog.WebForms/docker-compose.yml index 4eb18f0d2..99cbd7914 100644 --- a/src/Web/Catalog.WebForms/docker-compose.yml +++ b/src/Web/Catalog.WebForms/docker-compose.yml @@ -2,7 +2,7 @@ version: '2.1' services: catalog.webforms: - image: catalog.webforms + image: eshop/catalog.webforms build: context: .\Catalog.WebForms dockerfile: Dockerfile @@ -12,8 +12,8 @@ services: catalog.api: image: eshop/catalog.api build: - context: ..\..\Services\Catalog\Catalog.API - dockerfile: Dockerfile.windows + context: ../../Services/Catalog/Catalog.API + dockerfile: Dockerfile.nanowin depends_on: - sql.data