From c64cf7b2b3deb128f432364991bfed73fa96265d Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Wed, 20 Jun 2018 09:52:33 +0100 Subject: [PATCH] Update commands according to fixes in issue #630, plus minor typos --- ...eploying-eShopOnContainers-to-Windows-Containers.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/08.-Setting-up-and-Deploying-eShopOnContainers-to-Windows-Containers.md b/08.-Setting-up-and-Deploying-eShopOnContainers-to-Windows-Containers.md index bf6d74c..a000f18 100644 --- a/08.-Setting-up-and-Deploying-eShopOnContainers-to-Windows-Containers.md +++ b/08.-Setting-up-and-Deploying-eShopOnContainers-to-Windows-Containers.md @@ -76,17 +76,17 @@ Under the covers, in any case, the start-windows-containers.ps1 is running this ``` set ESHOP_OCELOT_VOLUME_SPEC=C:\app\configuration -docker-compose -f docker-compose-windows.yml -f docker-compose.override.yml -f -f docker-compose.windows.yml -f docker-compose.override.windows.yml up +docker-compose -f docker-compose.yml -f docker-compose.override.yml -f -f docker-compose.windows.yml -f docker-compose.override.windows.yml up ``` -**IMPORTANT**: You need to those files when running docker-compose up **and the `ESHOP_OCELOT_VOLUME_SPEC` environment variable must be set to `C:\app\configuration`.Also yo have to have the environment variables related to the localhost loopback limitation mentioned at the end of this post. +**IMPORTANT**: You need to include those files when running docker-compose up **and the `ESHOP_OCELOT_VOLUME_SPEC` environment variable must be set to `C:\app\configuration`**. Also you have to set the environment variables related to the localhost loopback limitation mentioned at the beginning of this post (if it applies to your environment). Just for reference here are the docker compose files and what they do: 1. `docker-compose.yml`: Main compose file. Define all services for both Linux & Windows and set base images for Linux 2. `docker-compose.override.yml`: Main override file. Define all config for both Linux & Windows, with Linux-based defaults -3. `docker-compose.windows.override.yml`: Overrides some previous data (like images) for Windows containers -4. `docker-compose.windows.override.yml`: Adds specific windows-only configuration +3. `docker-compose.windows.yml`: Overrides some previous data (like images) for Windows containers +4. `docker-compose.override.windows.yml`: Adds specific windows-only configuration ## Test/use the eShopOnContainers MVC app in a browser @@ -126,6 +126,6 @@ If you prefer to use `docker-compose` you can do it. Just call it without the `d ``` set ESHOP_OCELOT_VOLUME_SPEC=C:\app\configuration - docker-compose -f docker-compose-windows.yml -f docker-compose.override.yml -f docker-compose.windows.yml up + docker-compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.windows.yml up ```