Merge with dev

Author: jsuarezruiz

README.md

@@ -16,7 +16,6 @@ dotnet restore $webPathToJson
 dotnet build $webPathToJson
 dotnet publish $webPathToJson -o $webPathToPub
 
-
 # *** WebSPA image ***
 $webSPAPathToJson = $scriptPath + "\src\Web\WebSPA\eShopOnContainers.WebSPA\project.json"
 Write-Host "webSPAPathToJson is $webSPAPathToJson" -ForegroundColor Yellow

build-images.ps1

@@ -0,0 +1,69 @@
+#
+# docker-compose.override.yml is used to set up local configuration environment
+# Things like the external ports to use or secrets/passwords depend on the 
+# specific deployment environment you might be using.
+# Further details and docs: https://docs.docker.com/compose/extends/ 
+#
+
+version: '2'
+
+services:
+
+#  webmvc:
+#    environment:
+#      - CatalogUrl=http://catalog.api
+#      - OrderingUrl=http://ordering.api:5102
+      #- IdentityUrl=http://104.40.62.65:5105           #Remote: VM Needs to have public access at 5105. 
+#      - IdentityUrl=http://identity.service:5105        #Local: You need a entry in windows host file to run identity in local docker. 
+#      - BasketUrl=http://basket.api:5103
+#    ports:
+#      - "5100:5100"
+
+  webspa:
+    environment:
+      - CatalogUrl=http://catalog.api
+      - OrderingUrl=http://ordering.api
+      #- IdentityUrl=http://104.40.62.65:5105           #Remote: VM Needs to have public access at 5105. 
+      - IdentityUrl=http://identity.service:5105        #Local: You need a entry in windows host file to run identity in local docker. 
+      - BasketUrl=http://basket.api:5103
+    ports:
+      - "5104:80"
+
+  basket.api:
+    environment:
+      - ConnectionString=basket.data
+      #- identityUrl=http://104.40.62.65:5105           #Remote: VM Needs to have public access at 5105. 
+      - identityUrl=http://identity.service:5105        #Local: You need a entry in windows host file to run identity in local docker. 
+    ports:
+      - "5103:5103"
+
+  catalog.api:
+    environment:
+      - ConnectionString=Server=sql.data;Database=CatalogDB;User Id=sa;Password=Pass@word
+    ports:
+      - "5101:80"
+
+#  ordering.api:
+#    environment:
+#      - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
+#      - identityUrl=http://identity.service:5105    #local
+      #- identityUrl=http://104.40.62.65:5105       #remote
+#    ports:
+#      - "5102:5102"
+
+  identity.service:
+    environment:
+      - SpaClient=http://localhost:5104
+      - ConnectionStrings__DefaultConnection=Server=sql.data;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word
+      #- MvcClient=http://104.40.62.65:5100             #Remote: VM Needs to have public access at 5105. 
+      - MvcClient=http://localhost:5100                 #Local: You need a entry in windows host file to run identity in local docker. 
+                                                        #10.0.75.1:5105 CCE/TODO: try to avoid host entry. 
+    ports:
+      - "5105:5105"
+
+  sql.data:
+    environment:
+      - SA_PASSWORD=Pass@word
+      - ACCEPT_EULA=Y
+    ports:
+      - "5433:1433"

docker-compose.override.yml

@@ -1,108 +1,47 @@
+#
+# docker-compose.yml is used to set up the base config per container to be deployed
+# Take into account that when deploying, this base configuration is merged with the 
+# configuration-per-environment specified at the docker-compose.override.yml
+# Further details and docs: https://docs.docker.com/compose/extends/ 
+#
 version: '2'
 
 services:
-  webmvc:
-    image: eshop/web
-    build:
-      context: .
-      dockerfile: Dockerfile
-    environment:
-      - CatalogUrl=http://catalog.api
-      - OrderingUrl=http://ordering.api
-      #- IdentityUrl=http://104.40.62.65:5105           #Remote: VM Needs to have public access at 5105. 
-      - IdentityUrl=http://identity.service:5105        #Local: You need a entry in windows host file to run identity in local docker. 
-      - BasketUrl=http://basket.api
-    ports:
-      - "5100:5100"
-    depends_on:
-      - identity.service
-      - basket.api
+#  webmvc:
+#    image: eshop/web
+#    depends_on:
+#      - identity.service
+#      - basket.api
 
   webspa:
     image: eshop/webspa
-    build:
-      context: .
-      dockerfile: Dockerfile
-    environment:
-      - CatalogUrl=http://catalog.api
-      - OrderingUrl=http://ordering.api
-      #- IdentityUrl=http://104.40.62.65:5105           #Remote: VM Needs to have public access at 5105. 
-      - IdentityUrl=http://identity.service:5105        #Local: You need a entry in windows host file to run identity in local docker. 
-      - BasketUrl=http://basket.api
-    ports:
-      - "5104:80"
     depends_on:
       - basket.api
       - identity.service
 
-  identity.service:
-    image: eshop/identity
-    environment:
-      - SpaClient=http://localhost:5104
-      - ConnectionString=Server=identity.data;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word
-      #- MvcClient=http://104.40.62.65:5100             #Remote: VM Needs to have public access at 5105. 
-      - MvcClient=http://localhost:5100                 #Local: You need a entry in windows host file to run identity in local docker. 
-    ports:
-      - "5105:5105"
-    depends_on:
-      - identity.data
-
-  identity.data:
-    image: microsoft/mssql-server-linux
-    environment:
-      - SA_PASSWORD=Pass@word
-      - ACCEPT_EULA=Y
-    ports:
-      - "5433:1433"
-
   basket.api:
     image: eshop/basket.api
-    environment:
-      - ConnectionString=basket.data
-      #- identityUrl=http://104.40.62.65:5105           #Remote: VM Needs to have public access at 5105. 
-      - identityUrl=http://identity.service:5105        #Local: You need a entry in windows host file to run identity in local docker. 
-    build:
-      context: .
-      dockerfile: Dockerfile
-    ports:
-      - "5103:5103"
     depends_on:
       - basket.data
       - identity.service
 
-  basket.data:
-    image: redis
-
   catalog.api:
     image: eshop/catalog.api
-    environment:
-      - ConnectionString=Server=catalog.data;Database=CatalogDB;User Id=sa;Password=Pass@word
-    ports:
-      - "5101:80"
     depends_on:
-      - catalog.data
+      - sql.data
 
-  catalog.data:
-    image: microsoft/mssql-server-linux
-    environment:
-      - SA_PASSWORD=Pass@word
-      - ACCEPT_EULA=Y
-    ports:
-      - "5434:1433"
+#  ordering.api:
+#    image: eshop/ordering.api
+#    depends_on:
+#      - sql.data
 
-  ordering.api:
-    image: eshop/ordering.api
-    environment:
-      - ConnectionString=Server=ordering.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
-    ports:
-      - "5102:80"
+  identity.service:
+    image: eshop/identity
     depends_on:
-      - ordering.data
+      - sql.data
 
-  ordering.data:
+  sql.data:
     image: microsoft/mssql-server-linux
-    environment:
-      - SA_PASSWORD=Pass@word
-      - ACCEPT_EULA=Y
-    ports:
-      - "5432:1433"
+
+  basket.data:
+    image: redis