Merge pull request #566 from dotnet-architecture/revert-565-xamarin-settings

Revert "Simplified the SettingsService in the mobile client."

Author: davidbritch

.dockerignore

@@ -13,7 +13,6 @@ hosts
 LICENSE
 *.testsettings
 vsts-docs
-test
 ServiceFabric
 readme
 k8s
@@ -30,5 +29,4 @@ cli-linux
 **/bower_components/
 **/wwwroot/lib/
 global.json
-**/appsettings.localhost.json
 src/Web/WebSPA/wwwroot/

.gitignore

@@ -260,4 +260,3 @@ pub/
 /src/Web/WebMVC/wwwroot/lib
 /src/Web/WebMVC/wwwroot/css/site.min.css
 **/.kube/**
-.mfractor

docker-compose.dcproj

@@ -7,7 +7,6 @@
     <DockerServiceName>webmvc</DockerServiceName>
     <DockerTargetOS>Linux</DockerTargetOS>
     <ProjectVersion>2.1</ProjectVersion>
-    <DockerLaunchAction>LaunchBrowser</DockerLaunchAction>
   </PropertyGroup>
   <ItemGroup>
     <None Include=".dockerignore" />

docker-compose.override.yml

@@ -57,8 +57,6 @@ services:
       - MarketingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110
       - BasketApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103
       - OrderingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
-      - MobileShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5120
-      - WebShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5121
       - UseCustomizationData=True  
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
@@ -85,6 +83,24 @@ services:
     ports:
       - "5102:80"
 
+  ordering.backgroundtasks:
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
+      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+      - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
+      - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}          
+      - UseCustomizationData=True
+      - AzureServiceBusEnabled=False
+      - CheckUpdateTime=30000
+      - GracePeriodTime=1
+      - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
+      - OrchestratorType=${ORCHESTRATOR_TYPE}
+      - UseLoadTest=${USE_LOADTEST:-False}
+    ports:
+      - "5111:80"
+
   marketing.api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -113,9 +129,12 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
+      - CatalogUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101
+      - OrderingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
       - IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
-      - PurchaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202
-      - MarketingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5203      
+      - BasketUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103
+      - MarketingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110
+      - LocationsUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5109
       - CatalogUrlHC=http://catalog.api/hc
       - OrderingUrlHC=http://ordering.api/hc
       - IdentityUrlHC=http://identity.api/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
@@ -132,9 +151,12 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - PurchaseUrl=http://webshoppingapigw
+      - CatalogUrl=http://catalog.api
+      - OrderingUrl=http://ordering.api
+      - BasketUrl=http://basket.api
+      - LocationsUrl=http://locations.api
       - IdentityUrl=http://10.0.75.1:5105  # Local Mac: Use http://docker.for.mac.localhost:5105 || Local Windows:  Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. || #Remote access: Use ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser.
-      - MarketingUrl=http://webmarketingapigw                                                    
+      - MarketingUrl=http://marketing.api                                                    
       - CatalogUrlHC=http://catalog.api/hc
       - OrderingUrlHC=http://ordering.api/hc
       - IdentityUrlHC=http://identity.api/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
@@ -217,58 +239,3 @@ services:
       - "15672:15672"
       - "5672:5672"
 
-  mobileshoppingapigw:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
-    ports:
-      - "5200:80"
-    volumes:
-      - ./src/ApiGateways/Mobile.Bff.Shopping/apigw:/app/configuration
- 
-  mobilemarketingapigw:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
-    ports:
-      - "5201:80"
-    volumes:
-      - ./src/ApiGateways/Mobile.Bff.Marketing/apigw:/app/configuration
-
-  webshoppingapigw:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
-    ports:
-      - "5202:80"
-    volumes:
-      - ./src/ApiGateways/Web.Bff.Shopping/apigw:/app/configuration
-
-  webmarketingapigw:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
-    ports:
-      - "5203:80"
-    volumes:
-      - ./src/ApiGateways/Web.Bff.Marketing/apigw:/app/configuration
-
-  mobileshoppingagg:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - urls__basket=http://basket.api
-      - urls__catalog=http://catalog.api
-      - urls__orders=http://ordering.api
-      - urls__identity=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
-    ports:
-      - "5120:80"
-
-  webshoppingagg:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - urls__basket=http://basket.api
-      - urls__catalog=http://catalog.api
-      - urls__orders=http://ordering.api
-      - urls__identity=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
-    ports:
-      - "5121:80"

docker-compose.prod.yml

@@ -64,8 +64,6 @@ services:
       - MarketingApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5110
       - BasketApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5103
       - OrderingApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5102
-      - MobileShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5120
-      - WebShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5120
       - UseCustomizationData=True  
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
@@ -158,16 +156,17 @@ services:
 
   webmvc:
     environment:
-
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - PurchaseUrl=http://webshoppingapigw/shopping
+      - CatalogUrl=http://catalog.api
+      - OrderingUrl=http://ordering.api
+      - BasketUrl=http://basket.api
       - LocationsUrl=http://locations.api
-      - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105  # Local Mac: Use http://docker.for.mac.localhost:5105 || Local Windows:  Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. || #Remote access: Use ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser.
-      - MarketingUrl=http://marketing.api                                                    
+      - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105   #Local:  Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. #Remote: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser.  
+      - MarketingUrl=http://marketing.api                                                  
       - CatalogUrlHC=http://catalog.api/hc
       - OrderingUrlHC=http://ordering.api/hc
-      - IdentityUrlHC=http://identity.api/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
+      - IdentityUrlHC=http://identity.api/hc             
       - BasketUrlHC=http://basket.api/hc
       - MarketingUrlHC=http://marketing.api/hc
       - PaymentUrlHC=http://payment.api/hc

docker-compose.yml

@@ -38,6 +38,15 @@ services:
       - sql.data
       - rabbitmq
 
+  ordering.backgroundtasks:
+    image: eshop/ordering.backgroundtasks:${TAG:-latest}
+    build:
+      context: .
+      dockerfile: src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile    
+    depends_on:
+      - sql.data
+      - rabbitmq
+
   marketing.api:
     image: eshop/marketing.api:${TAG:-latest}
     build:
@@ -106,41 +115,4 @@ services:
     image: redis:alpine
 
   rabbitmq:
-    image: rabbitmq:3-management-alpine
-
-  mobileshoppingapigw:
-    image: eshop/ocelotapigw-ms:${TAG:-latest}
-    build:
-      context: .
-      dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
- 
-  mobilemarketingapigw:
-    image: eshop/ocelotapigw-mm:${TAG:-latest}
-    build:
-      context: .
-      dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile2
- 
-  webshoppingapigw:
-    image: eshop/ocelotapigw-ws:${TAG:-latest}
-    build:
-      context: .
-      dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile3
-
-  webmarketingapigw:
-    image: eshop/ocelotapigw-wm:${TAG:-latest}
-    build:
-      context: .
-      dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
-
-  mobileshoppingagg:
-    image: eshop/mobileshoppingagg:${TAG:-latest}
-    build:
-      context: .
-      dockerfile: src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
-
-  webshoppingagg:
-    image: eshop/webshoppingagg:${TAG:-latest}
-    build:
-      context: .
-      dockerfile: src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
-
+    image: rabbitmq:3-management-alpine