Minor issues fixed

Use current branch as tag

cli-windows/build-images.ps1

@@ -0,0 +1,11 @@
+Param([string] $imageTag)
+
+$scriptPath = Split-Path $script:MyInvocation.MyCommand.Path
+
+if ([string]::IsNullOrEmpty($imageTag)) {
+    $imageTag =  $(git rev-parse --abbrev-ref HEAD)
+}
+
+Write-Host "Building images with tag $imageTag" -ForegroundColor Yellow
+$env:TAG=$imageTag
+docker-compose -f "$scriptPath\..\docker-compose.yml" build

docker-compose-windows.yml

@@ -2,7 +2,7 @@ version: '2.1'
 
 services:
   basket.api:
-    image: eshop/basket.api-win
+    image: eshop/basket.api-win:${TAG:-latest}
     build:
       context: ./src/Services/Basket/Basket.API
       dockerfile: Dockerfile.nanowin
@@ -11,7 +11,7 @@ services:
       - identity.api
 
   catalog.api:
-    image: eshop/catalog.api-win
+    image: eshop/catalog.api-win:${TAG:-latest}
     build:
       context: ./src/Services/Catalog/Catalog.API
       dockerfile: Dockerfile.nanowin
@@ -19,7 +19,7 @@ services:
       - sql.data
 
   identity.api:
-    image: eshop/identity.api-win
+    image: eshop/identity.api-win:${TAG:-latest}
     build:
       context: ./src/Services/Identity/Identity.API
       dockerfile: Dockerfile.nanowin
@@ -27,7 +27,7 @@ services:
       - sql.data
 
   ordering.api:
-    image: eshop/ordering.api-win
+    image: eshop/ordering.api-win:${TAG:-latest}
     build:
       context: ./src/Services/Ordering/Ordering.API
       dockerfile: Dockerfile.nanowin
@@ -35,7 +35,7 @@ services:
       - sql.data
 
   webspa:
-    image: eshop/webspa-win
+    image: eshop/webspa-win:${TAG:-latest}
     build:
       context: ./src/Web/WebSPA
       dockerfile: Dockerfile.nanowin
@@ -44,7 +44,7 @@ services:
       - basket.api
 
   webmvc:
-    image: eshop/webmvc-win
+    image: eshop/webmvc-win:${TAG:-latest}
     build:
       context: ./src/Web/WebMVC
       dockerfile: Dockerfile.nanowin
@@ -55,7 +55,7 @@ services:
       - basket.api
   
   locations.api:
-    image: locations.api
+    image: eshop/locations.api:${TAG:-latest}
     build:
       context: ./src/Services/Location/Locations.API
       dockerfile: Dockerfile
@@ -64,7 +64,7 @@ services:
       - rabbitmq
 
   marketing.api:
-    image: eshop/marketing.api
+    image: eshop/marketing.api:${TAG:-latest}
     build:
       context: ./src/Services/Marketing/Marketing.API
       dockerfile: Dockerfile    

docker-compose.yml

@@ -1,9 +1,8 @@
-version: '2'
-
+version: '3'
 
 services:
   graceperiodmanager:
-    image: eshop/graceperiodmanager
+    image: eshop/graceperiodmanager:${TAG:-latest}
     build:
       context: ./src/Services/GracePeriod/GracePeriodManager
       dockerfile: Dockerfile
@@ -12,7 +11,7 @@ services:
       - rabbitmq
 
   basket.api:
-    image: eshop/basket.api
+    image: eshop/basket.api:${TAG:-latest}
     build:
       context: ./src/Services/Basket/Basket.API
       dockerfile: Dockerfile    
@@ -21,7 +20,7 @@ services:
       - identity.api
 
   catalog.api:
-    image: eshop/catalog.api
+    image: eshop/catalog.api:${TAG:-latest}
     build:
       context: ./src/Services/Catalog/Catalog.API
       dockerfile: Dockerfile    
@@ -30,7 +29,7 @@ services:
       - rabbitmq
 
   identity.api:
-    image: eshop/identity.api
+    image: eshop/identity.api:${TAG:-latest}
     build:
       context: ./src/Services/Identity/Identity.API
       dockerfile: Dockerfile    
@@ -38,7 +37,7 @@ services:
       - sql.data
 
   ordering.api:
-    image: eshop/ordering.api
+    image: eshop/ordering.api:${TAG:-latest}
     build:
       context: ./src/Services/Ordering/Ordering.API
       dockerfile: Dockerfile    
@@ -47,7 +46,7 @@ services:
       - rabbitmq
 
   marketing.api:
-    image: eshop/marketing.api
+    image: eshop/marketing.api:${TAG:-latest}
     build:
       context: ./src/Services/Marketing/Marketing.API
       dockerfile: Dockerfile    
@@ -58,7 +57,7 @@ services:
       - rabbitmq
 
   webspa:
-    image: eshop/webspa
+    image: eshop/webspa:${TAG:-latest}
     build:
       context: ./src/Web/WebSPA
       dockerfile: Dockerfile    
@@ -67,7 +66,7 @@ services:
       - basket.api
 
   webmvc:
-    image: eshop/webmvc
+    image: eshop/webmvc:${TAG:-latest}
     build:
       context: ./src/Web/WebMVC
       dockerfile: Dockerfile    
@@ -94,13 +93,13 @@ services:
       - "5672:5672"
 
   webstatus:
-    image: eshop/webstatus
+    image: eshop/webstatus:${TAG:-latest}
     build:
       context: ./src/Web/WebStatus
       dockerfile: Dockerfile
 
   payment.api:
-    image: eshop/payment.api
+    image: eshop/payment.api:${TAG:-latest}
     build:
       context: ./src/Services/Payment/Payment.API
       dockerfile: Dockerfile
@@ -108,7 +107,7 @@ services:
       - rabbitmq    
     
   locations.api:
-    image: eshop/locations.api
+    image: eshop/locations.api:${TAG:-latest}
     build:
       context: ./src/Services/Location/Locations.API
       dockerfile: Dockerfile

k8s/deploy.ps1

@@ -7,10 +7,17 @@ Param(
     [parameter(Mandatory=$false)][string]$execPath,
     [parameter(Mandatory=$false)][string]$kubeconfigPath,
     [parameter(Mandatory=$true)][string]$configFile,
+    [parameter(Mandatory=$false)][string]$imageTag,
     [parameter(Mandatory=$false)][bool]$deployInfrastructure=$true
 )
 
 $debugMode = $PSCmdlet.MyInvocation.BoundParameters["Debug"].IsPresent
+if ([string]::IsNullOrEmpty($imageTag)) {
+    $imageTag = $(git rev-parse --abbrev-ref HEAD)
+}
+
+Write-Host "Docker image Tag: $imageTag" -ForegroundColor Yellow
+
 function ExecKube($cmd) {    
     if($deployCI) {
         $kubeconfig = $kubeconfigPath + 'config';
@@ -27,10 +34,10 @@ function ExecKube($cmd) {
 $config =  Get-Content -Raw -Path $configFile | ConvertFrom-Json
 
 if ($debugMode) {
-Write-Host "Using following JSON config: "
+Write-Host "Using following JSON config: " -ForegroundColor Yellow
 $json = ConvertTo-Json $config -Depth 5 
-Write-Host $json
-Write-Host "Press a key "
+Write-Host $json 
+Write-Host "Press a key " -ForegroundColor Yellow
 [System.Console]::Read()
 }
 
@@ -90,14 +97,15 @@ if(-not $deployCI) {
     dotnet restore ../eShopOnContainers-ServicesAndWebApps.sln
     dotnet publish -c Release -o obj/Docker/publish ../eShopOnContainers-ServicesAndWebApps.sln
 
-    Write-Host "Building Docker images..." -ForegroundColor Yellow
+    Write-Host "Building Docker images." -ForegroundColor Yellow
+    $env:TAG=$imageTag
     docker-compose -p .. -f ../docker-compose.yml build    
 
     Write-Host "Pushing images to $registry..." -ForegroundColor Yellow
-    $services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "webmvc", "webspa", "webstatus")
+    $services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus")
     foreach ($service in $services) {
-        docker tag eshop/$service $registry/eshop/$service
-        docker push $registry/eshop/$service
+        docker tag eshop/${service}:$imageTag $registry/eshop/${service}:$imageTag
+        docker push $registry/eshop/${service}:$imageTag
     }
 }
 
@@ -142,7 +150,7 @@ ExecKube -cmd 'create configmap externalcfg `
     --from-literal=MarketingSqlDb=$($config.sql.marketing) `
     --from-literal=LocationsNoSqlDb=$($config.nosql.locations.constr) `
     --from-literal=LocationsNoSqlDbName=$($config.nosql.locations.db) `
-    --from-literal=MarketingsNoSqlDb=$($config.nosql.marketing.constr) `
+    --from-literal=MarketingNoSqlDb=$($config.nosql.marketing.constr) `
     --from-literal=MarketingNoSqlDbName=$($config.nosql.marketing.db) `
     --from-literal=BasketRedisConStr=$($config.redis.basket) `
     --from-literal=LocationsBus=$($config.servicebus.locations) `
@@ -150,7 +158,9 @@ ExecKube -cmd 'create configmap externalcfg `
     --from-literal=BasketBus=$($config.servicebus.basket) `
     --from-literal=OrderingBus=$($config.servicebus.ordering) `
     --from-literal=CatalogBus=$($config.servicebus.catalog) `
-    --from-literal=PaymentBus=$($config.servicebus.payment) '
+    --from-literal=PaymentBus=$($config.servicebus.payment) `
+    --from-literal=UseAzureServiceBus=$($config.servicebus.use_azure) `
+    --from-literal=keystore=$($config.redis.keystore) '
 
 ExecKube -cmd 'label configmap externalcfg app=eshop'
 
@@ -164,13 +174,16 @@ if(-not $deployCI) {
     # update deployments with the private registry before k8s tries to pull images
     # (deployment templating, or Helm, would obviate this)
     Write-Host "Update Image containers..." -ForegroundColor Yellow
-    ExecKube -cmd 'set image deployments/basket basket=$registry/eshop/basket.api'
-    ExecKube -cmd 'set image deployments/catalog catalog=$registry/eshop/catalog.api'
-    ExecKube -cmd 'set image deployments/identity identity=$registry/eshop/identity.api'
-    ExecKube -cmd 'set image deployments/ordering ordering=$registry/eshop/ordering.api'
-    ExecKube -cmd 'set image deployments/webmvc webmvc=$registry/eshop/webmvc'
-    ExecKube -cmd 'set image deployments/webstatus webstatus=$registry/eshop/webstatus'
-    ExecKube -cmd 'set image deployments/webspa webspa=$registry/eshop/webspa'
+    ExecKube -cmd 'set image deployments/basket basket=$registry/eshop/basket.api:$imageTag'
+    ExecKube -cmd 'set image deployments/catalog catalog=$registry/eshop/catalog.api:$imageTag'
+    ExecKube -cmd 'set image deployments/identity identity=$registry/eshop/identity.api:$imageTag'
+    ExecKube -cmd 'set image deployments/ordering ordering=$registry/eshop/ordering.api:$imageTag'
+    ExecKube -cmd 'set image deployments/marketing marketing=$registry/eshop/marketing.api:$imageTag'
+    ExecKube -cmd 'set image deployments/locations locations=$registry/eshop/locations.api:$imageTag'
+    ExecKube -cmd 'set image deployments/payment payment=$registry/eshop/payment.api:$imageTag'
+    ExecKube -cmd 'set image deployments/webmvc webmvc=$registry/eshop/webmvc:$imageTag'
+    ExecKube -cmd 'set image deployments/webstatus webstatus=$registry/eshop/webstatus:$imageTag'
+    ExecKube -cmd 'set image deployments/webspa webspa=$registry/eshop/webspa:$imageTag'
 }
 
 Write-Host "Execute rollout..." -ForegroundColor Yellow
@@ -178,6 +191,9 @@ ExecKube -cmd 'rollout resume deployments/basket'
 ExecKube -cmd 'rollout resume deployments/catalog'
 ExecKube -cmd 'rollout resume deployments/identity'
 ExecKube -cmd 'rollout resume deployments/ordering'
+ExecKube -cmd 'rollout resume deployments/marketing'
+ExecKube -cmd 'rollout resume deployments/locations'
+ExecKube -cmd 'rollout resume deployments/payment'
 ExecKube -cmd 'rollout resume deployments/webmvc'
 ExecKube -cmd 'rollout resume deployments/webstatus'
 ExecKube -cmd 'rollout resume deployments/webspa'

k8s/deployments.yaml

@@ -28,7 +28,10 @@ spec:
              name: externalcfg
              key: BasketBus
         - name: AzureServiceBusEnabled
-          value: "true"
+          valueFrom:
+           configMapKeyRef:
+             name: externalcfg
+             key: UseAzureServiceBus
         - name: IdentityUrl
           valueFrom:
            configMapKeyRef:
@@ -103,7 +106,10 @@ spec:
              name: externalcfg
              key: IdentitySqlDb
         - name: DPConnectionString
-          value: keystore-data
+          valueFrom:
+           configMapKeyRef:
+             name: externalcfg
+             key: keystore
         - name: IsClusterEnv
           value: 'True'
         - name: MvcClient
@@ -151,7 +157,10 @@ spec:
              name: externalcfg
              key: OrderingBus
         - name: AzureServiceBusEnabled
-          value: "true"
+          valueFrom:
+           configMapKeyRef:
+             name: externalcfg
+             key: UseAzureServiceBus
         - name: IdentityUrl
           valueFrom:
            configMapKeyRef:
@@ -192,7 +201,10 @@ spec:
              name: externalcfg
              key: LocationsNoSqlDbName
         - name: AzureServiceBusEnabled
-          value: "true"
+          valueFrom:
+           configMapKeyRef:
+             name: externalcfg
+             key: UseAzureServiceBus
         - name: EventBusConnection
           valueFrom:
            configMapKeyRef:
@@ -243,7 +255,10 @@ spec:
              name: externalcfg
              key: MarketingNoSqlDbName 
         - name: AzureServiceBusEnabled
-          value: "true"
+          valueFrom:
+           configMapKeyRef:
+             name: externalcfg
+             key: UseAzureServiceBus
         - name: EventBusConnection
           valueFrom:
            configMapKeyRef:
@@ -279,7 +294,10 @@ spec:
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80/payment-api
         - name: AzureServiceBusEnabled
-          value: ·true"
+          valueFrom:
+           configMapKeyRef:
+             name: externalcfg
+             key: UseAzureServiceBus
         - name: EventBusConnection
           valueFrom:
            configMapKeyRef:
@@ -310,7 +328,10 @@ spec:
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80/webmvc
         - name: DPConnectionString
-          value: keystore-data
+          valueFrom:
+           configMapKeyRef:
+             name: externalcfg
+             key: keystore
         - name: IsClusterEnv
           value: 'True'
         - name: BasketUrl
@@ -417,7 +438,10 @@ spec:
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80
         - name: DPConnectionString
-          value: keystore-data
+          valueFrom:
+           configMapKeyRef:
+             name: externalcfg
+             key: keystore
         - name: IsClusterEnv
           value: 'True'
         - name: BasketUrl

k8s/local.json

@@ -3,22 +3,24 @@
         "catalog": "Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word;",
         "identity":"Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.IdentityDb;User Id=sa;Password=Pass@word;",
         "ordering":"Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;",
-        "marketing":"Server=sql.data;Initial Catalog=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word;"
+        "marketing":"Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word;"
     },
     "nosql": {
         "locations": {
-            "constr": "mongodb://nosql.data",
+            "constr": "mongodb://nosql-data",
             "db": "LocationsDb"
         },
         "marketing": {
-            "constr": "mongodb://nosql.data",
+            "constr": "mongodb://nosql-data",
             "db": "MarketingDb"
         }
     },
     "redis": {
-        "basket" : "basket.data"
+        "basket" : "basket-data",
+        "keystore": "keystore-data"
     },
     "servicebus": {
+        "use_azure": false,
         "ordering": "rabbitmq",
         "marketing": "rabbitmq",
         "locations": "rabbitmq",

k8s/nosql-data.yaml

@@ -24,7 +24,7 @@ spec:
         component: nosql-data
     spec:
       containers:
-      - name: nosql.data
+      - name: nosql-data
         image: mongo
         ports:
         - containerPort: 27017