diff --git a/.env b/.env
index d9482516b..e2358c823 100644
--- a/.env
+++ b/.env
@@ -5,4 +5,20 @@
# The IP below should be swapped to your real IP or DNS name, like 192.168.88.248, etc. if testing from remote browsers or mobile devices
ESHOP_EXTERNAL_DNS_NAME_OR_IP=localhost
-ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=10.121.122.92
\ No newline at end of file
+ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=10.121.122.92
+
+#ESHOP_AZURE_REDIS_BASKET_DB=
+#ESHOP_AZURE_STORAGE_CATALOG=
+#ESHOP_AZURE_STORAGE_MARKETING=
+#ESHOP_AZURE_SERVICE_BUS=
+#ESHOP_AZURE_COSMOSDB=
+#ESHOP_AZURE_CATALOG_DB=
+#ESHOP_AZURE_IDENTITY_DB=
+#ESHOP_AZURE_ORDERING_DB=
+#ESHOP_AZURE_MARKETING_DB=
+#ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI=
+#ESHOP_AZURE_STORAGE_CATALOG_NAME=
+#ESHOP_AZURE_STORAGE_CATALOG_KEY=
+#ESHOP_AZURE_STORAGE_MARKETING_NAME=
+#ESHOP_AZURE_STORAGE_MARKETING_KEY=
+
diff --git a/.gitignore b/.gitignore
index d7f16d65c..548ad2340 100644
--- a/.gitignore
+++ b/.gitignore
@@ -189,7 +189,6 @@ ClientBin/
*~
*.dbmdl
*.dbproj.schemaview
-*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs
@@ -259,3 +258,4 @@ pub/
#Ignore marker-file used to know which docker files we have.
.eshopdocker_*
/src/Web/WebMVC/wwwroot/lib
+/src/Web/WebMVC/wwwroot/css/site.min.css
diff --git a/Components/GeolocatorPlugin-1.0.3.info b/Components/GeolocatorPlugin-1.0.3.info
new file mode 100644
index 000000000..759500537
--- /dev/null
+++ b/Components/GeolocatorPlugin-1.0.3.info
@@ -0,0 +1 @@
+{"Name":"Geolocator Plugin","Id":2035,"Alias":"GeolocatorPlugin","Description":"# Geolocator Plugin details\r\n\r\nSimple cross platform plugin to get GPS location including heading, speed, and more.\r\n\r\n#### Features\r\n* Async GPS Location Detection\r\n* Heading\r\n* Speed\r\n* Listen for Changes\r\n\r\n\r\nWorks from any shared code or PCL project.\r\n\r\nFind more plugins at: http://www.github.com/xamarin/plugins","Version":"1.0.3","Summary":"Simple cross platform plugin to get GPS location including heading, speed, and more.","QuickStart":"# Getting Started with Geolocator Plugin\r\n\r\n### API Usage\r\n\r\nCall **CrossGeolocator.Current** from any project or PCL to gain access to APIs.\r\n\r\n```\r\nvar locator = CrossGeolocator.Current;\r\nlocator.DesiredAccuracy = 50;\r\n\r\nvar position = await locator.GetPositionAsync (timeoutMilliseconds: 10000);\r\n\r\nConsole.WriteLine (\"Position Status: {0}\", position.Timestamp);\r\nConsole.WriteLine (\"Position Latitude: {0}\", position.Latitude);\r\nConsole.WriteLine (\"Position Longitude: {0}\", position.Longitude);\r\n```\r\n\r\n### **IMPORTANT**\r\nAndroid:\r\n\r\nYou must request ACCESS_COARSE_LOCATION \u0026 ACCESS_FINE_LOCATION permission\r\n\r\niOS:\r\n\r\nIn iOS 8 you now have to call either RequestWhenInUseAuthorization or RequestAlwaysAuthorization on the location manager. Additionally you need to add either the concisely named NSLocationWhenInUseUsageDescription or NSLocationAlwaysUsageDescription to your Info.plist. \r\nSee: http://motzcod.es/post/97662738237/scanning-for-ibeacons-in-ios-8\r\n\r\nWindows Phone:\r\n\r\nYou must set the ID_CAP_LOCATION permission.","Hash":"94480115a3947ef812df48cae11dbd94","TargetPlatforms":["ios","ios-unified","android"],"TrialHash":null}
\ No newline at end of file
diff --git a/Components/GeolocatorPlugin-1.0.3.png b/Components/GeolocatorPlugin-1.0.3.png
new file mode 100644
index 000000000..3ab2b3095
--- /dev/null
+++ b/Components/GeolocatorPlugin-1.0.3.png
@@ -0,0 +1,314 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-It also supports asynchronous communication for data updates propagation across multiple services based on Integration Events and an Event Bus plus other features defined at the roadmap.
+The architecture proposes a simplified microservice oriented architecture implementation with multiple autonomous microservices (each one owning its own data/db) and implementing different approaches within each microservice (simple CRUD vs. DDD/CQRS patterns) using Http as the communication protocol between the client apps and the microservices and supports asynchronous communication for data updates propagation across multiple services based on Integration Events and an Event Bus (a light message broker, to choose between RabbitMQ or Azure Service Bus, underneath) plus other features defined at the roadmap.
diff --git a/azure-docs/builds/images/android-build-step1.png b/azure-docs/builds/images/android-build-step1.png
new file mode 100644
index 000000000..b43243b73
Binary files /dev/null and b/azure-docs/builds/images/android-build-step1.png differ
diff --git a/azure-docs/builds/images/android-build-step2.png b/azure-docs/builds/images/android-build-step2.png
new file mode 100644
index 000000000..67419b3ba
Binary files /dev/null and b/azure-docs/builds/images/android-build-step2.png differ
diff --git a/azure-docs/builds/images/android-build-step3.png b/azure-docs/builds/images/android-build-step3.png
new file mode 100644
index 000000000..ae703c16d
Binary files /dev/null and b/azure-docs/builds/images/android-build-step3.png differ
diff --git a/azure-docs/builds/images/android-build-step4.png b/azure-docs/builds/images/android-build-step4.png
new file mode 100644
index 000000000..8311e5647
Binary files /dev/null and b/azure-docs/builds/images/android-build-step4.png differ
diff --git a/azure-docs/builds/images/android-build-step5.png b/azure-docs/builds/images/android-build-step5.png
new file mode 100644
index 000000000..b6789e97f
Binary files /dev/null and b/azure-docs/builds/images/android-build-step5.png differ
diff --git a/azure-docs/builds/images/android-build.png b/azure-docs/builds/images/android-build.png
new file mode 100644
index 000000000..d21233571
Binary files /dev/null and b/azure-docs/builds/images/android-build.png differ
diff --git a/azure-docs/builds/images/ios-build-step1.png b/azure-docs/builds/images/ios-build-step1.png
new file mode 100644
index 000000000..e19a7e803
Binary files /dev/null and b/azure-docs/builds/images/ios-build-step1.png differ
diff --git a/azure-docs/builds/images/ios-build-step2.png b/azure-docs/builds/images/ios-build-step2.png
new file mode 100644
index 000000000..04b747911
Binary files /dev/null and b/azure-docs/builds/images/ios-build-step2.png differ
diff --git a/azure-docs/builds/images/ios-build-step3.png b/azure-docs/builds/images/ios-build-step3.png
new file mode 100644
index 000000000..0744be5e7
Binary files /dev/null and b/azure-docs/builds/images/ios-build-step3.png differ
diff --git a/azure-docs/builds/images/ios-build.png b/azure-docs/builds/images/ios-build.png
new file mode 100644
index 000000000..35f25c29f
Binary files /dev/null and b/azure-docs/builds/images/ios-build.png differ
diff --git a/azure-docs/builds/xamarin-android.md b/azure-docs/builds/xamarin-android.md
new file mode 100644
index 000000000..1459f151e
--- /dev/null
+++ b/azure-docs/builds/xamarin-android.md
@@ -0,0 +1,95 @@
+# Xamarin Android Build
+
+Follow these steps to create a VSTS build for your eShopOnContainers app (android).
+
+**Note**: This document assumes basic knowledge about creating builds and configuring external VSTS connections
+
+## Creating the build
+
+Despite the _"Get Sources"_ task there are five tasks more in the build:
+
+1. Restore NuGet Packages
+2. Build Xamarin Android Project
+3. Download the certstore to sign the APK
+4. Sign the APK
+5. Publish the build artifact.
+
+
+
+Let's discuss each of them.
+
+### Restore NuGet Packages
+
+Add a "NuGet restore" task and enter the following configuration:
+
+1. Enter `eShopOnContainers-Android.sln` in "Path to solution, packages.config, or project.json". This sln is created ex professo for the build and contains only the Xamarin Android project plus the Xamarin Forms one.
+
+
+
+### Build the project
+
+Add a "Xamarin Android" task with following configuration:
+
+1. `**/*Droid*.csproj` in "Project"
+2. `$(build.binariesdirectory)/$(BuildConfiguration)` in "Output Directory"
+3. `$(BuildConfiguration)` in "Configuration"
+4. Ensure that the "Create App Package" checkbox is enabled
+5. In "JDK Options" be sure to select "JDK 8" in the "JDK Version" dropdown.
+
+
+
+### Download the keystore to sign the build
+
+** Note** This require you have a valid keystore. Refer to [this Xamarin article](https://developer.xamarin.com/guides/android/deployment,_testing,_and_metrics/publishing_an_application/part_2_-_signing_the_android_application_package/) for instructions on how create one, using Visual Studio and Xamarin. Or if you prefer, you can read [how use the Android SDK tools to create a keystore](https://developer.android.com/studio/publish/app-signing.html).
+
+This build assumes the keystore is stored somewhere in internet. Beware on where you store your keystores! Keem them safe and privately. Always consider other possible alternatives on where store the keycert:
+
+1. Store in the source control repository, **assuming it's private**. For public repositories this option is discarded
+2. Store in the build agent. If you use a custom VSTS build agent, store the keycert files locally in the agent. This is simple and secure.
+3. Store in internet. If this is the case, **protect the resource**. You can be forced to use this option if your repository is public *and* you use the VSTS hosted agent.
+
+Add a task "Download file" (**Note:** this task is installed [through a VSTS extension](https://marketplace.visualstudio.com/items?itemName=automagically.DownloadFile)) with following configuration:
+
+1. `$(keystore.url)$(keystore.name)` in "File URL"
+2. `$(Build.SourcesDirectory)` in "Destination Folder"
+
+Fill the "Credentials" section accordly.
+
+
+
+**Note:** You can, of course, use any other way to download the file (like a Powershell task).
+
+### Signing the APK
+
+Add a "Android Signing" task with following configuation:
+
+1. `$(build.binariesdirectory)/$(BuildConfiguration)/*.apk` in "APK Files"
+2. Ensure the checkbox "Sign the APK" is checked
+3. `$(Build.SourcesDirectory)\$(keystore.name)` in "Keystore file". This location has to be where the keystore is. If you downloaded it using a previous task (as our example), use the same value. If keystore is physically in the VSTS agent you can use the filepath.
+4. `$(keystore.pwd)` in "Keystore Password"
+5. `$(keystore.alias)` in "Keystore Alias"
+6. `$(key.pwd)` in "Key password".
+7. `-verbose` in "Jarsigner Arguments"
+7. Ensure the checkbox "Zipalign" is checked.
+
+
+
+### Publishing build artifact
+
+Add a "Publish Build Artifacts" task, with following configuration:
+
+1. `$(build.binariesdirectory)/$(BuildConfiguration)` in "Path to publish"
+2. `drop` in "Artifact Name"
+3. `Server` in "Artifact Type"
+
+
+
+## Variables
+
+You need to setup the following variables:
+
+1. `keystore.pwd` -> Password of the keystore
+2. `keystore.alias` -> Alias of the keystore
+3. `keystore.url` -> Full URL of the keystore
+4. `key.pwd` -> Password of the key
+
diff --git a/azure-docs/builds/xamarin-iOS.md b/azure-docs/builds/xamarin-iOS.md
new file mode 100644
index 000000000..a47a880f3
--- /dev/null
+++ b/azure-docs/builds/xamarin-iOS.md
@@ -0,0 +1,63 @@
+# Xamarin iOS Build
+
+Follow these steps to create a VSTS build for your eShopOnContainers app (iOS)
+
+**Note**: This document assumes basic knowledge about creating builds and configuring external VSTS connections
+
+## Creating the build
+
+Despite the _"Get Sources"_ task there are three tasks more in the build:
+
+1. Build Xamarin iOS Project
+2. Copy generated packages
+3. Publish the build artifact.
+
+
+
+Let's discuss each of them.
+
+### Build the project
+
+Add a "Xamarin iOS" task with following configuration:
+
+1. `eShopOnContainers-iOS.sln` in "Solution". This solution has been created ex professo for the build.
+2. Ensure that the "Create App Package" checkbox is enabled
+
+**About signing & Provisioning section**
+
+In order to deploy your app to a physical device you must sign it using a certificate with a provisioning profile. Refer to [this blog
+post of the Xamarin team](https://blog.xamarin.com/continuous-integration-for-ios-apps-with-visual-studio-team-services/) for more info.
+
+Basically you have three options for setting the certificate (p12 file) and the provisioning profile:
+
+1. Use MacInCloud VSTS agent and setup the p12 file and provisioning profile in the setup [https://blogs.msdn.microsoft.com/visualstudioalm/2015/11/18/macincloud-visual-studio-team-services-build-and-improvements-to-ios-build-support/](https://blogs.msdn.microsoft.com/visualstudioalm/2015/11/18/macincloud-visual-studio-team-services-build-and-improvements-to-ios-build-support/)
+2. Use a custom mac machine with the certificate and provisioning profile installed. In this case you don't have to do anything else.
+3. Have the p12 file and the provisioning profile reachable on somewhere
+
+If you choose option 3, you need to download the certificate and the provisioning profile into the build agent (using a previous build task).
+Once downloaded two files, you have to specify the location of both in the "Signing & Provisioning Section".
+
+
+
+### Copy generated files to output folder
+
+Add a "Copy files" task with following configuration:
+
+1. `src/Mobile/eShopOnContainers/eShopOnContainers.iOS/bin/iPhone/$(BuildConfiguration)` in "Source Folder"
+2. `**/*.ipa` in "Contents"
+3. `$(Build.ArtifactStagingDirectory)` in "Target Folder"
+4. Ensure that "Clean Target folder" (under "Advanced" section) is checked
+
+This way we copy the generated IPA in the _Build.ArtifactStagingDirectory_ folder (and remove any previous IPA generated by a previous build).
+
+
+
+### Publishing build artifact
+
+Add a "Publish Build Artifacts" task, with following configuration:
+
+1. `$(Build.ArtifactStagingDirectory)` in "Path to publish"
+2. `drop` in "Artifact Name"
+3. `Server` in "Artifact Type"
+
+
diff --git a/azure-docs/readme.md b/azure-docs/readme.md
new file mode 100644
index 000000000..f7a60b5b3
--- /dev/null
+++ b/azure-docs/readme.md
@@ -0,0 +1,6 @@
+# Azure Related Documentation
+
+## Builds and releases
+
+1. [VSTS build for Xamarin App (Android)](builds/xamarin-android.md)
+2. [VSTS build for Xamarin App (iOS)](builds/xamarin-iOS.md)
diff --git a/cli-linux/build-bits-linux.sh b/cli-linux/build-bits-linux.sh
index 7cda26d8c..cd8c7cc2e 100755
--- a/cli-linux/build-bits-linux.sh
+++ b/cli-linux/build-bits-linux.sh
@@ -1,12 +1,24 @@
#!/bin/bash
+
+declare -x path=$1
+
+if [ -z "$path" ]; then
+ $path="$(pwd)/../src";
+ echo -e "\e[33mNo path passed. Will use $path"
+fi
+
declare -a projectList=(
- '../src/Services/Catalog/Catalog.API'
- '../src/Services/Basket/Basket.API'
- '../src/Services/Ordering/Ordering.API'
- '../src/Services/Identity/Identity.API'
- '../src/Web/WebMVC'
- '../src/Web/WebSPA'
- '../src/Web/WebStatus'
+ "$path/Web/WebSPA"
+ "$path/Services/Catalog/Catalog.API"
+ "$path/Services/Basket/Basket.API"
+ "$path/Services/Ordering/Ordering.API"
+ "$path/Services/Identity/Identity.API"
+ "$path/Services/Location/Locations.API"
+ "$path/Services/Marketing/Marketing.API"
+ "$path/Services/Payment/Payment.API"
+ "$path/Services/GracePeriod/GracePeriodManager"
+ "$path/Web/WebMVC"
+ "$path/Web/WebStatus"
)
# Build SPA app
@@ -15,25 +27,26 @@ declare -a projectList=(
for project in "${projectList[@]}"
do
- echo -e "\e[33mWorking on $(pwd)/$project"
+ echo -e "\e[33mWorking on $path/$project"
echo -e "\e[33m\tRemoving old publish output"
- pushd $(pwd)/$project
+ pushd $path/$project
rm -rf obj/Docker/publish
- echo -e "\e[33m\tRestoring project"
+ echo -e "\e[33m\tRestoring project $project"
dotnet restore
- echo -e "\e[33m\tBuilding and publishing projects"
+ echo -e "\e[33m\tBuilding and publishing $project"
dotnet publish -o obj/Docker/publish
popd
done
-# remove old docker images:
-images=$(docker images --filter=reference="eshop/*" -q)
-if [ -n "$images" ]; then
- docker rm $(docker ps -a -q) -f
- echo "Deleting eShop images in local Docker repo"
- echo $images
- docker rmi $(docker images --filter=reference="eshop/*" -q) -f
-fi
+## remove old docker images:
+#images=$(docker images --filter=reference="eshop/*" -q)
+#if [ -n "$images" ]; then
+# docker rm $(docker ps -a -q) -f
+# echo "Deleting eShop images in local Docker repo"
+# echo $images
+# docker rmi $(docker images --filter=reference="eshop/*" -q) -f
+#fi
+
# No need to build the images, docker build or docker compose will
# do that using the images and containers defined in the docker-compose.yml file.
diff --git a/cli-linux/run.sh b/cli-linux/run.sh
new file mode 100644
index 000000000..aaeb164fa
--- /dev/null
+++ b/cli-linux/run.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+docker stop $(docker ps -a -q)
+docker rm $(docker ps -a -q)
+docker images |grep -v REPOSITORY|awk '{print $1}'|xargs -L1 docker pull
+export ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=$(curl ipinfo.io/ip)
+docker-compose -f docker-compose.images.yml -f docker-compose.prod.yml up -d --force-recreate
+
diff --git a/cli-windows/build-images.ps1 b/cli-windows/build-images.ps1
new file mode 100644
index 000000000..d454f3a14
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/deploy/az/azurefunctions/azurefunctionsdeploy.json b/deploy/az/azurefunctions/azurefunctionsdeploy.json
new file mode 100644
index 000000000..4143d73e5
--- /dev/null
+++ b/deploy/az/azurefunctions/azurefunctionsdeploy.json
@@ -0,0 +1,228 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "SitesEshopfunctionsName": {
+ "type": "string",
+ "metadata": {
+ "description": "Name of the Azure Functions namespace"
+ }
+ }
+ },
+ "variables": {
+ "SitesEshopfunctionsName": "[parameters('SitesEshopfunctionsName')]",
+ "WebConfigName": "[concat(variables('SitesEshopfunctionsName'), '/web')]",
+ "Location": "[resourceGroup().location]",
+ "EshopAccountsDatabase": "[concat(variables('SitesEshopfunctionsName'), 'db')]",
+ "ServerFarmPlan": "[concat(trim(variables('location')), 'Plan')]",
+ "StorageAccounts": "[concat(variables('SitesEshopfunctionsName'), 'st')]"
+ },
+ "resources": [
+ {
+ "type": "Microsoft.DocumentDB/databaseAccounts",
+ "kind": "GlobalDocumentDB",
+ "name": "[variables('EshopAccountsDatabase')]",
+ "apiVersion": "2015-04-08",
+ "location": "[variables('Location')]",
+ "tags": {},
+ "scale": null,
+ "properties": {
+ "databaseAccountOfferType": "Standard",
+ "consistencyPolicy": {
+ "defaultConsistencyLevel": "Session",
+ "maxIntervalInSeconds": 5,
+ "maxStalenessPrefix": 100
+ },
+ "name": null
+ },
+ "dependsOn": []
+ },
+ {
+ "type": "Microsoft.Storage/storageAccounts",
+ "sku": {
+ "name": "Standard_LRS",
+ "tier": "Standard"
+ },
+ "kind": "Storage",
+ "name": "[variables('StorageAccounts')]",
+ "apiVersion": "2016-01-01",
+ "location": "[variables('Location')]",
+ "tags": {},
+ "scale": null,
+ "properties": {},
+ "dependsOn": []
+ },
+ {
+ "type": "Microsoft.Web/serverfarms",
+ "sku": {
+ "name": "Y1",
+ "tier": "Dynamic",
+ "size": "Y1",
+ "family": "Y",
+ "capacity": 0
+ },
+ "kind": "functionapp",
+ "name": "[variables('ServerFarmPlan')]",
+ "apiVersion": "2015-08-01",
+ "location": "[variables('Location')]",
+ "scale": null,
+ "properties": {
+ "name": "[variables('ServerFarmPlan')]",
+ "numberOfWorkers": 0
+ },
+ "dependsOn": []
+ },
+ {
+ "type": "Microsoft.Web/sites",
+ "kind": "functionapp",
+ "name": "[variables('SitesEshopfunctionsName')]",
+ "apiVersion": "2015-08-01",
+ "location": "[variables('Location')]",
+ "scale": null,
+ "properties": {
+ "name": "[variables('SitesEshopfunctionsName')]",
+ "hostNames": [
+ "[concat(variables('SitesEshopfunctionsName'),'.azurewebsites.net')]"
+ ],
+ "enabledHostNames": [
+ "[concat(variables('SitesEshopfunctionsName'),'.azurewebsites.net')]",
+ "[concat(variables('SitesEshopfunctionsName'),'.scm.azurewebsites.net')]"
+ ],
+ "hostNameSslStates": [
+ {
+ "name": "[concat(variables('SitesEshopfunctionsName'),'.azurewebsites.net')]",
+ "sslState": 0,
+ "thumbprint": null,
+ "ipBasedSslState": 0
+ },
+ {
+ "name": "[concat(variables('SitesEshopfunctionsName'),'.scm.azurewebsites.net')]",
+ "sslState": 0,
+ "thumbprint": null,
+ "ipBasedSslState": 0
+ }
+ ],
+ "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('ServerFarmPlan'))]"
+ },
+ "dependsOn": [
+ "[resourceId('Microsoft.Web/serverfarms', variables('ServerFarmPlan'))]"
+ ]
+ },
+ {
+ "type": "Microsoft.Web/sites/config",
+ "name": "[variables('WebConfigName')]",
+ "apiVersion": "2015-08-01",
+ "location": "[variables('Location')]",
+ "scale": null,
+ "properties": {
+ "numberOfWorkers": 1,
+ "defaultDocuments": [
+ "Default.htm",
+ "Default.html",
+ "Default.asp",
+ "index.htm",
+ "index.html",
+ "iisstart.htm",
+ "default.aspx",
+ "index.php",
+ "hostingstart.html"
+ ],
+ "netFrameworkVersion": "v4.0",
+ "phpVersion": "5.6",
+ "pythonVersion": "",
+ "nodeVersion": "",
+ "linuxFxVersion": "",
+ "requestTracingEnabled": false,
+ "remoteDebuggingEnabled": false,
+ "remoteDebuggingVersion": null,
+ "httpLoggingEnabled": false,
+ "logsDirectorySizeLimit": 35,
+ "detailedErrorLoggingEnabled": false,
+ "publishingUsername": "$eshopfunctions",
+ "publishingPassword": null,
+ "appSettings": null,
+ "metadata": null,
+ "connectionStrings": null,
+ "machineKey": null,
+ "handlerMappings": null,
+ "documentRoot": null,
+ "scmType": "None",
+ "use32BitWorkerProcess": true,
+ "webSocketsEnabled": false,
+ "alwaysOn": false,
+ "javaVersion": null,
+ "javaContainer": null,
+ "javaContainerVersion": null,
+ "appCommandLine": "",
+ "managedPipelineMode": 0,
+ "virtualApplications": [
+ {
+ "virtualPath": "/",
+ "physicalPath": "site\\wwwroot",
+ "preloadEnabled": false,
+ "virtualDirectories": null
+ }
+ ],
+ "winAuthAdminState": 0,
+ "winAuthTenantState": 0,
+ "customAppPoolIdentityAdminState": false,
+ "customAppPoolIdentityTenantState": false,
+ "runtimeADUser": null,
+ "runtimeADUserPassword": null,
+ "loadBalancing": 1,
+ "routingRules": [],
+ "experiments": {
+ "rampUpRules": []
+ },
+ "limits": null,
+ "autoHealEnabled": false,
+ "autoHealRules": {
+ "triggers": null,
+ "actions": null
+ },
+ "tracingOptions": null,
+ "vnetName": "",
+ "siteAuthEnabled": false,
+ "siteAuthSettings": {
+ "enabled": null,
+ "unauthenticatedClientAction": null,
+ "tokenStoreEnabled": null,
+ "allowedExternalRedirectUrls": null,
+ "defaultProvider": null,
+ "clientId": null,
+ "clientSecret": null,
+ "issuer": null,
+ "allowedAudiences": null,
+ "additionalLoginParams": null,
+ "isAadAutoProvisioned": false,
+ "googleClientId": null,
+ "googleClientSecret": null,
+ "googleOAuthScopes": null,
+ "facebookAppId": null,
+ "facebookAppSecret": null,
+ "facebookOAuthScopes": null,
+ "twitterConsumerKey": null,
+ "twitterConsumerSecret": null,
+ "microsoftAccountClientId": null,
+ "microsoftAccountClientSecret": null,
+ "microsoftAccountOAuthScopes": null
+ },
+ "cors": {
+ "allowedOrigins": [
+ "https://functions.azure.com",
+ "https://functions-staging.azure.com",
+ "https://functions-next.azure.com"
+ ]
+ },
+ "push": null,
+ "apiDefinition": null,
+ "autoSwapSlotName": null,
+ "localMySqlEnabled": false,
+ "ipSecurityRestrictions": null
+ },
+ "dependsOn": [
+ "[resourceId('Microsoft.Web/sites', variables('SitesEshopfunctionsName'))]"
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/deploy/az/azurefunctions/azurefunctionsdeploy.parameters.json b/deploy/az/azurefunctions/azurefunctionsdeploy.parameters.json
new file mode 100644
index 000000000..8472e9998
--- /dev/null
+++ b/deploy/az/azurefunctions/azurefunctionsdeploy.parameters.json
@@ -0,0 +1,5 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {}
+}
\ No newline at end of file
diff --git a/deploy/az/azurefunctions/readme.md b/deploy/az/azurefunctions/readme.md
new file mode 100644
index 000000000..5716bf615
--- /dev/null
+++ b/deploy/az/azurefunctions/readme.md
@@ -0,0 +1,37 @@
+# Deploying Azure Functions
+
+The ARM template `azurefunctionsdeploy.json` and its parameter file (`azurefunctionsdeploy.parameters.json`) are used to deploy Marketing azure functions.
+
+## Editing azurefunctionsdeploy.parameters.json file
+
+You can edit the `azurefunctionsdeploy.parameters.parameters.json` file to set your values, but is not needed.
+
+## Deploy the template
+
+Once parameter file is edited you can deploy it using [create-resources script](../readme.md).
+
+i. e. if you are in windows, to deploy sql databases in a new resourcegroup located in westus, go to `deploy\az` folder and type:
+
+```
+create-resources.cmd azurefunctions\azurefunctionsdeploy newResourceGroup -c westus
+```
+## Deploy Marketing azure function with Visual Studio.
+
+Alternatively, instead of using ARM templates, you can deploy Marketing azure function directly by publishing the project Marketing-functions in eShopOnContainers-AzureFunctions.sln with Visual Studio publish tool.
+
+## Setting Azure function configurations
+
+Once deployed, go to azure portal and set the connection string for the azure function under the name "SqlConnection". The value must be the connection string which points to MarketingDB.
+
+Example:
+
+"SqlConnection": "Server=tcp:eshopsql.database.windows.net,1433;Initial Catalog=marketingdb;"
+
+In appsettings section, add a new entry named "MarketingStorageUri". The value must be the uri of the blob storage where the campaign images are stored.
+
+Example:
+
+"MarketingStorageUri": "https://marketingcampaign.blob.core.windows.net/pics/"
+
+
+
diff --git a/deploy/az/cosmos/deploycosmos.json b/deploy/az/cosmos/deploycosmos.json
new file mode 100644
index 000000000..8c03983a2
--- /dev/null
+++ b/deploy/az/cosmos/deploycosmos.json
@@ -0,0 +1,32 @@
+{
+ "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "name": {
+ "type": "String"
+ }
+ },
+ "variables": {
+ "name": "[concat(parameters('name'), uniqueString(resourceGroup().id))]",
+ "location":"[resourceGroup().location]"
+ },
+ "resources": [
+ {
+ "type": "Microsoft.DocumentDb/databaseAccounts",
+ "kind": "MongoDB",
+ "name": "[variables('name')]",
+ "apiVersion": "2015-04-08",
+ "location": "[variables('location')]",
+ "properties": {
+ "databaseAccountOfferType": "Standard",
+ "locations": [
+ {
+ "id": "[concat(variables('name'), '-', variables('location'))]",
+ "failoverPriority": 0,
+ "locationName": "[variables('location')]"
+ }
+ ]
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/deploy/az/cosmos/deploycosmos.parameters.json b/deploy/az/cosmos/deploycosmos.parameters.json
new file mode 100644
index 000000000..725bb7cf9
--- /dev/null
+++ b/deploy/az/cosmos/deploycosmos.parameters.json
@@ -0,0 +1,9 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "name": {
+ "value": "eshop-nosql"
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/create-resources.cmd b/deploy/az/create-resources.cmd
new file mode 100644
index 000000000..bd27efe3e
--- /dev/null
+++ b/deploy/az/create-resources.cmd
@@ -0,0 +1,23 @@
+@echo off
+if %1.==. GOTO error
+if %2.==. GOTO error
+if NOT %3.==-c. GOTO deployresources
+if %4.==. GOTO error
+echo Creating resource group %2 in '%4'
+call az group create --name %2 --location %4
+:deployresources
+echo Deploying ARM template '%1.json' in resource group %2
+call az group deployment create --resource-group %2 --parameters @%1.parameters.json --template-file %1.json
+GOTO end
+:error
+echo.
+echo Usage:
+echo create-resources arm-file resource-group-name [-c location]
+echo arm-file: Path to ARM template WITHOUT .json extension. An parameter file with same name plus '.parameters' MUST exist in same folde
+echo resource-grop-name: Name of the resource group to use or create
+echo -c: If appears means that resource group must be created. If -c is specified, must use enter location
+echo.
+echo Examples:
+echo create-resources path_and_filename testgroup (Deploys path_and_filename.json with parameters specified in path_and_filename.parameters.json file).
+echo create-resources path_and_filename newgroup -c westus (Deploys path_and_filename.json (with parameters specified in path_and_filename.parameters.json file) in a NEW resource group named newgroup in the westus location)
+:end
diff --git a/deploy/az/readme.md b/deploy/az/readme.md
new file mode 100644
index 000000000..cee4581cb
--- /dev/null
+++ b/deploy/az/readme.md
@@ -0,0 +1,20 @@
+# Deploying resources using create-resources script
+
+The `create-resources` script is a basic script to allow easy deployment of one ARM template in one resource group. You can deploy to an existing resource group or to create one.
+
+## Deploying to a existing resource group
+
+Just type `create-resources path-to-arm-template resourcegroup`. Called this way the script will:
+
+1. Search for `path-to-arm-template.json` and `path-to-arm-template.parameters.json` files
+2. If they exist, will deploy them in the `resourcegroup` specified (that has to exist).
+
+## Deploying to a new resource group
+
+Just type `create-resources path-to-arm-template resourcegroup -c location`. Called this way the script will:
+
+1. Search for `path-to-arm-template.json` and `path-to-arm-template.parameters.json` files
+2. If they exist, will create the `resourcegroup` specified in the `location` specified.
+3. Finally will deploy `path-to-arm-template.json` and `path-to-arm-template.parameters.json` files in the `resourcegroup`
+
+
diff --git a/deploy/az/redis/readme.md b/deploy/az/redis/readme.md
new file mode 100644
index 000000000..093a9af14
--- /dev/null
+++ b/deploy/az/redis/readme.md
@@ -0,0 +1,31 @@
+# Deploying Redis Cache
+
+The ARM template `redisdeploy.json` and its parameter file (`redisdeploy.parameters.json`) are used to deploy following resources:
+
+1. One Redis Cache
+
+## Editing sbusdeploy.parameters.json file
+
+You can edit the `redisdeploy.parameters.parameters.json` file to set your values, but is not needed. The only parameter than can
+be set is:
+
+1. `namespaceprefix` is a string that is used to create the Redis namespace. ARM script creates unique values by appending a unique string to this parameter value, so you can leave the default value.
+
+## Deploy the template
+
+Once parameter file is edited you can deploy it using [create-resources script](../readme.md).
+
+i. e. if you are in windows, to deploy sql databases in a new resourcegroup located in westus, go to `deploy\az` folder and type:
+
+```
+create-resources.cmd redis\redisdeploy newResourceGroup -c westus
+```
+
+
+
+
+
+
+
+
+
diff --git a/deploy/az/redis/redisdeploy.json b/deploy/az/redis/redisdeploy.json
new file mode 100644
index 000000000..04b53a3b6
--- /dev/null
+++ b/deploy/az/redis/redisdeploy.json
@@ -0,0 +1,42 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "namespaceprefix": {
+ "type": "string",
+ "metadata": {
+ "description": "Name of the Redis namespace"
+ }
+ }
+ },
+ "variables": {
+ "location": "[resourceGroup().location]",
+ "namespaceprefix": "[concat(parameters('namespaceprefix'), uniqueString(resourceGroup().id))]",
+ "sbVersion": "2016-04-01"
+ },
+ "resources": [
+ {
+ "type": "Microsoft.Cache/Redis",
+ "name": "[variables('namespaceprefix')]",
+ "apiVersion": "[variables('sbVersion')]",
+ "location": "[variables('location')]",
+ "scale": null,
+ "properties": {
+ "redisVersion": "3.2.7",
+ "sku": {
+ "name": "Standard",
+ "family": "C",
+ "capacity": 1
+ },
+ "enableNonSslPort": true,
+ "redisConfiguration": {
+ "maxclients": "1000",
+ "maxmemory-reserved": "50",
+ "maxfragmentationmemory-reserved": "50",
+ "maxmemory-policy": "volatile-lru",
+ "maxmemory-delta": "50"
+ }
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/deploy/az/redis/redisdeploy.parameters.json b/deploy/az/redis/redisdeploy.parameters.json
new file mode 100644
index 000000000..42d2e470e
--- /dev/null
+++ b/deploy/az/redis/redisdeploy.parameters.json
@@ -0,0 +1,9 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "namespaceprefix": {
+ "value": "eshopredis"
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/servicebus/readme.md b/deploy/az/servicebus/readme.md
new file mode 100644
index 000000000..3ed8e8a0e
--- /dev/null
+++ b/deploy/az/servicebus/readme.md
@@ -0,0 +1,33 @@
+# Deploying Azure Service Bus
+
+The ARM template `sbusdeploy.json` and its parameter file (`sbusdeploy.parameters.json`) are used to deploy following resources:
+
+1. One Service Bus namespace
+2. One Service Bus
+3. Subscriptions used by application
+
+## Editing sbusdeploy.parameters.json file
+
+You can edit the `sbusdeploy.parameters.parameters.json` file to set your values, but is not needed. The only parameter than can
+be set is:
+
+1. `namespaceprefix` is a string that is used to create the namespace. ARM script creates unique values by appending a unique string to this parameter value, so you can leave the default value.
+
+## Deploy the template
+
+Once parameter file is edited you can deploy it using [create-resources script](../readme.md).
+
+i. e. if you are in windows, to deploy sql databases in a new resourcegroup located in westus, go to `deploy\az` folder and type:
+
+```
+create-resources.cmd servicebus\sbusdeploy newResourceGroup -c westus
+```
+
+
+
+
+
+
+
+
+
diff --git a/deploy/az/servicebus/sbusdeploy.json b/deploy/az/servicebus/sbusdeploy.json
new file mode 100644
index 000000000..50c1c6c54
--- /dev/null
+++ b/deploy/az/servicebus/sbusdeploy.json
@@ -0,0 +1,229 @@
+{
+ "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "namespaceprefix": {
+ "type": "string",
+ "metadata": {
+ "description": "Name of the Service Bus namespace"
+ }
+ }
+ },
+ "variables": {
+ "serviceBusTopicName": "eshop_event_bus",
+ "BasketSubscriptionName": "Basket",
+ "CatalogSubscriptionName": "Catalog",
+ "OrderingSubscriptionName": "Ordering",
+ "LocationsSubscriptionName": "Locations",
+ "MarketingSubscriptionName": "Marketing",
+ "GracePeriodSubscriptionName": "GracePeriod",
+ "PaymentSubscriptionName": "Payment",
+ "location": "[resourceGroup().location]",
+ "sbVersion": "2015-08-01",
+ "defaultSASKeyName": "Root",
+ "namespace":"[concat(parameters('namespaceprefix'), uniqueString(resourceGroup().id))]",
+ "authRuleResourceId": "[resourceId('Microsoft.ServiceBus/namespaces/topics/authorizationRules', variables('namespace'), variables('serviceBusTopicName'), variables('defaultSASKeyName'))]"
+ },
+ "resources": [
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('namespace')]",
+ "type": "Microsoft.ServiceBus/Namespaces",
+ "location": "[variables('location')]",
+ "sku": {
+ "name": "Standard",
+ "tier": "Standard"
+ },
+ "resources": [
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('serviceBusTopicName')]",
+ "type": "Topics",
+ "dependsOn": [
+ "[concat('Microsoft.ServiceBus/namespaces/', variables('namespace'))]"
+ ],
+ "properties": {
+ "path": "[variables('serviceBusTopicName')]",
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "maxSizeInMegabytes": 1024,
+ "requiresDuplicateDetection": false,
+ "enableBatchedOperations": true,
+ "sizeInBytes": 0,
+ "filteringMessagesBeforePublishing": false,
+ "isAnonymousAccessible": false,
+ "status": "Active",
+ "supportOrdering": false,
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "enablePartitioning": true,
+ "isExpress": false,
+ "enableSubscriptionPartitioning": false,
+ "enableExpress": false
+ },
+ "resources": [
+ {
+ "type": "AuthorizationRules",
+ "name": "[variables('defaultSASKeyName')]",
+ "apiVersion": "[variables('sbVersion')]",
+ "properties": {
+ "rights": [
+ "Manage",
+ "Send",
+ "Listen"
+ ]
+ },
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ]
+ },
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('BasketSubscriptionName')]",
+ "type": "Subscriptions",
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ],
+ "properties": {
+ "lockDuration": "00:00:30",
+ "requiresSession": false,
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "deadLetteringOnMessageExpiration": true,
+ "deadLetteringOnFilterEvaluationExceptions": true,
+ "maxDeliveryCount": 10,
+ "enableBatchedOperations": false,
+ "status": "Active",
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "entityAvailabilityStatus": "Available"
+ }
+ },
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('OrderingSubscriptionName')]",
+ "type": "Subscriptions",
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ],
+ "properties": {
+ "lockDuration": "00:00:30",
+ "requiresSession": false,
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "deadLetteringOnMessageExpiration": true,
+ "deadLetteringOnFilterEvaluationExceptions": true,
+ "maxDeliveryCount": 10,
+ "enableBatchedOperations": false,
+ "status": "Active",
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "entityAvailabilityStatus": "Available"
+ }
+ },
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('CatalogSubscriptionName')]",
+ "type": "Subscriptions",
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ],
+ "properties": {
+ "lockDuration": "00:00:30",
+ "requiresSession": false,
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "deadLetteringOnMessageExpiration": true,
+ "deadLetteringOnFilterEvaluationExceptions": true,
+ "maxDeliveryCount": 10,
+ "enableBatchedOperations": false,
+ "status": "Active",
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "entityAvailabilityStatus": "Available"
+ }
+ },
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('LocationsSubscriptionName')]",
+ "type": "Subscriptions",
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ],
+ "properties": {
+ "lockDuration": "00:00:30",
+ "requiresSession": false,
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "deadLetteringOnMessageExpiration": true,
+ "deadLetteringOnFilterEvaluationExceptions": true,
+ "maxDeliveryCount": 10,
+ "enableBatchedOperations": false,
+ "status": "Active",
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "entityAvailabilityStatus": "Available"
+ }
+ },
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('MarketingSubscriptionName')]",
+ "type": "Subscriptions",
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ],
+ "properties": {
+ "lockDuration": "00:00:30",
+ "requiresSession": false,
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "deadLetteringOnMessageExpiration": true,
+ "deadLetteringOnFilterEvaluationExceptions": true,
+ "maxDeliveryCount": 10,
+ "enableBatchedOperations": false,
+ "status": "Active",
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "entityAvailabilityStatus": "Available"
+ }
+ },
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('GracePeriodSubscriptionName')]",
+ "type": "Subscriptions",
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ],
+ "properties": {
+ "lockDuration": "00:00:30",
+ "requiresSession": false,
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "deadLetteringOnMessageExpiration": true,
+ "deadLetteringOnFilterEvaluationExceptions": true,
+ "maxDeliveryCount": 10,
+ "enableBatchedOperations": false,
+ "status": "Active",
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "entityAvailabilityStatus": "Available"
+ }
+ },
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('PaymentSubscriptionName')]",
+ "type": "Subscriptions",
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ],
+ "properties": {
+ "lockDuration": "00:00:30",
+ "requiresSession": false,
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "deadLetteringOnMessageExpiration": true,
+ "deadLetteringOnFilterEvaluationExceptions": true,
+ "maxDeliveryCount": 10,
+ "enableBatchedOperations": false,
+ "status": "Active",
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "entityAvailabilityStatus": "Available"
+ }
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "outputs": {
+ "NamespaceConnectionString": {
+ "type": "string",
+ "value": "[listkeys(variables('authRuleResourceId'), variables('sbVersion')).primaryConnectionString]"
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/servicebus/sbusdeploy.parameters.json b/deploy/az/servicebus/sbusdeploy.parameters.json
new file mode 100644
index 000000000..f14b5329d
--- /dev/null
+++ b/deploy/az/servicebus/sbusdeploy.parameters.json
@@ -0,0 +1,9 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "namespaceprefix": {
+ "value": "eshopsb"
+ }
+ }
+}
diff --git a/deploy/az/sql/readme.md b/deploy/az/sql/readme.md
new file mode 100644
index 000000000..0359fb727
--- /dev/null
+++ b/deploy/az/sql/readme.md
@@ -0,0 +1,36 @@
+# Deploying SQL Server & SQL Databases
+
+The ARM template `sqldeploy.json` and its parameter file (`sqldeploy.parameters.json`) are used to deploy following resources:
+
+1. One SQL Server
+2. Three SQL databases (for ordering, catalog and identity) services.
+3. Firewall rules to **allow access from any IP to SQL Server**. This allows easy management, but is not desired in production environments.
+
+## Editing sqldeploy.parameters.json file
+
+You **must** edit the `sqldeploy.parameters.json` file to set login and password of the admin user.
+
+1. `sql_server` is a object parameter that contains the sql server name and the database names. You can leave default values if you want.
+2. `admin` is a string with the admin logon. You MUST provide a valid value
+3. `adminpwd` is a string with the admin password. You MUST provide a valid value
+
+ARM script ensures uniqueness of the SQL server created by appending one unique string in its name (defined in the `sql_server.name` parameter).
+
+## Deploy the template
+
+Once parameter file is edited you can deploy it using [create-resources script](../readme.md).
+i. e. if you are in windows, to deploy sql databases in a new resourcegroup located in westus, go to `deploy\az` folder and type:
+
+```
+create-resources.cmd sql\sqldeploy newResourceGroup -c westus
+```
+
+
+
+
+
+
+
+
+
+
diff --git a/deploy/az/sql/sqldeploy.json b/deploy/az/sql/sqldeploy.json
new file mode 100644
index 000000000..397c94ad6
--- /dev/null
+++ b/deploy/az/sql/sqldeploy.json
@@ -0,0 +1,123 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "sql_server": {
+ "type": "object"
+ },
+ "admin": {
+ "type": "string"
+ },
+ "adminpwd": {
+ "type": "string"
+ }
+ },
+ "variables": {
+ "sql_server_name": "[concat(parameters('sql_server').name, '-', uniqueString(resourceGroup().id))]",
+ "admin": "[parameters('admin')]",
+ "adminpwd": "[parameters('adminpwd')]"
+ },
+ "resources": [
+ {
+ "type": "Microsoft.Sql/servers",
+ "name": "[variables('sql_server_name')]",
+ "apiVersion": "2014-04-01-preview",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "administratorLogin": "[variables('admin')]",
+ "administratorLoginPassword": "[variables('adminpwd')]",
+ "version": "12.0"
+ },
+ "resources": [
+ {
+ "type": "databases",
+ "name": "[parameters('sql_server').dbs.ordering]",
+ "apiVersion": "2014-04-01-preview",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "edition": "Standard",
+ "collation": "SQL_Latin1_General_CP1_CI_AS",
+ "maxSizeBytes": "1073741824",
+ "requestedServiceObjectiveName": "S1"
+ },
+ "dependsOn": [
+ "[concat('Microsoft.Sql/servers/', variables('sql_server_name'))]"
+ ]
+ },
+ {
+ "type": "databases",
+ "name": "[parameters('sql_server').dbs.identity]",
+ "apiVersion": "2014-04-01-preview",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "edition": "Standard",
+ "collation": "SQL_Latin1_General_CP1_CI_AS",
+ "maxSizeBytes": "1073741824",
+ "requestedServiceObjectiveName": "S1"
+ },
+ "dependsOn": [
+ "[concat('Microsoft.Sql/servers/', variables('sql_server_name'))]"
+ ]
+ },
+ {
+ "type": "databases",
+ "name": "[parameters('sql_server').dbs.catalog]",
+ "apiVersion": "2014-04-01-preview",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "edition": "Standard",
+ "collation": "SQL_Latin1_General_CP1_CI_AS",
+ "maxSizeBytes": "1073741824",
+ "requestedServiceObjectiveName": "S1"
+ },
+ "dependsOn": [
+ "[concat('Microsoft.Sql/servers/', variables('sql_server_name'))]"
+ ]
+ },
+ {
+ "type": "databases",
+ "name": "[parameters('sql_server').dbs.marketing]",
+ "apiVersion": "2014-04-01-preview",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "edition": "Standard",
+ "collation": "SQL_Latin1_General_CP1_CI_AS",
+ "maxSizeBytes": "1073741824",
+ "requestedServiceObjectiveName": "S1"
+ },
+ "dependsOn": [
+ "[concat('Microsoft.Sql/servers/', variables('sql_server_name'))]"
+ ]
+ },
+ {
+ "type": "firewallrules",
+ "name": "AllowAllWindowsAzureIps",
+ "apiVersion": "2014-04-01-preview",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "startIpAddress": "0.0.0.0",
+ "endIpAddress": "0.0.0.0"
+ },
+ "dependsOn": [
+ "[concat('Microsoft.Sql/servers/', variables('sql_server_name'))]"
+ ]
+ },
+ {
+ "type": "firewallrules",
+ "name": "AllConnectionsAllowed",
+ "apiVersion": "2014-04-01-preview",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "startIpAddress": "0.0.0.0",
+ "endIpAddress": "255.255.255.255"
+ },
+ "dependsOn": [
+ "[concat('Microsoft.Sql/servers/', variables('sql_server_name'))]"
+ ]
+ }
+ ]
+ }
+ ],
+ "outputs": {
+ }
+}
diff --git a/deploy/az/sql/sqldeploy.parameters.json b/deploy/az/sql/sqldeploy.parameters.json
new file mode 100644
index 000000000..982e78f4c
--- /dev/null
+++ b/deploy/az/sql/sqldeploy.parameters.json
@@ -0,0 +1,23 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "sql_server": {
+ "value": {
+ "name": "eshopsql",
+ "dbs": {
+ "ordering": "orderingdb",
+ "identity": "identitydb",
+ "catalog": "catalogdb",
+ "marketing": "marketingdb"
+ }
+ }
+ },
+ "admin": {
+ "value": null
+ },
+ "adminpwd": {
+ "value": null
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/storage/catalog/deploystorage.json b/deploy/az/storage/catalog/deploystorage.json
new file mode 100644
index 000000000..e3fced6b2
--- /dev/null
+++ b/deploy/az/storage/catalog/deploystorage.json
@@ -0,0 +1,91 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "catalogstorage": {
+ "type": "string"
+ },
+ "profileName" : {
+ "type": "string"
+ }
+ },
+ "variables": {
+ "catalogstorage": "[concat(parameters('catalogstorage'), uniqueString(resourceGroup().id))]",
+ "endpointName": "[concat('endpoint-', uniqueString(resourceGroup().id))]",
+ "profileName": "[parameters('profileName')]"
+ },
+ "resources": [
+ {
+ "type": "Microsoft.Storage/storageAccounts",
+ "name": "[variables('catalogstorage')]",
+ "apiVersion": "2016-01-01",
+ "location": "[resourceGroup().location]",
+ "tags": {
+ "displayName": "[variables('catalogstorage')]"
+ },
+ "sku": {
+ "name": "Standard_LRS"
+ },
+ "kind": "Storage"
+ },
+ {
+ "name": "[variables('profileName')]",
+ "type": "Microsoft.Cdn/profiles",
+ "location": "[resourceGroup().location]",
+ "apiVersion": "2016-04-02",
+ "tags": {
+ "displayName": "[variables('profileName')]"
+ },
+ "sku": {
+ "name": "Standard_Verizon"
+ },
+ "resources": [
+ {
+ "apiVersion": "2016-04-02",
+ "name": "[variables('endpointName')]",
+ "type": "endpoints",
+ "dependsOn": [
+ "[variables('profileName')]",
+ "[variables('catalogstorage')]"
+ ],
+ "location": "[resourceGroup().location]",
+ "tags": {
+ "displayName": "[variables('endpointName')]"
+ },
+ "properties": {
+ "originHostHeader": "[replace(replace(reference(resourceId('Microsoft.Storage/storageAccounts', variables('catalogstorage')),'2015-06-15' ).primaryEndpoints.blob,'https://',''),'/','')]",
+ "isHttpAllowed": true,
+ "isHttpsAllowed": true,
+ "queryStringCachingBehavior": "IgnoreQueryString",
+ "contentTypesToCompress": [
+ "text/plain",
+ "text/html",
+ "text/css",
+ "application/x-javascript",
+ "text/javascript"
+ ],
+ "isCompressionEnabled": "True",
+ "origins": [
+ {
+ "name": "origin1",
+ "properties": {
+ "hostName": "[replace(replace(reference(resourceId('Microsoft.Storage/storageAccounts', variables('catalogstorage')),'2015-06-15' ).primaryEndpoints.blob,'https://',''),'/','')]"
+ }
+ }
+ ]
+ }
+ }
+ ]
+ }
+ ],
+ "outputs": {
+ "hostName": {
+ "type": "string",
+ "value": "[reference(resourceId('Microsoft.cdn/profiles/endpoints', variables('profileName'), variables('endpointName'))).hostName]"
+ },
+ "originHostHeader": {
+ "type": "string",
+ "value": "[reference(resourceId('Microsoft.cdn/profiles/endpoints', variables('profileName'), variables('endpointName'))).originHostHeader]"
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/storage/catalog/deploystorage.parameters.json b/deploy/az/storage/catalog/deploystorage.parameters.json
new file mode 100644
index 000000000..2c5256a09
--- /dev/null
+++ b/deploy/az/storage/catalog/deploystorage.parameters.json
@@ -0,0 +1,12 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "catalogstorage": {
+ "value": "catalog"
+ },
+ "profileName":{
+ "value": "eshopcatalog"
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/storage/marketing/deploystorage.json b/deploy/az/storage/marketing/deploystorage.json
new file mode 100644
index 000000000..cceb524d0
--- /dev/null
+++ b/deploy/az/storage/marketing/deploystorage.json
@@ -0,0 +1,91 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "marketingstorage": {
+ "type": "string"
+ },
+ "profileName" : {
+ "type": "string"
+ }
+ },
+ "variables": {
+ "marketingstorage": "[concat(parameters('marketingstorage'), uniqueString(resourceGroup().id))]",
+ "endpointName": "[concat('endpoint-', uniqueString(resourceGroup().id))]",
+ "profileName": "[parameters('profileName')]"
+ },
+ "resources": [
+ {
+ "type": "Microsoft.Storage/storageAccounts",
+ "name": "[variables('marketingstorage')]",
+ "apiVersion": "2016-01-01",
+ "location": "[resourceGroup().location]",
+ "tags": {
+ "displayName": "[variables('marketingstorage')]"
+ },
+ "sku": {
+ "name": "Standard_LRS"
+ },
+ "kind": "Storage"
+ },
+ {
+ "name": "[variables('profileName')]",
+ "type": "Microsoft.Cdn/profiles",
+ "location": "[resourceGroup().location]",
+ "apiVersion": "2016-04-02",
+ "tags": {
+ "displayName": "[variables('profileName')]"
+ },
+ "sku": {
+ "name": "Standard_Verizon"
+ },
+ "resources": [
+ {
+ "apiVersion": "2016-04-02",
+ "name": "[variables('endpointName')]",
+ "type": "endpoints",
+ "dependsOn": [
+ "[variables('profileName')]",
+ "[variables('marketingstorage')]"
+ ],
+ "location": "[resourceGroup().location]",
+ "tags": {
+ "displayName": "[variables('endpointName')]"
+ },
+ "properties": {
+ "originHostHeader": "[replace(replace(reference(resourceId('Microsoft.Storage/storageAccounts', variables('marketingstorage')),'2015-06-15' ).primaryEndpoints.blob,'https://',''),'/','')]",
+ "isHttpAllowed": true,
+ "isHttpsAllowed": true,
+ "queryStringCachingBehavior": "IgnoreQueryString",
+ "contentTypesToCompress": [
+ "text/plain",
+ "text/html",
+ "text/css",
+ "application/x-javascript",
+ "text/javascript"
+ ],
+ "isCompressionEnabled": "True",
+ "origins": [
+ {
+ "name": "origin1",
+ "properties": {
+ "hostName": "[replace(replace(reference(resourceId('Microsoft.Storage/storageAccounts', variables('marketingstorage')),'2015-06-15' ).primaryEndpoints.blob,'https://',''),'/','')]"
+ }
+ }
+ ]
+ }
+ }
+ ]
+ }
+ ],
+ "outputs": {
+ "hostName": {
+ "type": "string",
+ "value": "[reference(resourceId('Microsoft.cdn/profiles/endpoints', variables('profileName'), variables('endpointName'))).hostName]"
+ },
+ "originHostHeader": {
+ "type": "string",
+ "value": "[reference(resourceId('Microsoft.cdn/profiles/endpoints', variables('profileName'), variables('endpointName'))).originHostHeader]"
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/storage/marketing/deploystorage.parameters.json b/deploy/az/storage/marketing/deploystorage.parameters.json
new file mode 100644
index 000000000..1608fd34a
--- /dev/null
+++ b/deploy/az/storage/marketing/deploystorage.parameters.json
@@ -0,0 +1,12 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "marketingstorage": {
+ "value": "marketing"
+ },
+ "profileName":{
+ "value": "eshopmarketing"
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/vms/docker-machine.md b/deploy/az/vms/docker-machine.md
new file mode 100644
index 000000000..71cbbd4a7
--- /dev/null
+++ b/deploy/az/vms/docker-machine.md
@@ -0,0 +1,48 @@
+# Create a VM using docker-machine
+
+Ensure you are logged in the desired subscription Refer to [this article](https://docs.microsoft.com/en-us/cli/azure/authenticate-azure-cli) for more details.
+
+1. Use `az account show` to find your subscription id.
+2. Use `docker-machine create --driver azure --azure-subscription-id --azure-resource-group --azure-ssh-user `
+
+After use `docker-machine create` you'll need to authenticate in Azure (even thought if you are logged using `az`, because this is not an Azure CLI 2.0 command). This command will fully create the VM with all the needed settings to run Docker.
+
+**Note** Refer to this article with all the [parameters that docker-machine accepts when creating Azure VMs](https://docs.docker.com/machine/drivers/azure/#options) for finding more parameters.
+
+## Connecting your local environment with docker host running on the VM
+
+Using docker-machine you control the remote VM from your local development environment (you don't need to use ssh to login to remote VM).
+
+Connecting your local environment to a remote host is using by setting some environment variables, but the easiest way is to use again the docker-machine command. Just type `docker-machine env machine_name` (where machine_name is the name you gave when you created the VM). That command **do not change anything**, so do'nt do really nothing, but **outputs the environment variables you have to set**. This is the output of the command (running on a windows workstation):
+
+```
+SET DOCKER_TLS_VERIFY=1
+SET DOCKER_HOST=tcp://104.42.236.237:2376
+SET DOCKER_CERT_PATH=C:\Users\etoma\.docker\machine\machines\ufohost
+SET DOCKER_MACHINE_NAME=ufohost
+SET COMPOSE_CONVERT_WINDOWS_PATHS=true
+REM Run this command to configure your shell:
+REM @FOR /f "tokens=*" %i IN ('docker-machine env ufohost') DO @%i
+```
+
+You have to set all these environment variables, or (as the command suggest) just copy and paste the last line in your terminal.
+
+Once you did this, your local development machine is connected to VM running Docker on Azure: all docker and docker-compose commands will run in the VM instead of your local Docker machine!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/deploy/az/vms/linux-vm/linuxvm.json b/deploy/az/vms/linux-vm/linuxvm.json
new file mode 100644
index 000000000..5b4778ebe
--- /dev/null
+++ b/deploy/az/vms/linux-vm/linuxvm.json
@@ -0,0 +1,199 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "newStorageAccountName": {
+ "type": "string",
+ "metadata": {
+ "description": "Unique DNS Name for the Storage Account where the Virtual Machine's disks will be placed."
+ }
+ },
+ "adminUsername": {
+ "type": "string",
+ "metadata": {
+ "description": "Username for the Virtual Machine."
+ }
+ },
+ "adminPassword": {
+ "type": "securestring",
+ "metadata": {
+ "description": "Password for the Virtual Machine."
+ }
+ },
+ "dnsNameForPublicIP": {
+ "type": "string",
+ "metadata": {
+ "description": "Unique DNS Name for the Public IP used to access the Virtual Machine."
+ }
+ },
+ "ubuntuOSVersion": {
+ "type": "string",
+ "defaultValue": "14.04.4-LTS",
+ "metadata": {
+ "description": "The Ubuntu version for deploying the Docker containers. This will pick a fully patched image of this given Ubuntu version. Allowed values: 14.04.4-LTS, 15.10, 16.04.0-LTS"
+ },
+ "allowedValues": [
+ "14.04.4-LTS",
+ "15.10",
+ "16.04.0-LTS"
+ ]
+ },
+ "VMName": {
+ "type": "string",
+ "metadata": {
+ "description": "Name of VM in Azure"
+ }
+ }
+ },
+ "variables": {
+ "newStorageAccountName": "[take(concat(parameters('newStorageAccountName'), uniqueString(resourceGroup().id)), 23)]",
+ "dnsNameForPublicIP": "[concat(parameters('dnsNameForPublicIP'), uniqueString(resourceGroup().id))]",
+ "imagePublisher": "Canonical",
+ "imageOffer": "UbuntuServer",
+ "OSDiskName": "osdiskfordockersimple",
+ "nicName": "myVMNicD",
+ "extensionName": "DockerExtension",
+ "addressPrefix": "10.0.0.0/16",
+ "subnetName": "Subnet",
+ "subnetPrefix": "10.0.0.0/24",
+ "storageAccountType": "Standard_LRS",
+ "publicIPAddressName": "myPublicIPD",
+ "publicIPAddressType": "Dynamic",
+ "vmStorageAccountContainerName": "vhds",
+ "vmName": "[parameters('VMName')]",
+ "vmSize": "Standard_F1",
+ "virtualNetworkName": "MyVNETD",
+ "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
+ "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]"
+ },
+ "resources": [
+ {
+ "type": "Microsoft.Storage/storageAccounts",
+ "name": "[variables('newStorageAccountName')]",
+ "apiVersion": "2015-05-01-preview",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "accountType": "[variables('storageAccountType')]"
+ }
+ },
+ {
+ "apiVersion": "2015-05-01-preview",
+ "type": "Microsoft.Network/publicIPAddresses",
+ "name": "[variables('publicIPAddressName')]",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "publicIPAllocationMethod": "[variables('publicIPAddressType')]",
+ "dnsSettings": {
+ "domainNameLabel": "[variables('dnsNameForPublicIP')]"
+ }
+ }
+ },
+ {
+ "apiVersion": "2015-05-01-preview",
+ "type": "Microsoft.Network/virtualNetworks",
+ "name": "[variables('virtualNetworkName')]",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "addressSpace": {
+ "addressPrefixes": [
+ "[variables('addressPrefix')]"
+ ]
+ },
+ "subnets": [
+ {
+ "name": "[variables('subnetName')]",
+ "properties": {
+ "addressPrefix": "[variables('subnetPrefix')]"
+ }
+ }
+ ]
+ }
+ },
+ {
+ "apiVersion": "2015-05-01-preview",
+ "type": "Microsoft.Network/networkInterfaces",
+ "name": "[variables('nicName')]",
+ "location": "[resourceGroup().location]",
+ "dependsOn": [
+ "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]",
+ "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]"
+ ],
+ "properties": {
+ "ipConfigurations": [
+ {
+ "name": "ipconfig1",
+ "properties": {
+ "privateIPAllocationMethod": "Dynamic",
+ "publicIPAddress": {
+ "id": "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIPAddressName'))]"
+ },
+ "subnet": {
+ "id": "[variables('subnetRef')]"
+ }
+ }
+ }
+ ]
+ }
+ },
+ {
+ "apiVersion": "2015-05-01-preview",
+ "type": "Microsoft.Compute/virtualMachines",
+ "name": "[variables('vmName')]",
+ "location": "[resourceGroup().location]",
+ "dependsOn": [
+ "[concat('Microsoft.Storage/storageAccounts/', variables('newStorageAccountName'))]",
+ "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
+ ],
+ "properties": {
+ "hardwareProfile": {
+ "vmSize": "[variables('vmSize')]"
+ },
+ "osProfile": {
+ "computerName": "[variables('vmName')]",
+ "adminUsername": "[parameters('adminUsername')]",
+ "adminPassword": "[parameters('adminPassword')]"
+ },
+ "storageProfile": {
+ "imageReference": {
+ "publisher": "[variables('imagePublisher')]",
+ "offer": "[variables('imageOffer')]",
+ "sku": "[parameters('ubuntuOSVersion')]",
+ "version": "latest"
+ },
+ "osDisk": {
+ "name": "osdisk1",
+ "vhd": {
+ "uri": "[concat('http://',variables('newStorageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/',variables('OSDiskName'),'.vhd')]"
+ },
+ "caching": "ReadWrite",
+ "createOption": "FromImage"
+ }
+ },
+ "networkProfile": {
+ "networkInterfaces": [
+ {
+ "id": "[resourceId('Microsoft.Network/networkInterfaces',variables('nicName'))]"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "type": "Microsoft.Compute/virtualMachines/extensions",
+ "name": "[concat(variables('vmName'),'/', variables('extensionName'))]",
+ "apiVersion": "2015-05-01-preview",
+ "location": "[resourceGroup().location]",
+ "dependsOn": [
+ "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]"
+ ],
+ "properties": {
+ "publisher": "Microsoft.Azure.Extensions",
+ "type": "DockerExtension",
+ "typeHandlerVersion": "1.0",
+ "autoUpgradeMinorVersion": true,
+ "settings": { }
+ }
+ }
+ ]
+}
+
diff --git a/deploy/az/vms/linux-vm/linuxvm.parameters.json b/deploy/az/vms/linux-vm/linuxvm.parameters.json
new file mode 100644
index 000000000..d34dfd1d9
--- /dev/null
+++ b/deploy/az/vms/linux-vm/linuxvm.parameters.json
@@ -0,0 +1,7 @@
+{
+ "newStorageAccountName": { "value": "eshopsrvmvstorage" },
+ "adminUsername": { "value": "eshop" },
+ "adminPassword": { "value": "Pass@word" },
+ "dnsNameForPublicIP": { "value": "eshop-srv" },
+ "VMName": {"value": "MyDockerVM2"}
+}
diff --git a/deploy/az/vms/plain-vm.md b/deploy/az/vms/plain-vm.md
new file mode 100644
index 000000000..4e06ed0d3
--- /dev/null
+++ b/deploy/az/vms/plain-vm.md
@@ -0,0 +1,77 @@
+# Deploy a VM to run the services
+
+Follow these instructions to deploy a Linux-based VM with the Docker Host installed, or a VM with Windows Server 2016 plus
+windows containers and Docker Daemon.
+
+**Note**: Use this option, only if you want to provide an environment using images pulled from DockerHub (for example, to create a test environment). If you want to
+be able to deploy images built by yourself (but not pushed to DockerHub) follow the [instructions about using docker-machine](./docker-machine.md).
+
+You can use this machine to install the microservices and having a "development" environment (useful to develop and test the client apps).
+
+Please note that this deployment is not a production deployment. In a production-based scenario, you should deploy all containers in ACS.
+
+## Create the VM
+
+Ensure you are logged in the desired subscription (use `az login` and `az account set` if needed. Refer to [this article](https://docs.microsoft.com/en-us/cli/azure/authenticate-azure-cli) for more details.
+
+Go to `linux-vm` or `win-vm` folder (based on if you want a Linux or Windows VM). Then:
+
+1. Edit the file `linuxvm.parameters.json` or `windowsvm.parameters.json` (based on what VM do you want to create) with your desired values
+2. Run the [create-resources script](../readme.md) to deploy the desired template (`linux-vm/linuxvm.json` or `win-vm/windowsvm.json`).
+
+I. e. if you are in Windows and want to deploy a linux based VM, in a new resourcegroup located in westus, go to `deploy\az` folder and type:
+
+```
+create-resources.cmd vms\linux-vm\linuxvm newResourceGroup -c westus
+```
+
+**Note:** To avoid errors, ARM template used generates unique names for:
+
+1. VM used storage
+2. Public DNS
+
+Those public names are based on the parameters set in the parameters file.
+
+### The parameters file (linuxvm.parameters.json or winsowsvm.parameters.json)
+
+Both files are identical and contains the minimum set of parameters needed by the ARM template to deploy the VM. ARM template accepts some other parameters (set with default values). Look the template for more info.
+
+The parameters defined are:
+
+1. `newStorageAccountName`: Name of the storage created for the VM. To ensure uniqueness a unique suffix will be added to this value.
+2. `adminUsername`: Admin login
+3. `adminPassword`: Admin password
+4. `dnsNameForPublicIP`: DNS of the VM. To ensure uniqueness a unique suffix will be added to this value.
+5. `VMName`: Name of the VM inside Azure
+
+## Finding the IP and DNS of the VM
+
+To find the IP and FQDN of the VM you can type `az vm list --resource-group --output table --show-details` (where resourcegroup is the
+name of the resourcegroup where you created the VM). This command will generate output like:
+
+```
+Name ResourceGroup PowerState PublicIps Fqdns Location
+---------- --------------- ------------ ------------- ------------------------------------------------ ----------
+MyDockerVM MyResourceGroup VM running xx.xx.xxx.xxx eshop-srvxxxxxxxxxxxxx.westus.cloudapp.azure.com westus
+```
+
+You can use this information to connect your new VM.
+
+## Deploy services in the VM
+
+We are providing public images of the services in DockerHub (https://hub.docker.com/u/eshop/). To use these images, just create a folder in the VM and copy
+following files to it (those files are in the root of the repo):
+
+1. `docker-compose.nobuild.yml`
+2. `docker-compose.prod.yml`
+
+**Note:** The `docker-compose.nobuild.yml` is just a version of the `docker-compose.yml` without the `build` section. Is neede due [docker-compose bug](https://github.com/docker/compose/issues/2945).
+
+Then log into the VM and run the command `docker-compose -f docker-compose.nobuild.yml -f docker-compose.prod.yml up --no-build -d` to start all the microservices.
+
+
+
+
+
+
+
diff --git a/deploy/az/vms/readme.md b/deploy/az/vms/readme.md
new file mode 100644
index 000000000..25085f75c
--- /dev/null
+++ b/deploy/az/vms/readme.md
@@ -0,0 +1,10 @@
+## Create VM with Docker installed
+
+There are two options for creating VM machines with Docker installed:
+
+1. [Deploying a Linux VM to run single-server development environment using docker-machine (**Recommended for development environments**)](./docker-machine.md)
+2. [Deploying a Linux VM or Windows Server 2016 to run a single-server development environment using ARM template (**Recommended for creating testing environments**)](./plain-vm.md)
+
+If you want to create a VM for deploying images you build locally, then use the first option.
+
+If you want to create a VM to run images deployed to DockerHub (to provide some test environment) then use the second option.
\ No newline at end of file
diff --git a/deploy/az/vms/win-vm/windowsvm.json b/deploy/az/vms/win-vm/windowsvm.json
new file mode 100644
index 000000000..78bebdfef
--- /dev/null
+++ b/deploy/az/vms/win-vm/windowsvm.json
@@ -0,0 +1,290 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+
+ "VMName": {
+ "type": "string",
+ "metadata": {
+ "description": "This name will also be used to prefix the network security group, storage, virtual network, network card, subnet and public IP address name."
+ }
+ },
+
+ "adminUsername": {
+ "type": "string",
+ "metadata": {
+ "description": "Username for the Virtual Machine."
+ }
+ },
+
+ "adminPassword": {
+ "type": "securestring",
+ "metadata": {
+ "description": "Password for the Virtual Machine."
+ }
+ },
+
+ "dnsNameForPublicIP": {
+ "type": "string",
+ "metadata": {
+ "description": "Unique DNS Name for the Public IP used to access the Virtual Machine."
+ }
+ },
+
+ "newStorageAccountName": {
+ "type": "string",
+ "metadata": {
+ "description": "Storage name for the Virtual Machine."
+ }
+ },
+ "vmSize": {
+ "type": "string",
+ "defaultValue": "Standard_D1",
+ "metadata": {
+ "description": "VM Size"
+ }
+ }
+ },
+
+ "variables": {
+ "newStorageAccountName": "[take(concat(parameters('newStorageAccountName'), uniqueString(resourceGroup().id)), 23)]",
+ "dnsNameForPublicIP": "[concat(parameters('dnsNameForPublicIP'), uniqueString(resourceGroup().id))]",
+ "windowsOSVersion": "2016-Datacenter",
+ "imagePublisher": "MicrosoftWindowsServer",
+ "imageOffer": "WindowsServer",
+ "OSDiskName": "[concat(parameters('VMName'),'_osdisk')]",
+ "nicName": "[concat(parameters('VMName'),'_nic')]",
+ "addressPrefix": "10.0.0.0/16",
+ "subnetName": "[concat(parameters('VMName'),'_subnet')]",
+ "subnetPrefix": "10.0.0.0/24",
+ "networkSecurityGroupName": "[concat(parameters('VMName'),'_nsg')]",
+ "storageAccountType": "Standard_LRS",
+ "publicIPAddressName": "[concat(parameters('VMName'),'_pubip')]",
+ "publicIPAddressType": "Dynamic",
+ "vmStorageAccountContainerName": "vhds",
+ "apiVersion": "2015-05-01-preview",
+ "virtualNetworkName": "[concat(parameters('VMName'),'_vnet')]",
+ "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
+ "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]"
+ },
+ "resources": [
+ {
+ "type": "Microsoft.Network/networkSecurityGroups",
+ "name": "[variables('networkSecurityGroupName')]",
+ "apiVersion": "[variables('apiVersion')]",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "securityRules": [
+ {
+ "name": "HTTP",
+ "properties": {
+ "description": "HTTP",
+ "protocol": "Tcp",
+ "sourcePortRange": "*",
+ "destinationPortRange": "80",
+ "sourceAddressPrefix": "*",
+ "destinationAddressPrefix": "*",
+ "access": "Allow",
+ "priority": 100,
+ "direction": "Inbound"
+ }
+ },
+
+ {
+ "name": "RDP",
+ "properties": {
+ "description": "RDP",
+ "protocol": "Tcp",
+ "sourcePortRange": "*",
+ "destinationPortRange": "3389",
+ "sourceAddressPrefix": "*",
+ "destinationAddressPrefix": "*",
+ "access": "Allow",
+ "priority": 200,
+ "direction": "Inbound"
+ }
+ },
+
+ {
+ "name": "Docker",
+ "properties": {
+ "description": "Docker",
+ "protocol": "Tcp",
+ "sourcePortRange": "*",
+ "destinationPortRange": "2375",
+ "sourceAddressPrefix": "*",
+ "destinationAddressPrefix": "*",
+ "access": "Allow",
+ "priority": 300,
+ "direction": "Inbound"
+ }
+ }
+
+ ]
+ }
+ },
+
+ {
+ "type": "Microsoft.Storage/storageAccounts",
+ "name": "[variables('newStorageAccountName')]",
+ "apiVersion": "[variables('apiVersion')]",
+ "location": "[resourceGroup().location]",
+ "tags": {
+ "displayName": "StorageAccount"
+ },
+ "properties": {
+ "accountType": "[variables('storageAccountType')]"
+ }
+ },
+
+ {
+ "apiVersion": "[variables('apiVersion')]",
+ "type": "Microsoft.Network/publicIPAddresses",
+ "name": "[variables('publicIPAddressName')]",
+ "location": "[resourceGroup().location]",
+ "tags": {
+ "displayName": "PublicIPAddress"
+ },
+ "properties": {
+ "publicIPAllocationMethod": "[variables('publicIPAddressType')]",
+ "dnsSettings": {
+ "domainNameLabel": "[tolower(variables('dnsNameForPublicIP'))]"
+ }
+ }
+ },
+
+ {
+ "apiVersion": "[variables('apiVersion')]",
+ "type": "Microsoft.Network/virtualNetworks",
+ "name": "[variables('virtualNetworkName')]",
+ "location": "[resourceGroup().location]",
+ "dependsOn": [
+ "[concat('Microsoft.Network/networkSecurityGroups/', variables('networkSecurityGroupName'))]"
+ ],
+ "tags": {
+ "displayName": "VirtualNetwork"
+ },
+ "properties": {
+ "addressSpace": {
+ "addressPrefixes": [
+ "[variables('addressPrefix')]"
+ ]
+ },
+ "subnets": [
+ {
+ "name": "[variables('subnetName')]",
+ "properties": {
+ "addressPrefix": "[variables('subnetPrefix')]",
+ "networkSecurityGroup": {
+ "id": "[resourceId('Microsoft.Network/networkSecurityGroups', variables('networkSecurityGroupName'))]"
+ }
+ }
+ }
+ ]
+ }
+ },
+
+ {
+ "apiVersion": "[variables('apiVersion')]",
+ "type": "Microsoft.Network/networkInterfaces",
+ "name": "[variables('nicName')]",
+ "location": "[resourceGroup().location]",
+ "tags": {
+ "displayName": "NetworkInterface"
+ },
+ "dependsOn": [
+ "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]",
+ "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]"
+ ],
+ "properties": {
+ "ipConfigurations": [
+ {
+ "name": "ipconfig1",
+ "properties": {
+ "privateIPAllocationMethod": "Dynamic",
+ "publicIPAddress": {
+ "id": "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIPAddressName'))]"
+ },
+ "subnet": {
+ "id": "[variables('subnetRef')]"
+ }
+ }
+ }
+ ]
+ }
+ },
+
+ {
+ "apiVersion": "[variables('apiVersion')]",
+ "type": "Microsoft.Compute/virtualMachines",
+ "name": "[parameters('VMName')]",
+ "location": "[resourceGroup().location]",
+ "tags": {
+ "displayName": "VirtualMachine"
+ },
+ "dependsOn": [
+ "[concat('Microsoft.Storage/storageAccounts/', variables('newStorageAccountName'))]",
+ "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
+ ],
+ "properties": {
+ "hardwareProfile": {
+ "vmSize": "[parameters('vmSize')]"
+ },
+ "osProfile": {
+ "computername": "[parameters('VMName')]",
+ "adminUsername": "[parameters('adminUsername')]",
+ "adminPassword": "[parameters('adminPassword')]"
+ },
+ "storageProfile": {
+ "imageReference": {
+ "publisher": "[variables('imagePublisher')]",
+ "offer": "[variables('imageOffer')]",
+ "sku": "[variables('windowsOSVersion')]",
+ "version": "latest"
+ },
+ "osDisk": {
+ "name": "osdisk",
+ "vhd": {
+ "uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('newStorageAccountName')), variables('apiVersion')).primaryEndpoints.blob, variables('vmStorageAccountContainerName'),'/',variables('OSDiskName'),'.vhd')]"
+ },
+ "caching": "ReadWrite",
+ "createOption": "FromImage"
+ }
+ },
+ "networkProfile": {
+ "networkInterfaces": [
+ {
+ "id": "[resourceId('Microsoft.Network/networkInterfaces',variables('nicName'))]"
+ }
+ ]
+ }
+ },
+ "resources": [
+ {
+ "name": "containerConfiguration",
+ "type": "extensions",
+ "location": "[resourceGroup().location]",
+ "apiVersion": "2015-06-15",
+ "dependsOn": [
+ "[concat('Microsoft.Compute/virtualMachines/', parameters('VMName'))]"
+ ],
+ "tags": {
+ "displayName": "containerConfiguration"
+ },
+ "properties": {
+ "publisher": "Microsoft.Compute",
+ "type": "CustomScriptExtension",
+ "typeHandlerVersion": "1.2",
+ "autoUpgradeMinorVersion": true,
+ "settings": {
+ "fileUris": [
+ "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/windows-server-containers-preview/azure-containers.ps1"
+ ],
+ "commandToExecute": "[concat('powershell.exe -ExecutionPolicy Unrestricted -File azure-containers.ps1 -adminuser ',parameters('adminUsername'))]"
+ }
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/deploy/az/vms/win-vm/windowsvm.parameters.json b/deploy/az/vms/win-vm/windowsvm.parameters.json
new file mode 100644
index 000000000..7a2773a54
--- /dev/null
+++ b/deploy/az/vms/win-vm/windowsvm.parameters.json
@@ -0,0 +1,7 @@
+{
+ "newStorageAccountName": { "value": "eshopsrvmvstoragewin" },
+ "adminUsername": { "value": "eshop" },
+ "adminPassword": { "value": "Pass@word" },
+ "dnsNameForPublicIP": { "value": "eshop-srv-win" },
+ "VMName": {"value": "eshop-srv-win"}
+}
diff --git a/deploy/readme.md b/deploy/readme.md
new file mode 100644
index 000000000..7d760c6bd
--- /dev/null
+++ b/deploy/readme.md
@@ -0,0 +1,27 @@
+# Deploying Resources On Azure
+
+## Pre-requisites
+1. [Azure CLI 2.0 Installed](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli)
+2. Azure subscription created
+
+Login into your azure subscription by typing `az login` (note that you maybe need to use `az account set` to set the subscription to use). Refer to [this article](https://docs.microsoft.com/en-us/cli/azure/authenticate-azure-cli) for more details
+
+## Deploying using CLI
+
+## Deploying Virtual machines to host the services
+
+1. [Deploying a Linux VM to run single-server development environment using docker-machine (**Recommended for development environments**)](az/vms/docker-machine.md)
+2. [Deploying a Linux VM or Windows Server 2016 to run a single-server development environment using ARM template (**Recommended for creating testing environments**)](az/vms/plain-vm.md)
+
+Using `docker-machine` is the recommended way to create a VM with docker installed. But it is limited to Linux based VMs.
+
+## Deploying Azure resources used by the services
+
+1. [Deploying SQL Server and databases](az/sql/readme.md)
+2. [Deploying Azure Service Bus](az/servicebus/readme.md)
+3. [Deploying Redis Cache](az/redis/readme.md)
+
+
+
+
+
diff --git a/docker-compose-external.yml b/docker-compose-external.yml
index ff1641cdd..8d8d61add 100644
--- a/docker-compose-external.yml
+++ b/docker-compose-external.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
services:
sql.data:
diff --git a/docker-compose-windows.override.yml b/docker-compose-windows.override.yml
index 45b2db748..738549e7e 100644
--- a/docker-compose-windows.override.yml
+++ b/docker-compose-windows.override.yml
@@ -95,4 +95,16 @@ services:
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
- EventBusConnection=rabbitmq
ports:
- - "5109:80"
\ No newline at end of file
+ - "5109:80"
+
+ marketing.api:
+ environment:
+ - ASPNETCORE_ENVIRONMENT=Development
+ - ASPNETCORE_URLS=http://0.0.0.0:80
+ - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word
+ - EventBusConnection=rabbitmq
+ - MongoConnectionString=mongodb://nosql.data
+ - MongoDatabase=MarketingDb
+ - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
+ ports:
+ - "5110:80"
\ No newline at end of file
diff --git a/docker-compose-windows.prod.yml b/docker-compose-windows.prod.yml
index 7b9c9ab22..4767bba70 100644
--- a/docker-compose-windows.prod.yml
+++ b/docker-compose-windows.prod.yml
@@ -75,7 +75,19 @@ services:
- BasketUrl=http://basket.api
ports:
- "5100:80"
-
+
+ marketing.api:
+ environment:
+ - ASPNETCORE_ENVIRONMENT=Production
+ - ASPNETCORE_URLS=http://0.0.0.0:80
+ - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word
+ - EventBusConnection=rabbitmq
+ - MongoConnectionString=mongodb://nosql.data
+ - MongoDatabase=MarketingDb
+ - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
+ ports:
+ - "5110:80"
+
sql.data:
environment:
- SA_PASSWORD=Pass@word
diff --git a/docker-compose-windows.yml b/docker-compose-windows.yml
index 2caf209ab..5a7e3ff16 100644
--- a/docker-compose-windows.yml
+++ b/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,13 +55,25 @@ services:
- basket.api
locations.api:
- image: locations.api
+ image: eshop/locations.api:${TAG:-latest}
build:
context: ./src/Services/Location/Locations.API
dockerfile: Dockerfile
depends_on:
- nosql.data
-
+ - rabbitmq
+
+ marketing.api:
+ image: eshop/marketing.api:${TAG:-latest}
+ build:
+ context: ./src/Services/Marketing/Marketing.API
+ dockerfile: Dockerfile
+ depends_on:
+ - sql.data
+ - nosql.data
+ - identity.api
+ - rabbitmq
+
sql.data:
image: microsoft/mssql-server-windows
diff --git a/docker-compose.ci.build.yml b/docker-compose.ci.build.yml
index 86c32ccfb..db2ef5390 100644
--- a/docker-compose.ci.build.yml
+++ b/docker-compose.ci.build.yml
@@ -1,10 +1,14 @@
-version: '2'
+version: '2.1'
services:
ci-build:
image: microsoft/aspnetcore-build:1.1.2
volumes:
- .:/src
+ - ./cli-linux:/cli-linux
working_dir: /src
- command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish"
+# DO NOT USE the sln file to compile because msbuild issue (https://github.com/Microsoft/msbuild/issues/2153)
+# command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish"
+# NOTE: Using build-bits-linux.sh triggers the same MSBUILD error :( (but at least, less frequently)
+ command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && pushd /cli-linux && ./build-bits-linux.sh /src"
\ No newline at end of file
diff --git a/docker-compose.dcproj b/docker-compose.dcproj
index f7f04c5b4..92590035d 100644
--- a/docker-compose.dcproj
+++ b/docker-compose.dcproj
@@ -5,6 +5,8 @@
Truehttp://localhost:5100webmvc
+ Linux
+ 2.0
@@ -14,7 +16,7 @@
docker-compose.yml
-
+ docker-compose.yml
diff --git a/docker-compose.nobuild.yml b/docker-compose.nobuild.yml
index f74aa9c14..0905f9799 100644
--- a/docker-compose.nobuild.yml
+++ b/docker-compose.nobuild.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
services:
basket.api:
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 94bbfef83..1095691dc 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
# The default docker-compose.override file can use the "localhost" as the external name for testing web apps within the same dev machine.
# The ESHOP_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like:
@@ -7,14 +7,21 @@ version: '2'
# An external IP or DNS name has to be used (instead localhost and the 10.0.75.1 IP) when testing the Web apps and the Xamarin apps from remote machines/devices using the same WiFi, for instance.
services:
-
+ graceperiodmanager:
+ environment:
+ - ASPNETCORE_ENVIRONMENT=Development
+ - ASPNETCORE_URLS=http://0.0.0.0:80
+ - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+
basket.api:
environment:
- ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80
- - ConnectionString=basket.data
- - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
- - EventBusConnection=rabbitmq
+ - ConnectionString=${ESHOP_AZURE_REDIS_BASKET_DB:-basket.data}
+ - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
+ - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
ports:
- "5103:80"
@@ -22,9 +29,12 @@ services:
environment:
- ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80
- - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
- - ExternalCatalogBaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
- - EventBusConnection=rabbitmq
+ - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
+ - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG:-http://localhost:5101/api/v1/catalog/items/[0]/pic/} #Local: You need to open your local dev-machine firewall at range 5100-5110.
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+ - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME}
+ - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_CATALOG_KEY}
+ - UseCustomizationData=True
ports:
- "5101:80"
@@ -34,8 +44,13 @@ services:
- ASPNETCORE_URLS=http://0.0.0.0:80
- SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104
- XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback #localhost do not work for UWP login, so we have to use "external" IP always
- - ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word
- - MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100 #Local: You need to open your local dev-machine firewall at range 5100-5105.
+ - ConnectionStrings__DefaultConnection=${ESHOP_AZURE_IDENTITY_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word}
+ - MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100 #Local: You need to open your local dev-machine firewall at range 5100-5110.
+ - LocationApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5109
+ - 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
+ - UseCustomizationData=True
ports:
- "5105:80"
@@ -43,9 +58,11 @@ services:
environment:
- ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80
- - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
- - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
- - EventBusConnection=rabbitmq
+ - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
+ - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
+ - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+ - UseCustomizationData=True
ports:
- "5102:80"
@@ -53,11 +70,19 @@ services:
environment:
- ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80
- - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word
- - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
+ - ConnectionString=${ESHOP_AZURE_MARKETING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word}
+ - MongoConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data}
+ - MongoDatabase=MarketingDb
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+ - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
+ - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
+ - CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI}
+ - PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING:-http://localhost:5110/api/v1/campaigns/[0]/pic/}
+ - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_MARKETING_NAME}
+ - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_MARKETING_KEY}
ports:
- "5110:80"
-
+
webspa:
environment:
- ASPNETCORE_ENVIRONMENT=Development
@@ -66,10 +91,13 @@ services:
- 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.
- BasketUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103
+ - MarketingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110
- 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.
- BasketUrlHC=http://basket.api/hc
+ - MarketingUrlHC=http://marketing.api/hc
+ - UseCustomizationData=True
ports:
- "5104:80"
@@ -80,8 +108,10 @@ services:
- CatalogUrl=http://catalog.api
- OrderingUrl=http://ordering.api
- BasketUrl=http://basket.api
- - IdentityUrl=http://10.0.75.1:5105 #Local: Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser.
+ - IdentityUrl=http://10.0.75.1:5105
+ - MarketingUrl=http://marketing.api #Local: Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser.
#Remote: Use ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser.
+ - UseCustomizationData=True
ports:
- "5100:80"
@@ -104,18 +134,29 @@ services:
- OrderingUrl=http://ordering.api/hc
- BasketUrl=http://basket.api/hc
- IdentityUrl=http://identity.api/hc
+ - LocationsUrl=http://locations.api/hc
+ - MarketingUrl=http://marketing.api/hc
- mvc=http://webmvc/hc
- spa=http://webspa/hc
ports:
- "5107:80"
+ payment.api:
+ environment:
+ - ASPNETCORE_ENVIRONMENT=Development
+ - ASPNETCORE_URLS=http://0.0.0.0:80
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+ ports:
+ - "5108:80"
+
locations.api:
environment:
- ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80
- - ConnectionString=mongodb://nosql.data
+ - ConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data}
- Database=LocationsDb
- - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
- - EventBusConnection=rabbitmq
+ - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
+ - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
ports:
- - "5109:80"
\ No newline at end of file
+ - "5109:80"
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index b9c46b4c2..fa2f1ccd8 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
# The Production docker-compose file has to have the external/real IPs or DNS names for the services
# The ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like:
@@ -12,24 +12,33 @@ version: '2'
# docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
services:
+ graceperiodmanager:
+ environment:
+ - ASPNETCORE_ENVIRONMENT=Production
+ - ASPNETCORE_URLS=http://0.0.0.0:80
+ - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
basket.api:
environment:
- ASPNETCORE_ENVIRONMENT=Production
- ASPNETCORE_URLS=http://0.0.0.0:80
- - ConnectionString=basket.data
- - identityUrl=http://identity.api #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105.
- - EventBusConnection=rabbitmq
+ - ConnectionString=${ESHOP_AZURE_REDIS_BASKET_DB:-basket.data}
+ - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
ports:
- "5103:80"
catalog.api:
environment:
- ASPNETCORE_ENVIRONMENT=Production
- - ASPNETCORE_URLS=http://0.0.0.0:80
- - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
- - ExternalCatalogBaseUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101 #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105.
- - EventBusConnection=rabbitmq
+ ASPNETCORE_URLS=http://0.0.0.0:80
+ - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
+ - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG} #Local: You need to open your local dev-machine firewall at range 5100-5110.
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+ - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME}
+ - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_CATALOG_KEY}
+ - UseCustomizationData=True
ports:
- "5101:80"
@@ -38,9 +47,10 @@ services:
- ASPNETCORE_ENVIRONMENT=Production
- ASPNETCORE_URLS=http://0.0.0.0:80
- SpaClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5104
- - ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word
- - MvcClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5100 #Local: You need to open your host's firewall at range 5100-5105.
+ - ConnectionStrings__DefaultConnection=${ESHOP_AZURE_IDENTITY_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word}
+ - MvcClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5100 #Local: You need to open your host's firewall at range 5100-5110.
- XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback
+ - UseCustomizationData=True
ports:
- "5105:80"
@@ -48,9 +58,10 @@ services:
environment:
- ASPNETCORE_ENVIRONMENT=Production
- ASPNETCORE_URLS=http://0.0.0.0:80
- - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
- - identityUrl=http://identity.api #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105.
- - EventBusConnection=rabbitmq
+ - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
+ - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+ - UseCustomizationData=True
ports:
- "5102:80"
@@ -58,8 +69,15 @@ services:
environment:
- ASPNETCORE_ENVIRONMENT=Production
- ASPNETCORE_URLS=http://0.0.0.0:80
- - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word
- - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
+ - ConnectionString=${ESHOP_AZURE_MARKETING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word}
+ - MongoConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data}
+ - MongoDatabase=MarketingDb
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+ - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
+ - CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI}
+ - PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING}
+ - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_MARKETING_NAME}
+ - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_MARKETING_KEY}
ports:
- "5110:80"
@@ -69,12 +87,14 @@ services:
- ASPNETCORE_URLS=http://0.0.0.0:80
- CatalogUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101
- OrderingUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5102
- - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105.
+ - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: You need to open your host's firewall at range 5100-5110.
- BasketUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5103
- 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.
- BasketUrlHC=http://basket.api/hc
+ - MarketingUrlHC=http://marketing.api/hc
+ - UseCustomizationData=True
ports:
- "5104:80"
@@ -86,6 +106,7 @@ services:
- OrderingUrl=http://ordering.api
- IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
- BasketUrl=http://basket.api
+ - MarketingUrl=http://marketing.api
ports:
- "5100:80"
@@ -96,6 +117,10 @@ services:
ports:
- "5433:1433"
+ nosql.data:
+ ports:
+ - "27017:27017"
+
webstatus:
environment:
- ASPNETCORE_ENVIRONMENT=Production
@@ -103,9 +128,30 @@ services:
- CatalogUrl=http://catalog.api/hc
- OrderingUrl=http://ordering.api/hc
- BasketUrl=http://basket.api/hc
- - IdentityUrl=http://identity.api/hc
+ - IdentityUrl=http://identity.api/hc
+ - LocationsUrl=http://locations.api/hc
+ - MarketingUrl=http://marketing.api/hc
- mvc=http://webmvc/hc
- spa=http://webspa/hc
ports:
- - "5107:80"
\ No newline at end of file
+ - "5107:80"
+
+ payment.api:
+ environment:
+ - ASPNETCORE_ENVIRONMENT=Production
+ - ASPNETCORE_URLS=http://0.0.0.0:5108
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+ ports:
+ - "5108:80"
+
+ locations.api:
+ environment:
+ - ASPNETCORE_ENVIRONMENT=Production
+ - ASPNETCORE_URLS=http://0.0.0.0:80
+ - ConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data}
+ - Database=LocationsDb
+ - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
+ - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+ ports:
+ - "5109:80"
\ No newline at end of file
diff --git a/docker-compose.vs.debug.yml b/docker-compose.vs.debug.yml
index c2e5e4a06..9c4879f61 100644
--- a/docker-compose.vs.debug.yml
+++ b/docker-compose.vs.debug.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
services:
basket.api:
@@ -122,6 +122,34 @@ services:
labels:
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
+ payment.api:
+ image: eshop/payment.api:dev
+ build:
+ args:
+ source: ${DOCKER_BUILD_SOURCE}
+ environment:
+ - DOTNET_USE_POLLING_FILE_WATCHER=1
+ volumes:
+ - ./src/Services/Payment/Payment.API:/app
+ - ~/.nuget/packages:/root/.nuget/packages:ro
+ - ~/clrdbg:/clrdbg:ro
+ entrypoint: tail -f /dev/null
+ labels:
+ - "com.microsoft.visualstudio.targetoperatingsystem=linux"
+
+ graceperiodmanager:
+ image: eshop/graceperiodmanager:dev
+ build:
+ args:
+ source: ${DOCKER_BUILD_SOURCE}
+ volumes:
+ - ./src/Services/GracePeriod/GracePeriodManager:/app
+ - ~/.nuget/packages:/root/.nuget/packages:ro
+ - ~/clrdbg:/clrdbg:ro
+ entrypoint: tail -f /dev/null
+ labels:
+ - "com.microsoft.visualstudio.targetoperatingsystem=linux"
+
locations.api:
image: eshop/locations.api:dev
build:
diff --git a/docker-compose.vs.release.yml b/docker-compose.vs.release.yml
index 87e246780..92be2557b 100644
--- a/docker-compose.vs.release.yml
+++ b/docker-compose.vs.release.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
services:
basket.api:
@@ -81,6 +81,26 @@ services:
labels:
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
+ payment.api:
+ build:
+ args:
+ source: ${DOCKER_BUILD_SOURCE}
+ volumes:
+ - ~/clrdbg:/clrdbg:ro
+ entrypoint: tail -f /dev/null
+ labels:
+ - "com.microsoft.visualstudio.targetoperatingsystem=linux"
+
+ graceperiodmanager:
+ build:
+ args:
+ source: ${DOCKER_BUILD_SOURCE}
+ volumes:
+ - ~/clrdbg:/clrdbg:ro
+ entrypoint: tail -f /dev/null
+ labels:
+ - "com.microsoft.visualstudio.targetoperatingsystem=linux"
+
locations.api:
build:
args:
diff --git a/docker-compose.yml b/docker-compose.yml
index e9fb14179..272843e9f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,17 @@
-version: '2'
+version: '2.1'
services:
+ graceperiodmanager:
+ image: eshop/graceperiodmanager:${TAG:-latest}
+ build:
+ context: ./src/Services/GracePeriod/GracePeriodManager
+ dockerfile: Dockerfile
+ depends_on:
+ - sql.data
+ - rabbitmq
+
basket.api:
- image: eshop/basket.api
+ image: eshop/basket.api:${TAG:-latest}
build:
context: ./src/Services/Basket/Basket.API
dockerfile: Dockerfile
@@ -12,7 +21,7 @@ services:
- rabbitmq
catalog.api:
- image: eshop/catalog.api
+ image: eshop/catalog.api:${TAG:-latest}
build:
context: ./src/Services/Catalog/Catalog.API
dockerfile: Dockerfile
@@ -21,7 +30,7 @@ services:
- rabbitmq
identity.api:
- image: eshop/identity.api
+ image: eshop/identity.api:${TAG:-latest}
build:
context: ./src/Services/Identity/Identity.API
dockerfile: Dockerfile
@@ -29,24 +38,27 @@ services:
- sql.data
ordering.api:
- image: eshop/ordering.api
+ image: eshop/ordering.api:${TAG:-latest}
build:
context: ./src/Services/Ordering/Ordering.API
dockerfile: Dockerfile
depends_on:
- sql.data
+ - rabbitmq
marketing.api:
- image: eshop/marketing.api
+ image: eshop/marketing.api:${TAG:-latest}
build:
context: ./src/Services/Marketing/Marketing.API
dockerfile: Dockerfile
depends_on:
- sql.data
+ - nosql.data
- identity.api
+ - rabbitmq
webspa:
- image: eshop/webspa
+ image: eshop/webspa:${TAG:-latest}
build:
context: ./src/Web/WebSPA
dockerfile: Dockerfile
@@ -55,7 +67,7 @@ services:
- basket.api
webmvc:
- image: eshop/webmvc
+ image: eshop/webmvc:${TAG:-latest}
build:
context: ./src/Web/WebMVC
dockerfile: Dockerfile
@@ -64,6 +76,7 @@ services:
- ordering.api
- identity.api
- basket.api
+ - marketing.api
sql.data:
image: microsoft/mssql-server-linux
@@ -82,15 +95,24 @@ services:
- "5672:5672"
webstatus:
- image: eshop/webstatus
+ image: eshop/webstatus:${TAG:-latest}
build:
context: ./src/Web/WebStatus
- dockerfile: Dockerfile
+ dockerfile: Dockerfile
+
+ payment.api:
+ image: eshop/payment.api:${TAG:-latest}
+ build:
+ context: ./src/Services/Payment/Payment.API
+ dockerfile: Dockerfile
+ depends_on:
+ - rabbitmq
locations.api:
- image: locations.api
+ image: eshop/locations.api:${TAG:-latest}
build:
context: ./src/Services/Location/Locations.API
dockerfile: Dockerfile
depends_on:
- - nosql.data
\ No newline at end of file
+ - nosql.data
+ - rabbitmq
diff --git a/eShopOnContainers-AzureFunctions.sln b/eShopOnContainers-AzureFunctions.sln
new file mode 100644
index 000000000..7e14fc19d
--- /dev/null
+++ b/eShopOnContainers-AzureFunctions.sln
@@ -0,0 +1,96 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26608.5
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastructure", "{5B1011EC-CEE5-47AA-B336-99381D573679}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureFunctions", "AzureFunctions", "{106B787C-2CFF-4484-8C07-D14589859E94}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "marketing-functions", "src\Services\Marketing\Infrastructure\AzureFunctions\marketing-functions.csproj", "{B363EF31-DD1A-46C8-ADDF-CD30A756E97B}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
+ Ad-Hoc|ARM = Ad-Hoc|ARM
+ Ad-Hoc|iPhone = Ad-Hoc|iPhone
+ Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
+ Ad-Hoc|x64 = Ad-Hoc|x64
+ Ad-Hoc|x86 = Ad-Hoc|x86
+ AppStore|Any CPU = AppStore|Any CPU
+ AppStore|ARM = AppStore|ARM
+ AppStore|iPhone = AppStore|iPhone
+ AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
+ AppStore|x64 = AppStore|x64
+ AppStore|x86 = AppStore|x86
+ Debug|Any CPU = Debug|Any CPU
+ Debug|ARM = Debug|ARM
+ Debug|iPhone = Debug|iPhone
+ Debug|iPhoneSimulator = Debug|iPhoneSimulator
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|ARM = Release|ARM
+ Release|iPhone = Release|iPhone
+ Release|iPhoneSimulator = Release|iPhoneSimulator
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.AppStore|ARM.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.AppStore|iPhone.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.AppStore|x64.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.AppStore|x64.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.AppStore|x86.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.AppStore|x86.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Debug|ARM.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Debug|x64.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Debug|x86.Build.0 = Debug|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Release|ARM.ActiveCfg = Release|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Release|ARM.Build.0 = Release|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Release|iPhone.Build.0 = Release|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Release|x64.ActiveCfg = Release|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Release|x64.Build.0 = Release|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Release|x86.ActiveCfg = Release|Any CPU
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B}.Release|x86.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {106B787C-2CFF-4484-8C07-D14589859E94} = {5B1011EC-CEE5-47AA-B336-99381D573679}
+ {B363EF31-DD1A-46C8-ADDF-CD30A756E97B} = {106B787C-2CFF-4484-8C07-D14589859E94}
+ EndGlobalSection
+EndGlobal
diff --git a/eShopOnContainers-ServicesAndWebApps.sln b/eShopOnContainers-ServicesAndWebApps.sln
index 22b122fe5..9dd6308a4 100644
--- a/eShopOnContainers-ServicesAndWebApps.sln
+++ b/eShopOnContainers-ServicesAndWebApps.sln
@@ -1,12 +1,15 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.26430.12
+VisualStudioVersion = 15.0.26430.6
MinimumVisualStudioVersion = 10.0.40219.1
+Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{FEA0C318-FFED-4D39-8781-265718CA43DD}"
+EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F6-4D07-B109-DA28AD288A63}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3AF739CD-81D8-428D-A08A-0A58372DEBF6}"
ProjectSection(SolutionItems) = preProject
+ Local.testsettings = Local.testsettings
NuGet.config = NuGet.config
EndProjectSection
EndProject
@@ -42,8 +45,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest", "test\Services\U
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.API", "src\Services\Identity\Identity.API\Identity.API.csproj", "{A579E108-5445-403D-A407-339AC4D1611B}"
EndProject
-Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{FEA0C318-FFED-4D39-8781-265718CA43DD}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebSPA", "src\Web\WebSPA\WebSPA.csproj", "{F16E3C6A-1C94-4EAB-BE91-099618060B68}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests", "test\Services\IntegrationTests\IntegrationTests.csproj", "{5B810E3D-112E-4857-B197-F09D2FD41E27}"
@@ -58,36 +59,48 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventBus", "src\BuildingBlo
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventBusRabbitMQ", "src\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj", "{8088F3FC-6787-45FA-A924-816EC81CBFAC}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationEventLogEF", "src\BuildingBlocks\EventBus\IntegrationEventLogEF\IntegrationEventLogEF.csproj", "{9EE28E45-1533-472B-8267-56C48855BA0E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationEventLogEF", "src\BuildingBlocks\EventBus\IntegrationEventLogEF\IntegrationEventLogEF.csproj", "{9EE28E45-1533-472B-8267-56C48855BA0E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HealthChecks", "HealthChecks", "{A81ECBC2-6B00-4DCD-8388-469174033379}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.HealthChecks", "src\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj", "{942ED6E8-0050-495F-A0EA-01E97F63760C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebStatus", "src\Web\WebStatus\WebStatus.csproj", "{C0A7918D-B4F2-4E7F-8DE2-1E5279EF079F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebStatus", "src\Web\WebStatus\WebStatus.csproj", "{C0A7918D-B4F2-4E7F-8DE2-1E5279EF079F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Resilience", "Resilience", "{FBF43D93-F2E7-4FF8-B4AB-186895949B88}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Resilience.Http", "src\BuildingBlocks\Resilience\Resilience.Http\Resilience.Http.csproj", "{D1C47FF1-91F1-4CAF-9ABB-AD642B821502}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Resilience.Http", "src\BuildingBlocks\Resilience\Resilience.Http\Resilience.Http.csproj", "{D1C47FF1-91F1-4CAF-9ABB-AD642B821502}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Payment", "Payment", "{022E145D-1593-47EE-9608-8E323D3C63F5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Payment.API", "src\Services\Payment\Payment.API\Payment.API.csproj", "{1A01AF82-6FCB-464C-B39C-F127AEBD315D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HealthChecks", "src\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj", "{22A0F9C1-2D4A-4107-95B7-8459E6688BC5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.HealthChecks.SqlServer", "src\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks.SqlServer\Microsoft.Extensions.HealthChecks.SqlServer.csproj", "{4BD76717-3102-4969-8C2C-BAAA3F0263B6}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventBus.Tests", "src\BuildingBlocks\EventBus\EventBus.Tests\EventBus.Tests.csproj", "{89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventBus.Tests", "src\BuildingBlocks\EventBus\EventBus.Tests\EventBus.Tests.csproj", "{4A980AC4-7205-46BF-8CCB-09E44D700FD4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GracePeriodManager", "src\Services\GracePeriod\GracePeriodManager\GracePeriodManager.csproj", "{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Location", "Location", "{41139F64-4046-4F16-96B7-D941D96FA9C6}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Locations.API", "src\Services\Location\Locations.API\Locations.API.csproj", "{E7581357-FC34-474C-B8F5-307EE3CE05EF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Locations.API", "src\Services\Location\Locations.API\Locations.API.csproj", "{E7581357-FC34-474C-B8F5-307EE3CE05EF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataProtection", "DataProtection", "{88B22DBB-AA8F-4290-A454-2C109352C345}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataProtection", "src\BuildingBlocks\DataProtection\DataProtection\DataProtection.csproj", "{23A33F9B-7672-426D-ACF9-FF8436ADC81A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataProtection", "src\BuildingBlocks\DataProtection\DataProtection\DataProtection.csproj", "{23A33F9B-7672-426D-ACF9-FF8436ADC81A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Marketing", "Marketing", "{A5260DE0-1FDD-467E-9CC1-A028AB081CEE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marketing.API", "src\Services\Marketing\Marketing.API\Marketing.API.csproj", "{DF395F85-B010-465D-857A-7EBCC512C0C2}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventBusServiceBus", "src\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj", "{69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.HealthChecks.AzureStorage", "src\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks.AzureStorage\Microsoft.Extensions.HealthChecks.AzureStorage.csproj", "{768C887F-C229-4B94-ACD8-0C7F65686524}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoadTest", "test\Services\LoadTest\LoadTest.csproj", "{969E793C-C413-490E-9C9D-B2B46DA5AF32}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -116,6 +129,54 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|ARM.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhone.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x64.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x64.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x86.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x86.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|ARM.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x64.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x86.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|ARM.ActiveCfg = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|ARM.Build.0 = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhone.Build.0 = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x64.ActiveCfg = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x64.Build.0 = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x86.ActiveCfg = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x86.Build.0 = Release|Any CPU
{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
@@ -390,54 +451,6 @@ Global
{A579E108-5445-403D-A407-339AC4D1611B}.Release|x64.Build.0 = Release|Any CPU
{A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.ActiveCfg = Release|Any CPU
{A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.Build.0 = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|Any CPU.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|ARM.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|ARM.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhone.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x64.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x64.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x86.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x86.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|ARM.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhone.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x64.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x64.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x86.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x86.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|Any CPU.Build.0 = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|ARM.ActiveCfg = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|ARM.Build.0 = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhone.ActiveCfg = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhone.Build.0 = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x64.ActiveCfg = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x64.Build.0 = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x86.ActiveCfg = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x86.Build.0 = Release|Any CPU
{F16E3C6A-1C94-4EAB-BE91-099618060B68}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{F16E3C6A-1C94-4EAB-BE91-099618060B68}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{F16E3C6A-1C94-4EAB-BE91-099618060B68}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
@@ -870,6 +883,54 @@ Global
{D1C47FF1-91F1-4CAF-9ABB-AD642B821502}.Release|x64.Build.0 = Release|Any CPU
{D1C47FF1-91F1-4CAF-9ABB-AD642B821502}.Release|x86.ActiveCfg = Release|Any CPU
{D1C47FF1-91F1-4CAF-9ABB-AD642B821502}.Release|x86.Build.0 = Release|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.AppStore|ARM.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.AppStore|iPhone.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.AppStore|x64.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.AppStore|x64.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.AppStore|x86.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.AppStore|x86.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Debug|ARM.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Debug|x64.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Debug|x86.Build.0 = Debug|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Release|ARM.ActiveCfg = Release|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Release|ARM.Build.0 = Release|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Release|iPhone.Build.0 = Release|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Release|x64.ActiveCfg = Release|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Release|x64.Build.0 = Release|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Release|x86.ActiveCfg = Release|Any CPU
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D}.Release|x86.Build.0 = Release|Any CPU
{22A0F9C1-2D4A-4107-95B7-8459E6688BC5}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{22A0F9C1-2D4A-4107-95B7-8459E6688BC5}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{22A0F9C1-2D4A-4107-95B7-8459E6688BC5}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
@@ -966,54 +1027,102 @@ Global
{4BD76717-3102-4969-8C2C-BAAA3F0263B6}.Release|x64.Build.0 = Release|Any CPU
{4BD76717-3102-4969-8C2C-BAAA3F0263B6}.Release|x86.ActiveCfg = Release|Any CPU
{4BD76717-3102-4969-8C2C-BAAA3F0263B6}.Release|x86.Build.0 = Release|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.AppStore|Any CPU.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.AppStore|ARM.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.AppStore|ARM.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.AppStore|iPhone.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.AppStore|x64.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.AppStore|x64.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.AppStore|x86.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.AppStore|x86.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Debug|ARM.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Debug|iPhone.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Debug|x64.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Debug|x64.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Debug|x86.ActiveCfg = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Debug|x86.Build.0 = Debug|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Release|Any CPU.Build.0 = Release|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Release|ARM.ActiveCfg = Release|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Release|ARM.Build.0 = Release|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Release|iPhone.ActiveCfg = Release|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Release|iPhone.Build.0 = Release|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Release|x64.ActiveCfg = Release|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Release|x64.Build.0 = Release|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Release|x86.ActiveCfg = Release|Any CPU
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D}.Release|x86.Build.0 = Release|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.AppStore|ARM.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.AppStore|iPhone.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.AppStore|x64.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.AppStore|x64.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.AppStore|x86.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.AppStore|x86.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Debug|ARM.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Debug|x64.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Debug|x86.Build.0 = Debug|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Release|ARM.ActiveCfg = Release|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Release|ARM.Build.0 = Release|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Release|iPhone.Build.0 = Release|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Release|x64.ActiveCfg = Release|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Release|x64.Build.0 = Release|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Release|x86.ActiveCfg = Release|Any CPU
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Release|x86.Build.0 = Release|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|ARM.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|iPhone.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|x64.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|x64.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|x86.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|x86.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|ARM.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|x64.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|x86.Build.0 = Debug|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|ARM.ActiveCfg = Release|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|ARM.Build.0 = Release|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|iPhone.Build.0 = Release|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|x64.ActiveCfg = Release|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|x64.Build.0 = Release|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|x86.ActiveCfg = Release|Any CPU
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|x86.Build.0 = Release|Any CPU
{E7581357-FC34-474C-B8F5-307EE3CE05EF}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{E7581357-FC34-474C-B8F5-307EE3CE05EF}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{E7581357-FC34-474C-B8F5-307EE3CE05EF}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
@@ -1158,6 +1267,150 @@ Global
{DF395F85-B010-465D-857A-7EBCC512C0C2}.Release|x64.Build.0 = Release|Any CPU
{DF395F85-B010-465D-857A-7EBCC512C0C2}.Release|x86.ActiveCfg = Release|Any CPU
{DF395F85-B010-465D-857A-7EBCC512C0C2}.Release|x86.Build.0 = Release|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.AppStore|ARM.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.AppStore|iPhone.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.AppStore|x64.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.AppStore|x64.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.AppStore|x86.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.AppStore|x86.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Debug|ARM.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Debug|x64.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Debug|x86.Build.0 = Debug|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Release|ARM.ActiveCfg = Release|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Release|ARM.Build.0 = Release|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Release|iPhone.Build.0 = Release|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Release|x64.ActiveCfg = Release|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Release|x64.Build.0 = Release|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Release|x86.ActiveCfg = Release|Any CPU
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8}.Release|x86.Build.0 = Release|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.AppStore|ARM.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.AppStore|iPhone.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.AppStore|x64.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.AppStore|x64.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.AppStore|x86.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.AppStore|x86.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Debug|ARM.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Debug|x64.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Debug|x86.Build.0 = Debug|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Release|Any CPU.Build.0 = Release|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Release|ARM.ActiveCfg = Release|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Release|ARM.Build.0 = Release|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Release|iPhone.Build.0 = Release|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Release|x64.ActiveCfg = Release|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Release|x64.Build.0 = Release|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Release|x86.ActiveCfg = Release|Any CPU
+ {768C887F-C229-4B94-ACD8-0C7F65686524}.Release|x86.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.AppStore|Any CPU.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.AppStore|ARM.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.AppStore|ARM.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.AppStore|iPhone.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.AppStore|x64.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.AppStore|x64.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.AppStore|x86.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.AppStore|x86.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Debug|ARM.Build.0 = Debug|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Debug|x64.Build.0 = Debug|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Debug|x86.Build.0 = Debug|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|Any CPU.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|ARM.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|ARM.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|iPhone.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|x64.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|x64.Build.0 = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|x86.ActiveCfg = Release|Any CPU
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1191,18 +1444,20 @@ Global
{C0A7918D-B4F2-4E7F-8DE2-1E5279EF079F} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04}
{FBF43D93-F2E7-4FF8-B4AB-186895949B88} = {DB0EFB20-B024-4E5E-A75C-52143C131D25}
{D1C47FF1-91F1-4CAF-9ABB-AD642B821502} = {FBF43D93-F2E7-4FF8-B4AB-186895949B88}
+ {022E145D-1593-47EE-9608-8E323D3C63F5} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
+ {1A01AF82-6FCB-464C-B39C-F127AEBD315D} = {022E145D-1593-47EE-9608-8E323D3C63F5}
{22A0F9C1-2D4A-4107-95B7-8459E6688BC5} = {A81ECBC2-6B00-4DCD-8388-469174033379}
{4BD76717-3102-4969-8C2C-BAAA3F0263B6} = {A81ECBC2-6B00-4DCD-8388-469174033379}
- {89D80DF1-32E1-4AAF-970F-DA0AA6881F9D} = {807BB76E-B2BB-47A2-A57B-3D1B20FF5E7F}
+ {4A980AC4-7205-46BF-8CCB-09E44D700FD4} = {807BB76E-B2BB-47A2-A57B-3D1B20FF5E7F}
+ {F6E0F0DD-1400-43C3-B5E0-7CC325728C47} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
{41139F64-4046-4F16-96B7-D941D96FA9C6} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
{E7581357-FC34-474C-B8F5-307EE3CE05EF} = {41139F64-4046-4F16-96B7-D941D96FA9C6}
{88B22DBB-AA8F-4290-A454-2C109352C345} = {DB0EFB20-B024-4E5E-A75C-52143C131D25}
{23A33F9B-7672-426D-ACF9-FF8436ADC81A} = {88B22DBB-AA8F-4290-A454-2C109352C345}
{A5260DE0-1FDD-467E-9CC1-A028AB081CEE} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
{DF395F85-B010-465D-857A-7EBCC512C0C2} = {A5260DE0-1FDD-467E-9CC1-A028AB081CEE}
- {88B22DBB-AA8F-4290-A454-2C109352C345} = {DB0EFB20-B024-4E5E-A75C-52143C131D25}
- {23A33F9B-7672-426D-ACF9-FF8436ADC81A} = {88B22DBB-AA8F-4290-A454-2C109352C345}
- {41139F64-4046-4F16-96B7-D941D96FA9C6} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
- {E7581357-FC34-474C-B8F5-307EE3CE05EF} = {41139F64-4046-4F16-96B7-D941D96FA9C6}
+ {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8} = {807BB76E-B2BB-47A2-A57B-3D1B20FF5E7F}
+ {768C887F-C229-4B94-ACD8-0C7F65686524} = {A81ECBC2-6B00-4DCD-8388-469174033379}
+ {969E793C-C413-490E-9C9D-B2B46DA5AF32} = {EF0337F2-ED00-4643-89FD-EE10863F1870}
EndGlobalSection
EndGlobal
diff --git a/eShopOnContainers.sln b/eShopOnContainers.sln
index 2ecb566bb..4f6db0d73 100644
--- a/eShopOnContainers.sln
+++ b/eShopOnContainers.sln
@@ -1,8 +1,20 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.26430.14
+VisualStudioVersion = 15.0.26430.13
MinimumVisualStudioVersion = 10.0.40219.1
+Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{FEA0C318-FFED-4D39-8781-265718CA43DD}"
+ ProjectSection(ProjectDependencies) = postProject
+ {A579E108-5445-403D-A407-339AC4D1611B} = {A579E108-5445-403D-A407-339AC4D1611B}
+ {9842DB3A-1391-48C7-A49C-2FABD0A18AC2} = {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}
+ {23FB706A-2701-41E9-8BF9-28936001CA41} = {23FB706A-2701-41E9-8BF9-28936001CA41}
+ {F0333D8E-0B27-42B7-B2C6-78F3657624E2} = {F0333D8E-0B27-42B7-B2C6-78F3657624E2}
+ {42681D9D-750A-4DF7-BD9F-9292CFD5C253} = {42681D9D-750A-4DF7-BD9F-9292CFD5C253}
+ {2110CBB0-3B38-4EE4-A743-DF6968D80D90} = {2110CBB0-3B38-4EE4-A743-DF6968D80D90}
+ {231226CE-690B-4979-8870-9A79D80928E2} = {231226CE-690B-4979-8870-9A79D80928E2}
+ {2DA840CE-FCEA-4CF7-B1A1-ADD7775E7357} = {2DA840CE-FCEA-4CF7-B1A1-ADD7775E7357}
+ EndProjectSection
+EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F6-4D07-B109-DA28AD288A63}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{91CF7717-08AB-4E65-B10E-0B426F01E2E8}"
@@ -67,18 +79,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest", "test\Services\U
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.API", "src\Services\Identity\Identity.API\Identity.API.csproj", "{A579E108-5445-403D-A407-339AC4D1611B}"
EndProject
-Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{FEA0C318-FFED-4D39-8781-265718CA43DD}"
- ProjectSection(ProjectDependencies) = postProject
- {A579E108-5445-403D-A407-339AC4D1611B} = {A579E108-5445-403D-A407-339AC4D1611B}
- {9842DB3A-1391-48C7-A49C-2FABD0A18AC2} = {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}
- {23FB706A-2701-41E9-8BF9-28936001CA41} = {23FB706A-2701-41E9-8BF9-28936001CA41}
- {F0333D8E-0B27-42B7-B2C6-78F3657624E2} = {F0333D8E-0B27-42B7-B2C6-78F3657624E2}
- {42681D9D-750A-4DF7-BD9F-9292CFD5C253} = {42681D9D-750A-4DF7-BD9F-9292CFD5C253}
- {2110CBB0-3B38-4EE4-A743-DF6968D80D90} = {2110CBB0-3B38-4EE4-A743-DF6968D80D90}
- {231226CE-690B-4979-8870-9A79D80928E2} = {231226CE-690B-4979-8870-9A79D80928E2}
- {2DA840CE-FCEA-4CF7-B1A1-ADD7775E7357} = {2DA840CE-FCEA-4CF7-B1A1-ADD7775E7357}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildingBlocks", "BuildingBlocks", "{1EF3AC0F-F27C-46DD-AC53-D762D2C11C45}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EventBus", "EventBus", "{B473B70F-0796-4862-B1AD-BB742D93B868}"
@@ -145,6 +145,54 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|ARM.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhone.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x64.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x64.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x86.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x86.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|ARM.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x64.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x86.Build.0 = Debug|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|ARM.ActiveCfg = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|ARM.Build.0 = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhone.Build.0 = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x64.ActiveCfg = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x64.Build.0 = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x86.ActiveCfg = Release|Any CPU
+ {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x86.Build.0 = Release|Any CPU
{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
@@ -998,54 +1046,6 @@ Global
{A579E108-5445-403D-A407-339AC4D1611B}.Release|x64.Build.0 = Release|Any CPU
{A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.ActiveCfg = Release|Any CPU
{A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.Build.0 = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|Any CPU.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|ARM.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|ARM.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhone.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x64.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x64.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x86.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x86.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|ARM.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhone.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x64.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x64.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x86.ActiveCfg = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x86.Build.0 = Debug|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|Any CPU.Build.0 = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|ARM.ActiveCfg = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|ARM.Build.0 = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhone.ActiveCfg = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhone.Build.0 = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x64.ActiveCfg = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x64.Build.0 = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x86.ActiveCfg = Release|Any CPU
- {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x86.Build.0 = Release|Any CPU
{3D6B7A87-162E-4479-B256-1291BEB503B6}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{3D6B7A87-162E-4479-B256-1291BEB503B6}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{3D6B7A87-162E-4479-B256-1291BEB503B6}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
diff --git a/global.json b/global.json
new file mode 100644
index 000000000..38fed7db6
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+ "sdk": {
+ "version":"1.0.4"
+ }
+}
\ No newline at end of file
diff --git a/img/eShopOnContainers_Architecture_Diagram - Old2.png b/img/eShopOnContainers_Architecture_Diagram - Old2.png
new file mode 100644
index 000000000..ca9e986b5
Binary files /dev/null and b/img/eShopOnContainers_Architecture_Diagram - Old2.png differ
diff --git a/img/eShopOnContainers_Architecture_Diagram.png b/img/eShopOnContainers_Architecture_Diagram.png
index ca9e986b5..edf7d8a95 100644
Binary files a/img/eShopOnContainers_Architecture_Diagram.png and b/img/eShopOnContainers_Architecture_Diagram.png differ
diff --git a/k8s/conf_cloud.yml b/k8s/conf_cloud.yml
new file mode 100644
index 000000000..a7f855095
--- /dev/null
+++ b/k8s/conf_cloud.yml
@@ -0,0 +1,35 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: externalcfg
+ labels:
+ app: eshop
+data:
+# Basket.API entries
+ BasketBus: CONNECTION_STRING (NAME OF RABBITMQ CONTAINER OR Endpoint=sb://XXXX in case of using Azure)
+ BasketRedisConStr: REDIS CONNECTION STRING FOR BASKET
+# Catalog.API entries
+ CatalogBus: CONNECTION_STRING (NAME OF RABBITMQ CONTAINER OR Endpoint=sb://XXXX in case of using Azure)
+ CatalogSqlDb: Catalog SQL SERVER CONNECTION STRING (Server=xxxx;Intial Catalog=yyy;....)
+# Identity.API entries
+ IdentitySqlDb: Identity SQL SERVER CONNECTION STRING (Server=xxxx;Intial Catalog=yyy;....)
+# Locations.API entries
+ LocationsBus: CONNECTION_STRING (NAME OF RABBITMQ CONTAINER OR Endpoint=sb://XXXX in case of using Azure)
+ LocationsNoSqlDb: Locations MongoDb ConnectionString
+ LocationsNoSqlDbName: Locations MongoDb database (LocationsDb)
+# Marketing.API entries
+ MarketingBus: CONNECTION_STRING (NAME OF RABBITMQ CONTAINER OR Endpoint=sb://XXXX in case of using Azure)
+ MarketingNoSqlDb: Marketing MongoDb ConnectionString
+ MarketingNoSqlDbName: Marketing MongoDb database (MarketingDb)
+ MarketingSqlDb: Marketing SQL SERVER CONNECTION STRING (Server=xxxx;Intial Catalog=yyy;....)
+# Ordering.API entries
+ OrderingBus: CONNECTION_STRING (NAME OF RABBITMQ CONTAINER OR Endpoint=sb://XXXX in case of using Azure)
+ OrderingSqlDb: Ordering SQL SERVER CONNECTION STRING (Server=xxxx;Intial Catalog=yyy;....)
+# Payment.API entries
+ PaymentBus: CONNECTION_STRING (NAME OF RABBITMQ CONTAINER OR Endpoint=sb://XXXX in case of using Azure)
+# GracePeriodManager entries
+ GracePeriodTime: "5" # Grace period duration (time when you can cancel order) in minutes
+ GracePeriodCheckUpdateTime: "60000" # Interval time to check new Order status (in milliseconds)
+# Global entries
+ UseAzureServiceBus: "TRUE" IF USE AZURE SB ("FALSE" FOR USING RABBITMQ)
+ keystore: REDIS CONNECTION STRING FOR KEYSTORE
\ No newline at end of file
diff --git a/k8s/conf_local.yml b/k8s/conf_local.yml
new file mode 100644
index 000000000..1193fc36d
--- /dev/null
+++ b/k8s/conf_local.yml
@@ -0,0 +1,27 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: externalcfg
+ labels:
+ app: eshop
+data:
+ BasketBus: rabbitmq
+ BasketRedisConStr: basket-data
+ CatalogBus: rabbitmq
+ CatalogSqlDb: Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word;
+ CatalogAzureStorageEnabled: "False"
+ IdentitySqlDb: Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.IdentityDb;User Id=sa;Password=Pass@word;
+ LocationsBus: rabbitmq
+ LocationsNoSqlDb: mongodb://nosql-data
+ LocationsNoSqlDbName: LocationsDb
+ MarketingBus: rabbitmq
+ MarketingNoSqlDb: mongodb://nosql-data
+ MarketingNoSqlDbName: MarketingDb
+ MarketingSqlDb: Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word;
+ OrderingBus: rabbitmq
+ OrderingSqlDb: Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;
+ PaymentBus: rabbitmq
+ GracePeriodTime: "1"
+ GracePeriodCheckUpdateTime: "60000"
+ UseAzureServiceBus: "False"
+ keystore: keystore-data
diff --git a/k8s/deploy.ps1 b/k8s/deploy.ps1
index 9930474ba..70a8ad817 100644
--- a/k8s/deploy.ps1
+++ b/k8s/deploy.ps1
@@ -2,10 +2,16 @@ Param(
[parameter(Mandatory=$false)][string]$registry,
[parameter(Mandatory=$false)][string]$dockerUser,
[parameter(Mandatory=$false)][string]$dockerPassword,
- [parameter(Mandatory=$false)][bool]$deployCI,
- [parameter(Mandatory=$false)][bool]$useDockerHub,
[parameter(Mandatory=$false)][string]$execPath,
- [parameter(Mandatory=$false)][string]$kubeconfigPath
+ [parameter(Mandatory=$false)][string]$kubeconfigPath,
+ [parameter(Mandatory=$true)][string]$configFile,
+ [parameter(Mandatory=$false)][string]$imageTag,
+ [parameter(Mandatory=$false)][string]$externalDns,
+ [parameter(Mandatory=$false)][bool]$deployCI=$false,
+ [parameter(Mandatory=$false)][bool]$buildImages=$true,
+ [parameter(Mandatory=$false)][bool]$buildBits=$false,
+ [parameter(Mandatory=$false)][bool]$deployInfrastructure=$true,
+ [parameter(Mandatory=$false)][string]$dockerOrg="eshop"
)
function ExecKube($cmd) {
@@ -20,7 +26,11 @@ function ExecKube($cmd) {
}
}
-# Not used when deploying through CI VSTS
+# Initialization
+$debugMode = $PSCmdlet.MyInvocation.BoundParameters["Debug"].IsPresent
+$useDockerHub = [string]::IsNullOrEmpty($registry)
+
+# Check required commands (only if not in CI environment)
if(-not $deployCI) {
$requiredCommands = ("docker", "docker-compose", "kubectl")
foreach ($command in $requiredCommands) {
@@ -30,11 +40,50 @@ if(-not $deployCI) {
}
}
}
+else {
+ $buildBits = false;
+ $buildImages = false; # Never build images through CI, as they previously built
+}
+
+# Get tag to use from current branch if no tag is passed
+if ([string]::IsNullOrEmpty($imageTag)) {
+ $imageTag = $(git rev-parse --abbrev-ref HEAD)
+}
+Write-Host "Docker image Tag: $imageTag" -ForegroundColor Yellow
+
+# building and publishing docker images if needed
+if($buildBits) {
+ Write-Host "Building and publishing eShopOnContainers..." -ForegroundColor Yellow
+ dotnet restore ../eShopOnContainers-ServicesAndWebApps.sln
+ dotnet publish -c Release -o obj/Docker/publish ../eShopOnContainers-ServicesAndWebApps.sln
+}
+if ($buildImages) {
+ Write-Host "Building Docker images tagged with '$imageTag'" -ForegroundColor Yellow
+ $env:TAG=$imageTag
+ docker-compose -p .. -f ../docker-compose.yml build
-# Use ACR instead of DockerHub as image repository
-if(-not $useDockerHub) {
- Write-Host "Logging in to $registry" -ForegroundColor Yellow
- docker login -u $dockerUser -p $dockerPassword $registry
+ Write-Host "Pushing images to $registry/$dockerOrg..." -ForegroundColor Yellow
+ $services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus")
+
+ foreach ($service in $services) {
+ $imageFqdn = if ($useDockerHub) {"$dockerOrg/${service}"} else {"$registry/$dockerOrg/${service}"}
+ docker tag eshop/${service}:$imageTag ${imageFqdn}:$imageTag
+ docker push ${imageFqdn}:$imageTag
+ }
+}
+
+# if we have login/pwd add the secret to k8s
+if (-not [string]::IsNullOrEmpty($dockerUser)) {
+ $registryFDQN = if (-not $useDockerHub) {$registry} else {"index.docker.io/v1/"}
+
+ Write-Host "Logging in to $registryFDQN as user $dockerUser" -ForegroundColor Yellow
+ if ($useDockerHub) {
+ docker login -u $dockerUser -p $dockerPassword
+ }
+ else {
+ docker login -u $dockerUser -p $dockerPassword $registryFDQN
+ }
+
if (-not $LastExitCode -eq 0) {
Write-Host "Login failed" -ForegroundColor Red
exit
@@ -42,7 +91,7 @@ if(-not $useDockerHub) {
# create registry key secret
ExecKube -cmd 'create secret docker-registry registry-key `
- --docker-server=$registry `
+ --docker-server=$registryFDQN `
--docker-username=$dockerUser `
--docker-password=$dockerPassword `
--docker-email=not@used.com'
@@ -54,87 +103,95 @@ ExecKube -cmd 'delete deployments --all'
ExecKube -cmd 'delete services --all'
ExecKube -cmd 'delete configmap config-files'
ExecKube -cmd 'delete configmap urls'
+ExecKube -cmd 'delete configmap externalcfg'
# start sql, rabbitmq, frontend deploymentsExecKube -cmd 'delete configmap config-files'
ExecKube -cmd 'create configmap config-files --from-file=nginx-conf=nginx.conf'
ExecKube -cmd 'label configmap config-files app=eshop'
-ExecKube -cmd 'create -f sql-data.yaml -f basket-data.yaml -f keystore-data.yaml -f rabbitmq.yaml -f services.yaml -f frontend.yaml'
-# building and publishing docker images not necessary when deploying through CI VSTS
-if(-not $deployCI) {
- Write-Host "Building and publishing eShopOnContainers..." -ForegroundColor Yellow
- dotnet restore ../eShopOnContainers-ServicesAndWebApps.sln
- dotnet publish -c Release -o obj/Docker/publish ../eShopOnContainers-ServicesAndWebApps.sln
-
- Write-Host "Building Docker images..." -ForegroundColor Yellow
- 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")
- foreach ($service in $services) {
- docker tag eshop/$service $registry/eshop/$service
- docker push $registry/eshop/$service
- }
+if ($deployInfrastructure) {
+ Write-Host 'Deploying infrastructure deployments (databases, redis, ...)' -ForegroundColor Yellow
+ ExecKube -cmd 'create -f sql-data.yaml -f basket-data.yaml -f keystore-data.yaml -f rabbitmq.yaml -f nosql-data.yaml'
}
-Write-Host "Waiting for frontend's external ip..." -ForegroundColor Yellow
-while ($true) {
- $frontendUrl = & ExecKube -cmd 'get svc frontend -o=jsonpath="{.status.loadBalancer.ingress[0].ip}"'
- if ([bool]($frontendUrl -as [ipaddress])) {
- break
- }
- Start-Sleep -s 15
+Write-Host 'Deploying code deployments (databases, redis, ...)' -ForegroundColor Yellow
+ExecKube -cmd 'create -f services.yaml -f frontend.yaml'
+
+if ([string]::IsNullOrEmpty($externalDns)) {
+ Write-Host "Waiting for frontend's external ip..." -ForegroundColor Yellow
+ while ($true) {
+ $frontendUrl = & ExecKube -cmd 'get svc frontend -o=jsonpath="{.status.loadBalancer.ingress[0].ip}"'
+ if ([bool]($frontendUrl -as [ipaddress])) {
+ break
+ }
+ Start-Sleep -s 15
+ }
+ $externalDns = $frontendUrl
}
+Write-Host "Using $externalDns as the external DNS/IP of the k8s cluster"
+
ExecKube -cmd 'create configmap urls `
--from-literal=BasketUrl=http://basket `
--from-literal=BasketHealthCheckUrl=http://basket/hc `
- --from-literal=CatalogUrl=http://$($frontendUrl)/catalog-api `
+ --from-literal=CatalogUrl=http://$($externalDns)/catalog-api `
--from-literal=CatalogHealthCheckUrl=http://catalog/hc `
- --from-literal=IdentityUrl=http://$($frontendUrl)/identity `
+ --from-literal=PicBaseUrl=http://$($externalDns)/catalog-api/api/v1/pic/ `
+ --from-literal=IdentityUrl=http://$($externalDns)/identity `
--from-literal=IdentityHealthCheckUrl=http://identity/hc `
--from-literal=OrderingUrl=http://ordering `
--from-literal=OrderingHealthCheckUrl=http://ordering/hc `
- --from-literal=MvcClientExternalUrl=http://$($frontendUrl)/webmvc `
+ --from-literal=MvcClientExternalUrl=http://$($externalDns)/webmvc `
--from-literal=WebMvcHealthCheckUrl=http://webmvc/hc `
--from-literal=MvcClientOrderingUrl=http://ordering `
--from-literal=MvcClientCatalogUrl=http://catalog `
--from-literal=MvcClientBasketUrl=http://basket `
--from-literal=WebSpaHealthCheckUrl=http://webspa/hc `
- --from-literal=SpaClientOrderingExternalUrl=http://$($frontendUrl)/ordering-api `
- --from-literal=SpaClientCatalogExternalUrl=http://$($frontendUrl)/catalog-api `
- --from-literal=SpaClientBasketExternalUrl=http://$($frontendUrl)/basket-api `
- --from-literal=SpaClientIdentityExternalUrl=http://$($frontendUrl)/identity `
- --from-literal=SpaClientExternalUrl=http://$($frontendUrl)'
+ --from-literal=SpaClientOrderingExternalUrl=http://$($externalDns)/ordering-api `
+ --from-literal=SpaClientCatalogExternalUrl=http://$($externalDns)/catalog-api `
+ --from-literal=SpaClientBasketExternalUrl=http://$($externalDns)/basket-api `
+ --from-literal=SpaClientIdentityExternalUrl=http://$($externalDns)/identity `
+ --from-literal=SpaClientExternalUrl=http://$($externalDns)'
ExecKube -cmd 'label configmap urls app=eshop'
-Write-Host "Creating deployments..." -ForegroundColor Yellow
+Write-Host "Deploying configuration from $configFile" -ForegroundColor Yellow
+
+ExecKube -cmd "create -f $configFile"
+Write-Host "Creating deployments..." -ForegroundColor Yellow
ExecKube -cmd 'create -f deployments.yaml'
-# not using ACR for pulling images when deploying through CI VSTS
-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'
+# update deployments with the correct image (with tag and/or registry)
+$registryPath = ""
+if (-not [string]::IsNullOrEmpty($registry)) {
+ $registryPath = "$registry/"
}
+Write-Host "Update Image containers to use prefix '$registry$dockerOrg' and tag '$imageTag'" -ForegroundColor Yellow
+
+ExecKube -cmd 'set image deployments/basket basket=${registryPath}${dockerOrg}/basket.api:$imageTag'
+ExecKube -cmd 'set image deployments/catalog catalog=${registryPath}${dockerOrg}/catalog.api:$imageTag'
+ExecKube -cmd 'set image deployments/identity identity=${registryPath}${dockerOrg}/identity.api:$imageTag'
+ExecKube -cmd 'set image deployments/ordering ordering=${registryPath}${dockerOrg}/ordering.api:$imageTag'
+ExecKube -cmd 'set image deployments/marketing marketing=${registryPath}${dockerOrg}/marketing.api:$imageTag'
+ExecKube -cmd 'set image deployments/locations locations=${registryPath}${dockerOrg}/locations.api:$imageTag'
+ExecKube -cmd 'set image deployments/payment payment=${registryPath}${dockerOrg}/payment.api:$imageTag'
+ExecKube -cmd 'set image deployments/webmvc webmvc=${registryPath}${dockerOrg}/webmvc:$imageTag'
+ExecKube -cmd 'set image deployments/webstatus webstatus=${registryPath}${dockerOrg}/webstatus:$imageTag'
+ExecKube -cmd 'set image deployments/webspa webspa=${registryPath}${dockerOrg}/webspa:$imageTag'
+
Write-Host "Execute rollout..." -ForegroundColor Yellow
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'
-Write-Host "WebSPA is exposed at http://$frontendUrl, WebMVC at http://$frontendUrl/webmvc, WebStatus at http://$frontendUrl/webstatus" -ForegroundColor Yellow
+Write-Host "WebSPA is exposed at http://$externalDns, WebMVC at http://$externalDns/webmvc, WebStatus at http://$externalDns/webstatus" -ForegroundColor Yellow
diff --git a/k8s/deployments.yaml b/k8s/deployments.yaml
index 62352e2ef..6eec27278 100644
--- a/k8s/deployments.yaml
+++ b/k8s/deployments.yaml
@@ -18,9 +18,20 @@ spec:
- name: ASPNETCORE_URLS
value: http://0.0.0.0:80/basket-api
- name: ConnectionString
- value: basket-data
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: BasketRedisConStr
- name: EventBusConnection
- value: rabbitmq
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: BasketBus
+ - name: AzureServiceBusEnabled
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: UseAzureServiceBus
- name: IdentityUrl
valueFrom:
configMapKeyRef:
@@ -51,14 +62,25 @@ spec:
- name: ASPNETCORE_URLS
value: http://0.0.0.0:80/catalog-api
- name: ConnectionString
- value: "Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word"
- - name: EventBusConnection
- value: rabbitmq
- - name: ExternalCatalogBaseUrl
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: CatalogSqlDb
+ - name: PicBaseUrl
valueFrom:
configMapKeyRef:
name: urls
- key: CatalogUrl
+ key: PicBaseUrl
+ - name: AzureStorageEnabled
+ valueFrom:
+ configMapKeyRef:
+ name: urls
+ key: CatalogAzureStorageEnabled
+ - name: EventBusConnection
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: CatalogBus
ports:
- containerPort: 80
imagePullSecrets:
@@ -84,9 +106,15 @@ spec:
- name: ASPNETCORE_URLS
value: http://0.0.0.0:80/identity
- name: ConnectionStrings__DefaultConnection
- value: "Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.IdentityDb;User Id=sa;Password=Pass@word"
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: IdentitySqlDb
- name: DPConnectionString
- value: keystore-data
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: keystore
- name: IsClusterEnv
value: 'True'
- name: MvcClient
@@ -124,9 +152,170 @@ spec:
- name: ASPNETCORE_URLS
value: http://0.0.0.0:80/ordering-api
- name: ConnectionString
- value: "Server=sql-data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;"
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: OrderingSqlDb
+ - name: EventBusConnection
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: OrderingBus
+ - name: AzureServiceBusEnabled
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: UseAzureServiceBus
+ - name: IdentityUrl
+ valueFrom:
+ configMapKeyRef:
+ name: urls
+ key: IdentityUrl
+ ports:
+ - containerPort: 80
+ imagePullSecrets:
+ - name: registry-key
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ name: graceperiodmanager
+spec:
+ paused: true
+ template:
+ metadata:
+ labels:
+ app: graceperiodmanager
+ component: ordering
+ spec:
+ containers:
+ - name: graceperiodmanager
+ image: eshop/graceperiodmanager
+ imagePullPolicy: Always
+ env:
+ - name: ConnectionString
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: OrderingSqlDb
+ - name: EventBusConnection
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: GracePeriodManagerBus
+ - name: GracePeriodTime
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: GracePeriodTime
+ - name: CheckUpdateTime
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: GracePeriodCheckUpdateTime
+ - name: AzureServiceBusEnabled
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: UseAzureServiceBus
+ ports:
+ - containerPort: 80
+ imagePullSecrets:
+ - name: registry-key
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ name: locations
+spec:
+ paused: true
+ template:
+ metadata:
+ labels:
+ app: eshop
+ component: locations
+ spec:
+ containers:
+ - name: locations
+ image: eshop/locations.api
+ imagePullPolicy: Always
+ env:
+ - name: ASPNETCORE_URLS
+ value: http://0.0.0.0:80/locations-api
+ - name: ConnectionString
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: LocationsNoSqlDb
+ - name: Database
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: LocationsNoSqlDbName
+ - name: AzureServiceBusEnabled
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: UseAzureServiceBus
+ - name: EventBusConnection
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: LocationsBus
+ - name: IdentityUrl
+ valueFrom:
+ configMapKeyRef:
+ name: urls
+ key: IdentityUrl
+ ports:
+ - containerPort: 80
+ imagePullSecrets:
+ - name: registry-key
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ name: marketing
+spec:
+ paused: true
+ template:
+ metadata:
+ labels:
+ app: eshop
+ component: marketing
+ spec:
+ containers:
+ - name: marketing
+ image: eshop/marketing.api
+ imagePullPolicy: Always
+ env:
+ - name: ASPNETCORE_URLS
+ value: http://0.0.0.0:80/marketing-api
+ - name: ConnectionString
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: MarketingSqlDb
+ - name: MongoConnectionString
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: MarketingNoSqlDb
+ - name: MongoDatabase
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: MarketingNoSqlDbName
+ - name: AzureServiceBusEnabled
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: UseAzureServiceBus
- name: EventBusConnection
- value: rabbitmq
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: MarketingBus
- name: IdentityUrl
valueFrom:
configMapKeyRef:
@@ -139,6 +328,40 @@ spec:
---
apiVersion: extensions/v1beta1
kind: Deployment
+metadata:
+ name: payment
+spec:
+ paused: true
+ template:
+ metadata:
+ labels:
+ app: eshop
+ component: payment
+ spec:
+ containers:
+ - name: payment
+ image: eshop/payment.api
+ imagePullPolicy: Always
+ env:
+ - name: ASPNETCORE_URLS
+ value: http://0.0.0.0:80/payment-api
+ - name: AzureServiceBusEnabled
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: UseAzureServiceBus
+ - name: EventBusConnection
+ valueFrom:
+ configMapKeyRef:
+ name: externalcfg
+ key: PaymentBus
+ ports:
+ - containerPort: 80
+ imagePullSecrets:
+ - name: registry-key
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
metadata:
name: webmvc
spec:
@@ -157,7 +380,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
@@ -264,7 +490,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
diff --git a/k8s/gen-k8s-env.ps1 b/k8s/gen-k8s-env.ps1
index 39dacba24..c3b82469c 100644
--- a/k8s/gen-k8s-env.ps1
+++ b/k8s/gen-k8s-env.ps1
@@ -3,16 +3,19 @@
[parameter(Mandatory=$true)][string]$location,
[parameter(Mandatory=$true)][string]$registryName,
[parameter(Mandatory=$true)][string]$orchestratorName,
- [parameter(Mandatory=$true)][string]$dnsName
+ [parameter(Mandatory=$true)][string]$dnsName,
+ [parameter(Mandatory=$true)][string]$createAcr=$true
)
# Create resource group
Write-Host "Creating resource group..." -ForegroundColor Yellow
az group create --name=$resourceGroupName --location=$location
-# Create Azure Container Registry
-Write-Host "Creating Azure Container Registry..." -ForegroundColor Yellow
-az acr create -n $registryName -g $resourceGroupName -l $location --admin-enabled true --sku Basic
+if ($createAcr) {
+ # Create Azure Container Registry
+ Write-Host "Creating Azure Container Registry..." -ForegroundColor Yellow
+ az acr create -n $registryName -g $resourceGroupName -l $location --admin-enabled true --sku Basic
+}
# Create kubernetes orchestrator
Write-Host "Creating kubernetes orchestrator..." -ForegroundColor Yellow
diff --git a/k8s/nginx.conf b/k8s/nginx.conf
index 1f754a8cd..22c3414a1 100644
--- a/k8s/nginx.conf
+++ b/k8s/nginx.conf
@@ -71,6 +71,24 @@ http {
proxy_set_header Host $host;
}
+ location /marketing-api {
+ proxy_pass http://marketing;
+ proxy_redirect off;
+ proxy_set_header Host $host;
+ }
+
+ location /payment-api {
+ proxy_pass http://payment;
+ proxy_redirect off;
+ proxy_set_header Host $host;
+ }
+
+ location /locations-api {
+ proxy_pass http://locations;
+ proxy_redirect off;
+ proxy_set_header Host $host;
+ }
+
location / {
proxy_pass http://webspa;
proxy_redirect off;
diff --git a/k8s/nosql-data.yaml b/k8s/nosql-data.yaml
new file mode 100644
index 000000000..5dfb67c6e
--- /dev/null
+++ b/k8s/nosql-data.yaml
@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app: eshop
+ component: nosql-data
+ name: nosql-data
+spec:
+ ports:
+ - port: 27017
+ selector:
+ app: eshop
+ component: nosql-data
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ name: nosql-data
+spec:
+ template:
+ metadata:
+ labels:
+ app: eshop
+ component: nosql-data
+ spec:
+ containers:
+ - name: nosql-data
+ image: mongo
+ ports:
+ - containerPort: 27017
diff --git a/k8s/services.yaml b/k8s/services.yaml
index 3c45806d3..d88604e88 100644
--- a/k8s/services.yaml
+++ b/k8s/services.yaml
@@ -56,6 +56,62 @@ spec:
---
apiVersion: v1
kind: Service
+metadata:
+ labels:
+ app: eshop
+ component: graceperiodmanager
+ name: graceperiodmanager
+spec:
+ ports:
+ - port: 80
+ selector:
+ app: eshop
+ component: graceperiodmanager
+---
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app: eshop
+ component: locations
+ name: locations
+spec:
+ ports:
+ - port: 80
+ selector:
+ app: eshop
+ component: locations
+---
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app: eshop
+ component: payment
+ name: payment
+spec:
+ ports:
+ - port: 80
+ selector:
+ app: eshop
+ component: payment
+---
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app: eshop
+ component: marketing
+ name: marketing
+spec:
+ ports:
+ - port: 80
+ selector:
+ app: eshop
+ component: marketing
+---
+apiVersion: v1
+kind: Service
metadata:
labels:
app: eshop
@@ -94,4 +150,4 @@ spec:
- port: 80
selector:
app: eshop
- component: webspa
\ No newline at end of file
+ component: webspa
diff --git a/src/BuildingBlocks/CommandBus/CommandBus/CommandBus.csproj b/src/BuildingBlocks/CommandBus/CommandBus/CommandBus.csproj
new file mode 100644
index 000000000..ae05359a1
--- /dev/null
+++ b/src/BuildingBlocks/CommandBus/CommandBus/CommandBus.csproj
@@ -0,0 +1,8 @@
+
+
+
+ netstandard1.4
+ Microsoft.eShopOnContainers.BuildingBlocks.CommandBus
+
+
+
\ No newline at end of file
diff --git a/src/BuildingBlocks/CommandBus/CommandBus/ICommandBus.cs b/src/BuildingBlocks/CommandBus/CommandBus/ICommandBus.cs
new file mode 100644
index 000000000..2092e11b0
--- /dev/null
+++ b/src/BuildingBlocks/CommandBus/CommandBus/ICommandBus.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus
+{
+ public interface ICommandBus
+ {
+ Task SendAsync(T command) where T : IntegrationCommand;
+
+ }
+}
diff --git a/src/BuildingBlocks/CommandBus/CommandBus/IntegrationCommand.cs b/src/BuildingBlocks/CommandBus/CommandBus/IntegrationCommand.cs
new file mode 100644
index 000000000..36f1f0fdc
--- /dev/null
+++ b/src/BuildingBlocks/CommandBus/CommandBus/IntegrationCommand.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus
+{
+ public abstract class IntegrationCommand
+ {
+ public Guid Id { get; private set; }
+ public DateTime Sent { get; private set; }
+
+ protected IntegrationCommand()
+ {
+ Id = Guid.NewGuid();
+ Sent = DateTime.UtcNow;
+ }
+ }
+}
diff --git a/src/BuildingBlocks/CommandBus/CommandBusRabbitMQ/CommandBusRabbitMQ.csproj b/src/BuildingBlocks/CommandBus/CommandBusRabbitMQ/CommandBusRabbitMQ.csproj
new file mode 100644
index 000000000..954020d10
--- /dev/null
+++ b/src/BuildingBlocks/CommandBus/CommandBusRabbitMQ/CommandBusRabbitMQ.csproj
@@ -0,0 +1,7 @@
+
+
+
+ netstandard1.4
+
+
+
\ No newline at end of file
diff --git a/src/BuildingBlocks/EventBus/CommandBus/CommandBus.csproj b/src/BuildingBlocks/EventBus/CommandBus/CommandBus.csproj
new file mode 100644
index 000000000..7c3327057
--- /dev/null
+++ b/src/BuildingBlocks/EventBus/CommandBus/CommandBus.csproj
@@ -0,0 +1,8 @@
+
+
+
+ netstandard1.0
+ Microsoft.eShopOnContainers.BuildingBlocks.CommandBus
+
+
+
\ No newline at end of file
diff --git a/src/BuildingBlocks/EventBus/CommandBus/ICommandBus.cs b/src/BuildingBlocks/EventBus/CommandBus/ICommandBus.cs
new file mode 100644
index 000000000..813d9406c
--- /dev/null
+++ b/src/BuildingBlocks/EventBus/CommandBus/ICommandBus.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus
+{
+ public interface ICommandBus
+ {
+ void Send(string name, T data);
+ void Handle(string name, IIntegrationCommandHandler handler);
+ void Handle(string name, IIntegrationCommandHandler handler);
+ void Handle(TI handler)
+ where TI : IIntegrationCommandHandler;
+ }
+}
diff --git a/src/BuildingBlocks/EventBus/CommandBus/IIntegrationCommandHandler.cs b/src/BuildingBlocks/EventBus/CommandBus/IIntegrationCommandHandler.cs
new file mode 100644
index 000000000..07f0c1eea
--- /dev/null
+++ b/src/BuildingBlocks/EventBus/CommandBus/IIntegrationCommandHandler.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus
+{
+ public interface IIntegrationCommandHandler
+ {
+ void Handle(IntegrationCommand command);
+ }
+
+ public interface IIntegrationCommandHandler : IIntegrationCommandHandler
+ {
+ void Handle(IntegrationCommand command);
+ }
+}
diff --git a/src/BuildingBlocks/EventBus/CommandBus/IntegrationCommand.cs b/src/BuildingBlocks/EventBus/CommandBus/IntegrationCommand.cs
new file mode 100644
index 000000000..8df6e5279
--- /dev/null
+++ b/src/BuildingBlocks/EventBus/CommandBus/IntegrationCommand.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus
+{
+ public abstract class IntegrationCommand
+ {
+ public Guid Id { get; }
+ public DateTime Sent { get; }
+
+ public abstract object GetDataAsObject();
+
+ protected IntegrationCommand()
+ {
+ Id = Guid.NewGuid();
+ Sent = DateTime.UtcNow;
+ }
+
+ }
+
+ public class IntegrationCommand : IntegrationCommand
+ {
+ public T Data { get; }
+ public string Name { get; }
+ public override object GetDataAsObject() => Data;
+
+ public IntegrationCommand(string name, T data) : base()
+ {
+ Data = data;
+ Name = name;
+ }
+ }
+
+}
diff --git a/src/BuildingBlocks/EventBus/EventBus.Tests/InMemory_SubscriptionManager_Tests.cs b/src/BuildingBlocks/EventBus/EventBus.Tests/InMemory_SubscriptionManager_Tests.cs
index dd5f7f5b4..13ae99afa 100644
--- a/src/BuildingBlocks/EventBus/EventBus.Tests/InMemory_SubscriptionManager_Tests.cs
+++ b/src/BuildingBlocks/EventBus/EventBus.Tests/InMemory_SubscriptionManager_Tests.cs
@@ -18,7 +18,7 @@ namespace EventBus.Tests
public void After_One_Event_Subscription_Should_Contain_The_Event()
{
var manager = new InMemoryEventBusSubscriptionsManager();
- manager.AddSubscription(() => new TestIntegrationEventHandler());
+ manager.AddSubscription();
Assert.True(manager.HasSubscriptionsForEvent());
}
@@ -26,7 +26,7 @@ namespace EventBus.Tests
public void After_All_Subscriptions_Are_Deleted_Event_Should_No_Longer_Exists()
{
var manager = new InMemoryEventBusSubscriptionsManager();
- manager.AddSubscription(() => new TestIntegrationEventHandler());
+ manager.AddSubscription();
manager.RemoveSubscription();
Assert.False(manager.HasSubscriptionsForEvent());
}
@@ -37,7 +37,7 @@ namespace EventBus.Tests
bool raised = false;
var manager = new InMemoryEventBusSubscriptionsManager();
manager.OnEventRemoved += (o, e) => raised = true;
- manager.AddSubscription(() => new TestIntegrationEventHandler());
+ manager.AddSubscription();
manager.RemoveSubscription();
Assert.True(raised);
}
@@ -46,8 +46,8 @@ namespace EventBus.Tests
public void Get_Handlers_For_Event_Should_Return_All_Handlers()
{
var manager = new InMemoryEventBusSubscriptionsManager();
- manager.AddSubscription(() => new TestIntegrationEventHandler());
- manager.AddSubscription(() => new TestIntegrationOtherEventHandler());
+ manager.AddSubscription();
+ manager.AddSubscription();
var handlers = manager.GetHandlersForEvent();
Assert.Equal(2, handlers.Count());
}
diff --git a/src/BuildingBlocks/EventBus/EventBus/Abstractions/IDynamicIntegrationEventHandler.cs b/src/BuildingBlocks/EventBus/EventBus/Abstractions/IDynamicIntegrationEventHandler.cs
new file mode 100644
index 000000000..55d62ade2
--- /dev/null
+++ b/src/BuildingBlocks/EventBus/EventBus/Abstractions/IDynamicIntegrationEventHandler.cs
@@ -0,0 +1,13 @@
+using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions
+{
+ public interface IDynamicIntegrationEventHandler
+ {
+ Task Handle(dynamic eventData);
+ }
+}
diff --git a/src/BuildingBlocks/EventBus/EventBus/Abstractions/IEventBus.cs b/src/BuildingBlocks/EventBus/EventBus/Abstractions/IEventBus.cs
index 9ab7a4499..21436d3cd 100644
--- a/src/BuildingBlocks/EventBus/EventBus/Abstractions/IEventBus.cs
+++ b/src/BuildingBlocks/EventBus/EventBus/Abstractions/IEventBus.cs
@@ -5,9 +5,15 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions
{
public interface IEventBus
{
- void Subscribe(Func
handler)
+ void Subscribe()
where T : IntegrationEvent
where TH : IIntegrationEventHandler;
+ void SubscribeDynamic
(string eventName)
+ where TH : IDynamicIntegrationEventHandler;
+
void Unsubscribe()
where TH : IIntegrationEventHandler
where T : IntegrationEvent;
diff --git a/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj b/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
index 37aeb8d1f..fe7e35d98 100644
--- a/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
+++ b/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
@@ -10,6 +10,7 @@
+
diff --git a/src/BuildingBlocks/EventBus/EventBus/IEventBusSubscriptionsManager.cs b/src/BuildingBlocks/EventBus/EventBus/IEventBusSubscriptionsManager.cs
index 2fdefc039..c83c505b1 100644
--- a/src/BuildingBlocks/EventBus/EventBus/IEventBusSubscriptionsManager.cs
+++ b/src/BuildingBlocks/EventBus/EventBus/IEventBusSubscriptionsManager.cs
@@ -2,6 +2,7 @@
using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
using System;
using System.Collections.Generic;
+using static Microsoft.eShopOnContainers.BuildingBlocks.EventBus.InMemoryEventBusSubscriptionsManager;
namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus
{
@@ -9,18 +10,25 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus
{
bool IsEmpty { get; }
event EventHandler OnEventRemoved;
- void AddSubscription(Func
handler)
+ void AddDynamicSubscription
(string eventName)
+ where TH : IDynamicIntegrationEventHandler;
+
+ void AddSubscription()
where T : IntegrationEvent
where TH : IIntegrationEventHandler;
- void RemoveSubscription()
- where TH : IIntegrationEventHandler
- where T : IntegrationEvent;
+ void RemoveSubscription()
+ where TH : IIntegrationEventHandler
+ where T : IntegrationEvent;
+ void RemoveDynamicSubscription
(string eventName)
+ where TH : IDynamicIntegrationEventHandler;
+
bool HasSubscriptionsForEvent() where T : IntegrationEvent;
bool HasSubscriptionsForEvent(string eventName);
Type GetEventTypeByName(string eventName);
void Clear();
- IEnumerable GetHandlersForEvent() where T : IntegrationEvent;
- IEnumerable GetHandlersForEvent(string eventName);
+ IEnumerable GetHandlersForEvent() where T : IntegrationEvent;
+ IEnumerable GetHandlersForEvent(string eventName);
+ string GetEventKey();
}
}
\ No newline at end of file
diff --git a/src/BuildingBlocks/EventBus/EventBus/InMemoryEventBusSubscriptionsManager.cs b/src/BuildingBlocks/EventBus/EventBus/InMemoryEventBusSubscriptionsManager.cs
index 11fdba3c5..88be8cf96 100644
--- a/src/BuildingBlocks/EventBus/EventBus/InMemoryEventBusSubscriptionsManager.cs
+++ b/src/BuildingBlocks/EventBus/EventBus/InMemoryEventBusSubscriptionsManager.cs
@@ -8,64 +8,106 @@ using System.Text;
namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus
{
- public class InMemoryEventBusSubscriptionsManager : IEventBusSubscriptionsManager
+ public partial class InMemoryEventBusSubscriptionsManager : IEventBusSubscriptionsManager
{
- private readonly Dictionary> _handlers;
+
+
+ private readonly Dictionary> _handlers;
private readonly List _eventTypes;
public event EventHandler OnEventRemoved;
public InMemoryEventBusSubscriptionsManager()
{
- _handlers = new Dictionary>();
+ _handlers = new Dictionary>();
_eventTypes = new List();
}
public bool IsEmpty => !_handlers.Keys.Any();
public void Clear() => _handlers.Clear();
- public void AddSubscription(Func
handler)
+ public void AddDynamicSubscription
(string eventName)
+ where TH : IDynamicIntegrationEventHandler
+ {
+ DoAddSubscription(typeof(TH), eventName, isDynamic: true);
+ }
+
+ public void AddSubscription()
where T : IntegrationEvent
where TH : IIntegrationEventHandler
{
- var key = GetEventKey();
- if (!HasSubscriptionsForEvent())
+ var eventName = GetEventKey();
+ DoAddSubscription(typeof(TH), eventName, isDynamic: false);
+ _eventTypes.Add(typeof(T));
+ }
+
+ private void DoAddSubscription(Type handlerType, string eventName, bool isDynamic)
+ {
+ if (!HasSubscriptionsForEvent(eventName))
{
- _handlers.Add(key, new List());
+ _handlers.Add(eventName, new List());
}
- _handlers[key].Add(handler);
- _eventTypes.Add(typeof(T));
+
+ if (_handlers[eventName].Any(s => s.HandlerType == handlerType))
+ {
+ throw new ArgumentException(
+ $"Handler Type {handlerType.Name} already registered for '{eventName}'", nameof(handlerType));
+ }
+
+ if (isDynamic)
+ {
+ _handlers[eventName].Add(SubscriptionInfo.Dynamic(handlerType));
+ }
+ else
+ {
+ _handlers[eventName].Add(SubscriptionInfo.Typed(handlerType));
+ }
+ }
+
+
+ public void RemoveDynamicSubscription
(string eventName)
+ where TH : IDynamicIntegrationEventHandler
+ {
+ var handlerToRemove = FindDynamicSubscriptionToRemove
(eventName);
+ DoRemoveHandler(eventName, handlerToRemove);
}
+
public void RemoveSubscription()
where TH : IIntegrationEventHandler
where T : IntegrationEvent
{
- var handlerToRemove = FindHandlerToRemove();
- if (handlerToRemove != null)
+ var handlerToRemove = FindSubscriptionToRemove();
+ var eventName = GetEventKey();
+ DoRemoveHandler(eventName, handlerToRemove);
+ }
+
+
+ private void DoRemoveHandler(string eventName, SubscriptionInfo subsToRemove)
+ {
+ if (subsToRemove != null)
{
- var key = GetEventKey();
- _handlers[key].Remove(handlerToRemove);
- if (!_handlers[key].Any())
+ _handlers[eventName].Remove(subsToRemove);
+ if (!_handlers[eventName].Any())
{
- _handlers.Remove(key);
- var eventType = _eventTypes.SingleOrDefault(e => e.Name == key);
+ _handlers.Remove(eventName);
+ var eventType = _eventTypes.SingleOrDefault(e => e.Name == eventName);
if (eventType != null)
{
_eventTypes.Remove(eventType);
- RaiseOnEventRemoved(eventType.Name);
}
+ RaiseOnEventRemoved(eventName);
}
-
+
}
}
- public IEnumerable GetHandlersForEvent() where T : IntegrationEvent
+ public IEnumerable GetHandlersForEvent() where T : IntegrationEvent
{
var key = GetEventKey();
return GetHandlersForEvent(key);
}
- public IEnumerable GetHandlersForEvent(string eventName) => _handlers[eventName];
+ public IEnumerable GetHandlersForEvent(string eventName) => _handlers[eventName];
private void RaiseOnEventRemoved(string eventName)
{
@@ -76,26 +118,31 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus
}
}
- private Delegate FindHandlerToRemove()
- where T : IntegrationEvent
- where TH : IIntegrationEventHandler
+
+ private SubscriptionInfo FindDynamicSubscriptionToRemove
(string eventName)
+ where TH : IDynamicIntegrationEventHandler
+ {
+ return DoFindSubscriptionToRemove(eventName, typeof(TH));
+ }
+
+
+ private SubscriptionInfo FindSubscriptionToRemove()
+ where T : IntegrationEvent
+ where TH : IIntegrationEventHandler
+ {
+ var eventName = GetEventKey();
+ return DoFindSubscriptionToRemove(eventName, typeof(TH));
+ }
+
+ private SubscriptionInfo DoFindSubscriptionToRemove(string eventName, Type handlerType)
{
- if (!HasSubscriptionsForEvent())
+ if (!HasSubscriptionsForEvent(eventName))
{
return null;
}
- var key = GetEventKey();
- foreach (var func in _handlers[key])
- {
- var genericArgs = func.GetType().GetGenericArguments();
- if (genericArgs.SingleOrDefault() == typeof(TH))
- {
- return func;
- }
- }
+ return _handlers[eventName].SingleOrDefault(s => s.HandlerType == handlerType);
- return null;
}
public bool HasSubscriptionsForEvent() where T : IntegrationEvent
@@ -104,10 +151,10 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus
return HasSubscriptionsForEvent(key);
}
public bool HasSubscriptionsForEvent(string eventName) => _handlers.ContainsKey(eventName);
-
- public Type GetEventTypeByName(string eventName) => _eventTypes.Single(t => t.Name == eventName);
- private string GetEventKey()
+ public Type GetEventTypeByName(string eventName) => _eventTypes.SingleOrDefault(t => t.Name == eventName);
+
+ public string GetEventKey()
{
return typeof(T).Name;
}
diff --git a/src/BuildingBlocks/EventBus/EventBus/SubscriptionInfo.cs b/src/BuildingBlocks/EventBus/EventBus/SubscriptionInfo.cs
new file mode 100644
index 000000000..a20b3031c
--- /dev/null
+++ b/src/BuildingBlocks/EventBus/EventBus/SubscriptionInfo.cs
@@ -0,0 +1,28 @@
+using System;
+
+namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus
+{
+ public partial class InMemoryEventBusSubscriptionsManager : IEventBusSubscriptionsManager
+ {
+ public class SubscriptionInfo
+ {
+ public bool IsDynamic { get; }
+ public Type HandlerType{ get; }
+
+ private SubscriptionInfo(bool isDynamic, Type handlerType)
+ {
+ IsDynamic = isDynamic;
+ HandlerType = handlerType;
+ }
+
+ public static SubscriptionInfo Dynamic(Type handlerType)
+ {
+ return new SubscriptionInfo(true, handlerType);
+ }
+ public static SubscriptionInfo Typed(Type handlerType)
+ {
+ return new SubscriptionInfo(false, handlerType);
+ }
+ }
+ }
+}
diff --git a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/CommandBusRabbitMQ.cs b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/CommandBusRabbitMQ.cs
new file mode 100644
index 000000000..27e67d9ca
--- /dev/null
+++ b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/CommandBusRabbitMQ.cs
@@ -0,0 +1,145 @@
+//using Microsoft.eShopOnContainers.BuildingBlocks.CommandBus;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Polly;
+using Polly.Retry;
+using RabbitMQ.Client;
+using RabbitMQ.Client.Events;
+using RabbitMQ.Client.Exceptions;
+using System;
+using System.Collections.Generic;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading.Tasks;
+
+/*
+namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ
+{
+ public class CommandBusRabbitMQ : ICommandBus, IDisposable
+ {
+ const string BROKER_NAME = "eshop_command_bus";
+
+ private readonly IRabbitMQPersistentConnection _persistentConnection;
+ private readonly ILogger _logger;
+
+ private IModel _consumerChannel;
+ private string _queueName;
+
+ private readonly Dictionary _handlers;
+ private readonly Dictionary _typeMappings;
+
+ public CommandBusRabbitMQ(IRabbitMQPersistentConnection persistentConnection,
+ ILogger logger)
+ {
+ _logger = logger;
+ _persistentConnection = persistentConnection;
+ _handlers = new Dictionary();
+ _typeMappings = new Dictionary();
+ }
+
+ public void Send(string name, T data)
+ {
+ Send(new IntegrationCommand(name, data));
+ }
+
+ public void Handle(string name, IIntegrationCommandHandler handler)
+ {
+ _handlers.Add(name, handler);
+ _typeMappings.Add(name, typeof(TC));
+ }
+
+ public void Handle(string name, IIntegrationCommandHandler handler)
+ {
+ _handlers.Add(name, handler);
+ }
+ public void Handle(TI handler) where TI : IIntegrationCommandHandler
+ {
+ var name = typeof(TI).Name;
+ _handlers.Add(name, handler);
+ _typeMappings.Add(name, typeof(TC));
+ }
+
+ private void Send(IntegrationCommand command)
+ {
+ if (!_persistentConnection.IsConnected)
+ {
+ _persistentConnection.TryConnect();
+ }
+
+ var policy = RetryPolicy.Handle()
+ .Or()
+ .WaitAndRetry(5, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)), (ex, time) =>
+ {
+ _logger.LogWarning(ex.ToString());
+ });
+
+ using (var channel = _persistentConnection.CreateModel())
+ {
+ var commandName = command.Name;
+ channel.ExchangeDeclare(exchange: BROKER_NAME, type: "direct");
+ var message = JsonConvert.SerializeObject(command);
+ var body = Encoding.UTF8.GetBytes(message);
+ policy.Execute(() =>
+ {
+ channel.BasicPublish(exchange: BROKER_NAME,
+ routingKey: commandName,
+ basicProperties: null,
+ body: body);
+ });
+ }
+ }
+
+ private IModel CreateConsumerChannel()
+ {
+ if (!_persistentConnection.IsConnected)
+ {
+ _persistentConnection.TryConnect();
+ }
+
+ var channel = _persistentConnection.CreateModel();
+
+ channel.ExchangeDeclare(exchange: BROKER_NAME, type: "direct");
+ _queueName = channel.QueueDeclare().QueueName;
+ var consumer = new EventingBasicConsumer(channel);
+ consumer.Received += async (model, ea) =>
+ {
+ var commandName = ea.RoutingKey;
+ var message = Encoding.UTF8.GetString(ea.Body);
+ await InvokeHandler(commandName, message);
+ };
+
+ channel.BasicConsume(queue: _queueName,
+ noAck: true,
+ consumer: consumer);
+
+ channel.CallbackException += (sender, ea) =>
+ {
+ _consumerChannel.Dispose();
+ _consumerChannel = CreateConsumerChannel();
+ };
+
+ return channel;
+ }
+
+ private Task InvokeHandler(string commandName, string message)
+ {
+ if (_handlers.ContainsKey(commandName))
+ {
+
+ }
+
+ }
+
+ public void Dispose()
+ {
+ if (_consumerChannel != null)
+ {
+ _consumerChannel.Dispose();
+ }
+ }
+
+
+
+ }
+}
+*/
\ No newline at end of file
diff --git a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
index adbc52ad1..07a130f22 100644
--- a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
+++ b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
@@ -1,8 +1,10 @@
-using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
+using Autofac;
+using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Polly;
using Polly.Retry;
using RabbitMQ.Client;
@@ -25,17 +27,20 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ
private readonly IRabbitMQPersistentConnection _persistentConnection;
private readonly ILogger _logger;
private readonly IEventBusSubscriptionsManager _subsManager;
-
+ private readonly ILifetimeScope _autofac;
+ private readonly string AUTOFAC_SCOPE_NAME = "eshop_event_bus";
private IModel _consumerChannel;
private string _queueName;
- public EventBusRabbitMQ(IRabbitMQPersistentConnection persistentConnection, ILogger logger, IEventBusSubscriptionsManager subsManager)
+ public EventBusRabbitMQ(IRabbitMQPersistentConnection persistentConnection, ILogger logger,
+ ILifetimeScope autofac, IEventBusSubscriptionsManager subsManager)
{
_persistentConnection = persistentConnection ?? throw new ArgumentNullException(nameof(persistentConnection));
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
_subsManager = subsManager ?? new InMemoryEventBusSubscriptionsManager();
_consumerChannel = CreateConsumerChannel();
+ _autofac = autofac;
_subsManager.OnEventRemoved += SubsManager_OnEventRemoved;
}
@@ -96,12 +101,25 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ
}
}
- public void Subscribe(Func
diff --git a/azure-docs/builds/images/android-build-step1.png b/azure-docs/builds/images/android-build-step1.png
new file mode 100644
index 000000000..b43243b73
Binary files /dev/null and b/azure-docs/builds/images/android-build-step1.png differ
diff --git a/azure-docs/builds/images/android-build-step2.png b/azure-docs/builds/images/android-build-step2.png
new file mode 100644
index 000000000..67419b3ba
Binary files /dev/null and b/azure-docs/builds/images/android-build-step2.png differ
diff --git a/azure-docs/builds/images/android-build-step3.png b/azure-docs/builds/images/android-build-step3.png
new file mode 100644
index 000000000..ae703c16d
Binary files /dev/null and b/azure-docs/builds/images/android-build-step3.png differ
diff --git a/azure-docs/builds/images/android-build-step4.png b/azure-docs/builds/images/android-build-step4.png
new file mode 100644
index 000000000..8311e5647
Binary files /dev/null and b/azure-docs/builds/images/android-build-step4.png differ
diff --git a/azure-docs/builds/images/android-build-step5.png b/azure-docs/builds/images/android-build-step5.png
new file mode 100644
index 000000000..b6789e97f
Binary files /dev/null and b/azure-docs/builds/images/android-build-step5.png differ
diff --git a/azure-docs/builds/images/android-build.png b/azure-docs/builds/images/android-build.png
new file mode 100644
index 000000000..d21233571
Binary files /dev/null and b/azure-docs/builds/images/android-build.png differ
diff --git a/azure-docs/builds/images/ios-build-step1.png b/azure-docs/builds/images/ios-build-step1.png
new file mode 100644
index 000000000..e19a7e803
Binary files /dev/null and b/azure-docs/builds/images/ios-build-step1.png differ
diff --git a/azure-docs/builds/images/ios-build-step2.png b/azure-docs/builds/images/ios-build-step2.png
new file mode 100644
index 000000000..04b747911
Binary files /dev/null and b/azure-docs/builds/images/ios-build-step2.png differ
diff --git a/azure-docs/builds/images/ios-build-step3.png b/azure-docs/builds/images/ios-build-step3.png
new file mode 100644
index 000000000..0744be5e7
Binary files /dev/null and b/azure-docs/builds/images/ios-build-step3.png differ
diff --git a/azure-docs/builds/images/ios-build.png b/azure-docs/builds/images/ios-build.png
new file mode 100644
index 000000000..35f25c29f
Binary files /dev/null and b/azure-docs/builds/images/ios-build.png differ
diff --git a/azure-docs/builds/xamarin-android.md b/azure-docs/builds/xamarin-android.md
new file mode 100644
index 000000000..1459f151e
--- /dev/null
+++ b/azure-docs/builds/xamarin-android.md
@@ -0,0 +1,95 @@
+# Xamarin Android Build
+
+Follow these steps to create a VSTS build for your eShopOnContainers app (android).
+
+**Note**: This document assumes basic knowledge about creating builds and configuring external VSTS connections
+
+## Creating the build
+
+Despite the _"Get Sources"_ task there are five tasks more in the build:
+
+1. Restore NuGet Packages
+2. Build Xamarin Android Project
+3. Download the certstore to sign the APK
+4. Sign the APK
+5. Publish the build artifact.
+
+
+
+Let's discuss each of them.
+
+### Restore NuGet Packages
+
+Add a "NuGet restore" task and enter the following configuration:
+
+1. Enter `eShopOnContainers-Android.sln` in "Path to solution, packages.config, or project.json". This sln is created ex professo for the build and contains only the Xamarin Android project plus the Xamarin Forms one.
+
+
+
+### Build the project
+
+Add a "Xamarin Android" task with following configuration:
+
+1. `**/*Droid*.csproj` in "Project"
+2. `$(build.binariesdirectory)/$(BuildConfiguration)` in "Output Directory"
+3. `$(BuildConfiguration)` in "Configuration"
+4. Ensure that the "Create App Package" checkbox is enabled
+5. In "JDK Options" be sure to select "JDK 8" in the "JDK Version" dropdown.
+
+
+
+### Download the keystore to sign the build
+
+** Note** This require you have a valid keystore. Refer to [this Xamarin article](https://developer.xamarin.com/guides/android/deployment,_testing,_and_metrics/publishing_an_application/part_2_-_signing_the_android_application_package/) for instructions on how create one, using Visual Studio and Xamarin. Or if you prefer, you can read [how use the Android SDK tools to create a keystore](https://developer.android.com/studio/publish/app-signing.html).
+
+This build assumes the keystore is stored somewhere in internet. Beware on where you store your keystores! Keem them safe and privately. Always consider other possible alternatives on where store the keycert:
+
+1. Store in the source control repository, **assuming it's private**. For public repositories this option is discarded
+2. Store in the build agent. If you use a custom VSTS build agent, store the keycert files locally in the agent. This is simple and secure.
+3. Store in internet. If this is the case, **protect the resource**. You can be forced to use this option if your repository is public *and* you use the VSTS hosted agent.
+
+Add a task "Download file" (**Note:** this task is installed [through a VSTS extension](https://marketplace.visualstudio.com/items?itemName=automagically.DownloadFile)) with following configuration:
+
+1. `$(keystore.url)$(keystore.name)` in "File URL"
+2. `$(Build.SourcesDirectory)` in "Destination Folder"
+
+Fill the "Credentials" section accordly.
+
+
+
+**Note:** You can, of course, use any other way to download the file (like a Powershell task).
+
+### Signing the APK
+
+Add a "Android Signing" task with following configuation:
+
+1. `$(build.binariesdirectory)/$(BuildConfiguration)/*.apk` in "APK Files"
+2. Ensure the checkbox "Sign the APK" is checked
+3. `$(Build.SourcesDirectory)\$(keystore.name)` in "Keystore file". This location has to be where the keystore is. If you downloaded it using a previous task (as our example), use the same value. If keystore is physically in the VSTS agent you can use the filepath.
+4. `$(keystore.pwd)` in "Keystore Password"
+5. `$(keystore.alias)` in "Keystore Alias"
+6. `$(key.pwd)` in "Key password".
+7. `-verbose` in "Jarsigner Arguments"
+7. Ensure the checkbox "Zipalign" is checked.
+
+
+
+### Publishing build artifact
+
+Add a "Publish Build Artifacts" task, with following configuration:
+
+1. `$(build.binariesdirectory)/$(BuildConfiguration)` in "Path to publish"
+2. `drop` in "Artifact Name"
+3. `Server` in "Artifact Type"
+
+
+
+## Variables
+
+You need to setup the following variables:
+
+1. `keystore.pwd` -> Password of the keystore
+2. `keystore.alias` -> Alias of the keystore
+3. `keystore.url` -> Full URL of the keystore
+4. `key.pwd` -> Password of the key
+
diff --git a/azure-docs/builds/xamarin-iOS.md b/azure-docs/builds/xamarin-iOS.md
new file mode 100644
index 000000000..a47a880f3
--- /dev/null
+++ b/azure-docs/builds/xamarin-iOS.md
@@ -0,0 +1,63 @@
+# Xamarin iOS Build
+
+Follow these steps to create a VSTS build for your eShopOnContainers app (iOS)
+
+**Note**: This document assumes basic knowledge about creating builds and configuring external VSTS connections
+
+## Creating the build
+
+Despite the _"Get Sources"_ task there are three tasks more in the build:
+
+1. Build Xamarin iOS Project
+2. Copy generated packages
+3. Publish the build artifact.
+
+
+
+Let's discuss each of them.
+
+### Build the project
+
+Add a "Xamarin iOS" task with following configuration:
+
+1. `eShopOnContainers-iOS.sln` in "Solution". This solution has been created ex professo for the build.
+2. Ensure that the "Create App Package" checkbox is enabled
+
+**About signing & Provisioning section**
+
+In order to deploy your app to a physical device you must sign it using a certificate with a provisioning profile. Refer to [this blog
+post of the Xamarin team](https://blog.xamarin.com/continuous-integration-for-ios-apps-with-visual-studio-team-services/) for more info.
+
+Basically you have three options for setting the certificate (p12 file) and the provisioning profile:
+
+1. Use MacInCloud VSTS agent and setup the p12 file and provisioning profile in the setup [https://blogs.msdn.microsoft.com/visualstudioalm/2015/11/18/macincloud-visual-studio-team-services-build-and-improvements-to-ios-build-support/](https://blogs.msdn.microsoft.com/visualstudioalm/2015/11/18/macincloud-visual-studio-team-services-build-and-improvements-to-ios-build-support/)
+2. Use a custom mac machine with the certificate and provisioning profile installed. In this case you don't have to do anything else.
+3. Have the p12 file and the provisioning profile reachable on somewhere
+
+If you choose option 3, you need to download the certificate and the provisioning profile into the build agent (using a previous build task).
+Once downloaded two files, you have to specify the location of both in the "Signing & Provisioning Section".
+
+
+
+### Copy generated files to output folder
+
+Add a "Copy files" task with following configuration:
+
+1. `src/Mobile/eShopOnContainers/eShopOnContainers.iOS/bin/iPhone/$(BuildConfiguration)` in "Source Folder"
+2. `**/*.ipa` in "Contents"
+3. `$(Build.ArtifactStagingDirectory)` in "Target Folder"
+4. Ensure that "Clean Target folder" (under "Advanced" section) is checked
+
+This way we copy the generated IPA in the _Build.ArtifactStagingDirectory_ folder (and remove any previous IPA generated by a previous build).
+
+
+
+### Publishing build artifact
+
+Add a "Publish Build Artifacts" task, with following configuration:
+
+1. `$(Build.ArtifactStagingDirectory)` in "Path to publish"
+2. `drop` in "Artifact Name"
+3. `Server` in "Artifact Type"
+
+
diff --git a/azure-docs/readme.md b/azure-docs/readme.md
new file mode 100644
index 000000000..f7a60b5b3
--- /dev/null
+++ b/azure-docs/readme.md
@@ -0,0 +1,6 @@
+# Azure Related Documentation
+
+## Builds and releases
+
+1. [VSTS build for Xamarin App (Android)](builds/xamarin-android.md)
+2. [VSTS build for Xamarin App (iOS)](builds/xamarin-iOS.md)
diff --git a/cli-linux/build-bits-linux.sh b/cli-linux/build-bits-linux.sh
index 7cda26d8c..cd8c7cc2e 100755
--- a/cli-linux/build-bits-linux.sh
+++ b/cli-linux/build-bits-linux.sh
@@ -1,12 +1,24 @@
#!/bin/bash
+
+declare -x path=$1
+
+if [ -z "$path" ]; then
+ $path="$(pwd)/../src";
+ echo -e "\e[33mNo path passed. Will use $path"
+fi
+
declare -a projectList=(
- '../src/Services/Catalog/Catalog.API'
- '../src/Services/Basket/Basket.API'
- '../src/Services/Ordering/Ordering.API'
- '../src/Services/Identity/Identity.API'
- '../src/Web/WebMVC'
- '../src/Web/WebSPA'
- '../src/Web/WebStatus'
+ "$path/Web/WebSPA"
+ "$path/Services/Catalog/Catalog.API"
+ "$path/Services/Basket/Basket.API"
+ "$path/Services/Ordering/Ordering.API"
+ "$path/Services/Identity/Identity.API"
+ "$path/Services/Location/Locations.API"
+ "$path/Services/Marketing/Marketing.API"
+ "$path/Services/Payment/Payment.API"
+ "$path/Services/GracePeriod/GracePeriodManager"
+ "$path/Web/WebMVC"
+ "$path/Web/WebStatus"
)
# Build SPA app
@@ -15,25 +27,26 @@ declare -a projectList=(
for project in "${projectList[@]}"
do
- echo -e "\e[33mWorking on $(pwd)/$project"
+ echo -e "\e[33mWorking on $path/$project"
echo -e "\e[33m\tRemoving old publish output"
- pushd $(pwd)/$project
+ pushd $path/$project
rm -rf obj/Docker/publish
- echo -e "\e[33m\tRestoring project"
+ echo -e "\e[33m\tRestoring project $project"
dotnet restore
- echo -e "\e[33m\tBuilding and publishing projects"
+ echo -e "\e[33m\tBuilding and publishing $project"
dotnet publish -o obj/Docker/publish
popd
done
-# remove old docker images:
-images=$(docker images --filter=reference="eshop/*" -q)
-if [ -n "$images" ]; then
- docker rm $(docker ps -a -q) -f
- echo "Deleting eShop images in local Docker repo"
- echo $images
- docker rmi $(docker images --filter=reference="eshop/*" -q) -f
-fi
+## remove old docker images:
+#images=$(docker images --filter=reference="eshop/*" -q)
+#if [ -n "$images" ]; then
+# docker rm $(docker ps -a -q) -f
+# echo "Deleting eShop images in local Docker repo"
+# echo $images
+# docker rmi $(docker images --filter=reference="eshop/*" -q) -f
+#fi
+
# No need to build the images, docker build or docker compose will
# do that using the images and containers defined in the docker-compose.yml file.
diff --git a/cli-linux/run.sh b/cli-linux/run.sh
new file mode 100644
index 000000000..aaeb164fa
--- /dev/null
+++ b/cli-linux/run.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+docker stop $(docker ps -a -q)
+docker rm $(docker ps -a -q)
+docker images |grep -v REPOSITORY|awk '{print $1}'|xargs -L1 docker pull
+export ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=$(curl ipinfo.io/ip)
+docker-compose -f docker-compose.images.yml -f docker-compose.prod.yml up -d --force-recreate
+
diff --git a/cli-windows/build-images.ps1 b/cli-windows/build-images.ps1
new file mode 100644
index 000000000..d454f3a14
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/deploy/az/azurefunctions/azurefunctionsdeploy.json b/deploy/az/azurefunctions/azurefunctionsdeploy.json
new file mode 100644
index 000000000..4143d73e5
--- /dev/null
+++ b/deploy/az/azurefunctions/azurefunctionsdeploy.json
@@ -0,0 +1,228 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "SitesEshopfunctionsName": {
+ "type": "string",
+ "metadata": {
+ "description": "Name of the Azure Functions namespace"
+ }
+ }
+ },
+ "variables": {
+ "SitesEshopfunctionsName": "[parameters('SitesEshopfunctionsName')]",
+ "WebConfigName": "[concat(variables('SitesEshopfunctionsName'), '/web')]",
+ "Location": "[resourceGroup().location]",
+ "EshopAccountsDatabase": "[concat(variables('SitesEshopfunctionsName'), 'db')]",
+ "ServerFarmPlan": "[concat(trim(variables('location')), 'Plan')]",
+ "StorageAccounts": "[concat(variables('SitesEshopfunctionsName'), 'st')]"
+ },
+ "resources": [
+ {
+ "type": "Microsoft.DocumentDB/databaseAccounts",
+ "kind": "GlobalDocumentDB",
+ "name": "[variables('EshopAccountsDatabase')]",
+ "apiVersion": "2015-04-08",
+ "location": "[variables('Location')]",
+ "tags": {},
+ "scale": null,
+ "properties": {
+ "databaseAccountOfferType": "Standard",
+ "consistencyPolicy": {
+ "defaultConsistencyLevel": "Session",
+ "maxIntervalInSeconds": 5,
+ "maxStalenessPrefix": 100
+ },
+ "name": null
+ },
+ "dependsOn": []
+ },
+ {
+ "type": "Microsoft.Storage/storageAccounts",
+ "sku": {
+ "name": "Standard_LRS",
+ "tier": "Standard"
+ },
+ "kind": "Storage",
+ "name": "[variables('StorageAccounts')]",
+ "apiVersion": "2016-01-01",
+ "location": "[variables('Location')]",
+ "tags": {},
+ "scale": null,
+ "properties": {},
+ "dependsOn": []
+ },
+ {
+ "type": "Microsoft.Web/serverfarms",
+ "sku": {
+ "name": "Y1",
+ "tier": "Dynamic",
+ "size": "Y1",
+ "family": "Y",
+ "capacity": 0
+ },
+ "kind": "functionapp",
+ "name": "[variables('ServerFarmPlan')]",
+ "apiVersion": "2015-08-01",
+ "location": "[variables('Location')]",
+ "scale": null,
+ "properties": {
+ "name": "[variables('ServerFarmPlan')]",
+ "numberOfWorkers": 0
+ },
+ "dependsOn": []
+ },
+ {
+ "type": "Microsoft.Web/sites",
+ "kind": "functionapp",
+ "name": "[variables('SitesEshopfunctionsName')]",
+ "apiVersion": "2015-08-01",
+ "location": "[variables('Location')]",
+ "scale": null,
+ "properties": {
+ "name": "[variables('SitesEshopfunctionsName')]",
+ "hostNames": [
+ "[concat(variables('SitesEshopfunctionsName'),'.azurewebsites.net')]"
+ ],
+ "enabledHostNames": [
+ "[concat(variables('SitesEshopfunctionsName'),'.azurewebsites.net')]",
+ "[concat(variables('SitesEshopfunctionsName'),'.scm.azurewebsites.net')]"
+ ],
+ "hostNameSslStates": [
+ {
+ "name": "[concat(variables('SitesEshopfunctionsName'),'.azurewebsites.net')]",
+ "sslState": 0,
+ "thumbprint": null,
+ "ipBasedSslState": 0
+ },
+ {
+ "name": "[concat(variables('SitesEshopfunctionsName'),'.scm.azurewebsites.net')]",
+ "sslState": 0,
+ "thumbprint": null,
+ "ipBasedSslState": 0
+ }
+ ],
+ "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('ServerFarmPlan'))]"
+ },
+ "dependsOn": [
+ "[resourceId('Microsoft.Web/serverfarms', variables('ServerFarmPlan'))]"
+ ]
+ },
+ {
+ "type": "Microsoft.Web/sites/config",
+ "name": "[variables('WebConfigName')]",
+ "apiVersion": "2015-08-01",
+ "location": "[variables('Location')]",
+ "scale": null,
+ "properties": {
+ "numberOfWorkers": 1,
+ "defaultDocuments": [
+ "Default.htm",
+ "Default.html",
+ "Default.asp",
+ "index.htm",
+ "index.html",
+ "iisstart.htm",
+ "default.aspx",
+ "index.php",
+ "hostingstart.html"
+ ],
+ "netFrameworkVersion": "v4.0",
+ "phpVersion": "5.6",
+ "pythonVersion": "",
+ "nodeVersion": "",
+ "linuxFxVersion": "",
+ "requestTracingEnabled": false,
+ "remoteDebuggingEnabled": false,
+ "remoteDebuggingVersion": null,
+ "httpLoggingEnabled": false,
+ "logsDirectorySizeLimit": 35,
+ "detailedErrorLoggingEnabled": false,
+ "publishingUsername": "$eshopfunctions",
+ "publishingPassword": null,
+ "appSettings": null,
+ "metadata": null,
+ "connectionStrings": null,
+ "machineKey": null,
+ "handlerMappings": null,
+ "documentRoot": null,
+ "scmType": "None",
+ "use32BitWorkerProcess": true,
+ "webSocketsEnabled": false,
+ "alwaysOn": false,
+ "javaVersion": null,
+ "javaContainer": null,
+ "javaContainerVersion": null,
+ "appCommandLine": "",
+ "managedPipelineMode": 0,
+ "virtualApplications": [
+ {
+ "virtualPath": "/",
+ "physicalPath": "site\\wwwroot",
+ "preloadEnabled": false,
+ "virtualDirectories": null
+ }
+ ],
+ "winAuthAdminState": 0,
+ "winAuthTenantState": 0,
+ "customAppPoolIdentityAdminState": false,
+ "customAppPoolIdentityTenantState": false,
+ "runtimeADUser": null,
+ "runtimeADUserPassword": null,
+ "loadBalancing": 1,
+ "routingRules": [],
+ "experiments": {
+ "rampUpRules": []
+ },
+ "limits": null,
+ "autoHealEnabled": false,
+ "autoHealRules": {
+ "triggers": null,
+ "actions": null
+ },
+ "tracingOptions": null,
+ "vnetName": "",
+ "siteAuthEnabled": false,
+ "siteAuthSettings": {
+ "enabled": null,
+ "unauthenticatedClientAction": null,
+ "tokenStoreEnabled": null,
+ "allowedExternalRedirectUrls": null,
+ "defaultProvider": null,
+ "clientId": null,
+ "clientSecret": null,
+ "issuer": null,
+ "allowedAudiences": null,
+ "additionalLoginParams": null,
+ "isAadAutoProvisioned": false,
+ "googleClientId": null,
+ "googleClientSecret": null,
+ "googleOAuthScopes": null,
+ "facebookAppId": null,
+ "facebookAppSecret": null,
+ "facebookOAuthScopes": null,
+ "twitterConsumerKey": null,
+ "twitterConsumerSecret": null,
+ "microsoftAccountClientId": null,
+ "microsoftAccountClientSecret": null,
+ "microsoftAccountOAuthScopes": null
+ },
+ "cors": {
+ "allowedOrigins": [
+ "https://functions.azure.com",
+ "https://functions-staging.azure.com",
+ "https://functions-next.azure.com"
+ ]
+ },
+ "push": null,
+ "apiDefinition": null,
+ "autoSwapSlotName": null,
+ "localMySqlEnabled": false,
+ "ipSecurityRestrictions": null
+ },
+ "dependsOn": [
+ "[resourceId('Microsoft.Web/sites', variables('SitesEshopfunctionsName'))]"
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/deploy/az/azurefunctions/azurefunctionsdeploy.parameters.json b/deploy/az/azurefunctions/azurefunctionsdeploy.parameters.json
new file mode 100644
index 000000000..8472e9998
--- /dev/null
+++ b/deploy/az/azurefunctions/azurefunctionsdeploy.parameters.json
@@ -0,0 +1,5 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {}
+}
\ No newline at end of file
diff --git a/deploy/az/azurefunctions/readme.md b/deploy/az/azurefunctions/readme.md
new file mode 100644
index 000000000..5716bf615
--- /dev/null
+++ b/deploy/az/azurefunctions/readme.md
@@ -0,0 +1,37 @@
+# Deploying Azure Functions
+
+The ARM template `azurefunctionsdeploy.json` and its parameter file (`azurefunctionsdeploy.parameters.json`) are used to deploy Marketing azure functions.
+
+## Editing azurefunctionsdeploy.parameters.json file
+
+You can edit the `azurefunctionsdeploy.parameters.parameters.json` file to set your values, but is not needed.
+
+## Deploy the template
+
+Once parameter file is edited you can deploy it using [create-resources script](../readme.md).
+
+i. e. if you are in windows, to deploy sql databases in a new resourcegroup located in westus, go to `deploy\az` folder and type:
+
+```
+create-resources.cmd azurefunctions\azurefunctionsdeploy newResourceGroup -c westus
+```
+## Deploy Marketing azure function with Visual Studio.
+
+Alternatively, instead of using ARM templates, you can deploy Marketing azure function directly by publishing the project Marketing-functions in eShopOnContainers-AzureFunctions.sln with Visual Studio publish tool.
+
+## Setting Azure function configurations
+
+Once deployed, go to azure portal and set the connection string for the azure function under the name "SqlConnection". The value must be the connection string which points to MarketingDB.
+
+Example:
+
+"SqlConnection": "Server=tcp:eshopsql.database.windows.net,1433;Initial Catalog=marketingdb;"
+
+In appsettings section, add a new entry named "MarketingStorageUri". The value must be the uri of the blob storage where the campaign images are stored.
+
+Example:
+
+"MarketingStorageUri": "https://marketingcampaign.blob.core.windows.net/pics/"
+
+
+
diff --git a/deploy/az/cosmos/deploycosmos.json b/deploy/az/cosmos/deploycosmos.json
new file mode 100644
index 000000000..8c03983a2
--- /dev/null
+++ b/deploy/az/cosmos/deploycosmos.json
@@ -0,0 +1,32 @@
+{
+ "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "name": {
+ "type": "String"
+ }
+ },
+ "variables": {
+ "name": "[concat(parameters('name'), uniqueString(resourceGroup().id))]",
+ "location":"[resourceGroup().location]"
+ },
+ "resources": [
+ {
+ "type": "Microsoft.DocumentDb/databaseAccounts",
+ "kind": "MongoDB",
+ "name": "[variables('name')]",
+ "apiVersion": "2015-04-08",
+ "location": "[variables('location')]",
+ "properties": {
+ "databaseAccountOfferType": "Standard",
+ "locations": [
+ {
+ "id": "[concat(variables('name'), '-', variables('location'))]",
+ "failoverPriority": 0,
+ "locationName": "[variables('location')]"
+ }
+ ]
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/deploy/az/cosmos/deploycosmos.parameters.json b/deploy/az/cosmos/deploycosmos.parameters.json
new file mode 100644
index 000000000..725bb7cf9
--- /dev/null
+++ b/deploy/az/cosmos/deploycosmos.parameters.json
@@ -0,0 +1,9 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "name": {
+ "value": "eshop-nosql"
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/create-resources.cmd b/deploy/az/create-resources.cmd
new file mode 100644
index 000000000..bd27efe3e
--- /dev/null
+++ b/deploy/az/create-resources.cmd
@@ -0,0 +1,23 @@
+@echo off
+if %1.==. GOTO error
+if %2.==. GOTO error
+if NOT %3.==-c. GOTO deployresources
+if %4.==. GOTO error
+echo Creating resource group %2 in '%4'
+call az group create --name %2 --location %4
+:deployresources
+echo Deploying ARM template '%1.json' in resource group %2
+call az group deployment create --resource-group %2 --parameters @%1.parameters.json --template-file %1.json
+GOTO end
+:error
+echo.
+echo Usage:
+echo create-resources arm-file resource-group-name [-c location]
+echo arm-file: Path to ARM template WITHOUT .json extension. An parameter file with same name plus '.parameters' MUST exist in same folde
+echo resource-grop-name: Name of the resource group to use or create
+echo -c: If appears means that resource group must be created. If -c is specified, must use enter location
+echo.
+echo Examples:
+echo create-resources path_and_filename testgroup (Deploys path_and_filename.json with parameters specified in path_and_filename.parameters.json file).
+echo create-resources path_and_filename newgroup -c westus (Deploys path_and_filename.json (with parameters specified in path_and_filename.parameters.json file) in a NEW resource group named newgroup in the westus location)
+:end
diff --git a/deploy/az/readme.md b/deploy/az/readme.md
new file mode 100644
index 000000000..cee4581cb
--- /dev/null
+++ b/deploy/az/readme.md
@@ -0,0 +1,20 @@
+# Deploying resources using create-resources script
+
+The `create-resources` script is a basic script to allow easy deployment of one ARM template in one resource group. You can deploy to an existing resource group or to create one.
+
+## Deploying to a existing resource group
+
+Just type `create-resources path-to-arm-template resourcegroup`. Called this way the script will:
+
+1. Search for `path-to-arm-template.json` and `path-to-arm-template.parameters.json` files
+2. If they exist, will deploy them in the `resourcegroup` specified (that has to exist).
+
+## Deploying to a new resource group
+
+Just type `create-resources path-to-arm-template resourcegroup -c location`. Called this way the script will:
+
+1. Search for `path-to-arm-template.json` and `path-to-arm-template.parameters.json` files
+2. If they exist, will create the `resourcegroup` specified in the `location` specified.
+3. Finally will deploy `path-to-arm-template.json` and `path-to-arm-template.parameters.json` files in the `resourcegroup`
+
+
diff --git a/deploy/az/redis/readme.md b/deploy/az/redis/readme.md
new file mode 100644
index 000000000..093a9af14
--- /dev/null
+++ b/deploy/az/redis/readme.md
@@ -0,0 +1,31 @@
+# Deploying Redis Cache
+
+The ARM template `redisdeploy.json` and its parameter file (`redisdeploy.parameters.json`) are used to deploy following resources:
+
+1. One Redis Cache
+
+## Editing sbusdeploy.parameters.json file
+
+You can edit the `redisdeploy.parameters.parameters.json` file to set your values, but is not needed. The only parameter than can
+be set is:
+
+1. `namespaceprefix` is a string that is used to create the Redis namespace. ARM script creates unique values by appending a unique string to this parameter value, so you can leave the default value.
+
+## Deploy the template
+
+Once parameter file is edited you can deploy it using [create-resources script](../readme.md).
+
+i. e. if you are in windows, to deploy sql databases in a new resourcegroup located in westus, go to `deploy\az` folder and type:
+
+```
+create-resources.cmd redis\redisdeploy newResourceGroup -c westus
+```
+
+
+
+
+
+
+
+
+
diff --git a/deploy/az/redis/redisdeploy.json b/deploy/az/redis/redisdeploy.json
new file mode 100644
index 000000000..04b53a3b6
--- /dev/null
+++ b/deploy/az/redis/redisdeploy.json
@@ -0,0 +1,42 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "namespaceprefix": {
+ "type": "string",
+ "metadata": {
+ "description": "Name of the Redis namespace"
+ }
+ }
+ },
+ "variables": {
+ "location": "[resourceGroup().location]",
+ "namespaceprefix": "[concat(parameters('namespaceprefix'), uniqueString(resourceGroup().id))]",
+ "sbVersion": "2016-04-01"
+ },
+ "resources": [
+ {
+ "type": "Microsoft.Cache/Redis",
+ "name": "[variables('namespaceprefix')]",
+ "apiVersion": "[variables('sbVersion')]",
+ "location": "[variables('location')]",
+ "scale": null,
+ "properties": {
+ "redisVersion": "3.2.7",
+ "sku": {
+ "name": "Standard",
+ "family": "C",
+ "capacity": 1
+ },
+ "enableNonSslPort": true,
+ "redisConfiguration": {
+ "maxclients": "1000",
+ "maxmemory-reserved": "50",
+ "maxfragmentationmemory-reserved": "50",
+ "maxmemory-policy": "volatile-lru",
+ "maxmemory-delta": "50"
+ }
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/deploy/az/redis/redisdeploy.parameters.json b/deploy/az/redis/redisdeploy.parameters.json
new file mode 100644
index 000000000..42d2e470e
--- /dev/null
+++ b/deploy/az/redis/redisdeploy.parameters.json
@@ -0,0 +1,9 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "namespaceprefix": {
+ "value": "eshopredis"
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/servicebus/readme.md b/deploy/az/servicebus/readme.md
new file mode 100644
index 000000000..3ed8e8a0e
--- /dev/null
+++ b/deploy/az/servicebus/readme.md
@@ -0,0 +1,33 @@
+# Deploying Azure Service Bus
+
+The ARM template `sbusdeploy.json` and its parameter file (`sbusdeploy.parameters.json`) are used to deploy following resources:
+
+1. One Service Bus namespace
+2. One Service Bus
+3. Subscriptions used by application
+
+## Editing sbusdeploy.parameters.json file
+
+You can edit the `sbusdeploy.parameters.parameters.json` file to set your values, but is not needed. The only parameter than can
+be set is:
+
+1. `namespaceprefix` is a string that is used to create the namespace. ARM script creates unique values by appending a unique string to this parameter value, so you can leave the default value.
+
+## Deploy the template
+
+Once parameter file is edited you can deploy it using [create-resources script](../readme.md).
+
+i. e. if you are in windows, to deploy sql databases in a new resourcegroup located in westus, go to `deploy\az` folder and type:
+
+```
+create-resources.cmd servicebus\sbusdeploy newResourceGroup -c westus
+```
+
+
+
+
+
+
+
+
+
diff --git a/deploy/az/servicebus/sbusdeploy.json b/deploy/az/servicebus/sbusdeploy.json
new file mode 100644
index 000000000..50c1c6c54
--- /dev/null
+++ b/deploy/az/servicebus/sbusdeploy.json
@@ -0,0 +1,229 @@
+{
+ "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "namespaceprefix": {
+ "type": "string",
+ "metadata": {
+ "description": "Name of the Service Bus namespace"
+ }
+ }
+ },
+ "variables": {
+ "serviceBusTopicName": "eshop_event_bus",
+ "BasketSubscriptionName": "Basket",
+ "CatalogSubscriptionName": "Catalog",
+ "OrderingSubscriptionName": "Ordering",
+ "LocationsSubscriptionName": "Locations",
+ "MarketingSubscriptionName": "Marketing",
+ "GracePeriodSubscriptionName": "GracePeriod",
+ "PaymentSubscriptionName": "Payment",
+ "location": "[resourceGroup().location]",
+ "sbVersion": "2015-08-01",
+ "defaultSASKeyName": "Root",
+ "namespace":"[concat(parameters('namespaceprefix'), uniqueString(resourceGroup().id))]",
+ "authRuleResourceId": "[resourceId('Microsoft.ServiceBus/namespaces/topics/authorizationRules', variables('namespace'), variables('serviceBusTopicName'), variables('defaultSASKeyName'))]"
+ },
+ "resources": [
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('namespace')]",
+ "type": "Microsoft.ServiceBus/Namespaces",
+ "location": "[variables('location')]",
+ "sku": {
+ "name": "Standard",
+ "tier": "Standard"
+ },
+ "resources": [
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('serviceBusTopicName')]",
+ "type": "Topics",
+ "dependsOn": [
+ "[concat('Microsoft.ServiceBus/namespaces/', variables('namespace'))]"
+ ],
+ "properties": {
+ "path": "[variables('serviceBusTopicName')]",
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "maxSizeInMegabytes": 1024,
+ "requiresDuplicateDetection": false,
+ "enableBatchedOperations": true,
+ "sizeInBytes": 0,
+ "filteringMessagesBeforePublishing": false,
+ "isAnonymousAccessible": false,
+ "status": "Active",
+ "supportOrdering": false,
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "enablePartitioning": true,
+ "isExpress": false,
+ "enableSubscriptionPartitioning": false,
+ "enableExpress": false
+ },
+ "resources": [
+ {
+ "type": "AuthorizationRules",
+ "name": "[variables('defaultSASKeyName')]",
+ "apiVersion": "[variables('sbVersion')]",
+ "properties": {
+ "rights": [
+ "Manage",
+ "Send",
+ "Listen"
+ ]
+ },
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ]
+ },
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('BasketSubscriptionName')]",
+ "type": "Subscriptions",
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ],
+ "properties": {
+ "lockDuration": "00:00:30",
+ "requiresSession": false,
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "deadLetteringOnMessageExpiration": true,
+ "deadLetteringOnFilterEvaluationExceptions": true,
+ "maxDeliveryCount": 10,
+ "enableBatchedOperations": false,
+ "status": "Active",
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "entityAvailabilityStatus": "Available"
+ }
+ },
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('OrderingSubscriptionName')]",
+ "type": "Subscriptions",
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ],
+ "properties": {
+ "lockDuration": "00:00:30",
+ "requiresSession": false,
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "deadLetteringOnMessageExpiration": true,
+ "deadLetteringOnFilterEvaluationExceptions": true,
+ "maxDeliveryCount": 10,
+ "enableBatchedOperations": false,
+ "status": "Active",
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "entityAvailabilityStatus": "Available"
+ }
+ },
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('CatalogSubscriptionName')]",
+ "type": "Subscriptions",
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ],
+ "properties": {
+ "lockDuration": "00:00:30",
+ "requiresSession": false,
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "deadLetteringOnMessageExpiration": true,
+ "deadLetteringOnFilterEvaluationExceptions": true,
+ "maxDeliveryCount": 10,
+ "enableBatchedOperations": false,
+ "status": "Active",
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "entityAvailabilityStatus": "Available"
+ }
+ },
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('LocationsSubscriptionName')]",
+ "type": "Subscriptions",
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ],
+ "properties": {
+ "lockDuration": "00:00:30",
+ "requiresSession": false,
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "deadLetteringOnMessageExpiration": true,
+ "deadLetteringOnFilterEvaluationExceptions": true,
+ "maxDeliveryCount": 10,
+ "enableBatchedOperations": false,
+ "status": "Active",
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "entityAvailabilityStatus": "Available"
+ }
+ },
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('MarketingSubscriptionName')]",
+ "type": "Subscriptions",
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ],
+ "properties": {
+ "lockDuration": "00:00:30",
+ "requiresSession": false,
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "deadLetteringOnMessageExpiration": true,
+ "deadLetteringOnFilterEvaluationExceptions": true,
+ "maxDeliveryCount": 10,
+ "enableBatchedOperations": false,
+ "status": "Active",
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "entityAvailabilityStatus": "Available"
+ }
+ },
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('GracePeriodSubscriptionName')]",
+ "type": "Subscriptions",
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ],
+ "properties": {
+ "lockDuration": "00:00:30",
+ "requiresSession": false,
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "deadLetteringOnMessageExpiration": true,
+ "deadLetteringOnFilterEvaluationExceptions": true,
+ "maxDeliveryCount": 10,
+ "enableBatchedOperations": false,
+ "status": "Active",
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "entityAvailabilityStatus": "Available"
+ }
+ },
+ {
+ "apiVersion": "[variables('sbVersion')]",
+ "name": "[variables('PaymentSubscriptionName')]",
+ "type": "Subscriptions",
+ "dependsOn": [
+ "[variables('serviceBusTopicName')]"
+ ],
+ "properties": {
+ "lockDuration": "00:00:30",
+ "requiresSession": false,
+ "defaultMessageTimeToLive": "14.00:00:00",
+ "deadLetteringOnMessageExpiration": true,
+ "deadLetteringOnFilterEvaluationExceptions": true,
+ "maxDeliveryCount": 10,
+ "enableBatchedOperations": false,
+ "status": "Active",
+ "autoDeleteOnIdle": "10675199.02:48:05.4775807",
+ "entityAvailabilityStatus": "Available"
+ }
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "outputs": {
+ "NamespaceConnectionString": {
+ "type": "string",
+ "value": "[listkeys(variables('authRuleResourceId'), variables('sbVersion')).primaryConnectionString]"
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/servicebus/sbusdeploy.parameters.json b/deploy/az/servicebus/sbusdeploy.parameters.json
new file mode 100644
index 000000000..f14b5329d
--- /dev/null
+++ b/deploy/az/servicebus/sbusdeploy.parameters.json
@@ -0,0 +1,9 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "namespaceprefix": {
+ "value": "eshopsb"
+ }
+ }
+}
diff --git a/deploy/az/sql/readme.md b/deploy/az/sql/readme.md
new file mode 100644
index 000000000..0359fb727
--- /dev/null
+++ b/deploy/az/sql/readme.md
@@ -0,0 +1,36 @@
+# Deploying SQL Server & SQL Databases
+
+The ARM template `sqldeploy.json` and its parameter file (`sqldeploy.parameters.json`) are used to deploy following resources:
+
+1. One SQL Server
+2. Three SQL databases (for ordering, catalog and identity) services.
+3. Firewall rules to **allow access from any IP to SQL Server**. This allows easy management, but is not desired in production environments.
+
+## Editing sqldeploy.parameters.json file
+
+You **must** edit the `sqldeploy.parameters.json` file to set login and password of the admin user.
+
+1. `sql_server` is a object parameter that contains the sql server name and the database names. You can leave default values if you want.
+2. `admin` is a string with the admin logon. You MUST provide a valid value
+3. `adminpwd` is a string with the admin password. You MUST provide a valid value
+
+ARM script ensures uniqueness of the SQL server created by appending one unique string in its name (defined in the `sql_server.name` parameter).
+
+## Deploy the template
+
+Once parameter file is edited you can deploy it using [create-resources script](../readme.md).
+i. e. if you are in windows, to deploy sql databases in a new resourcegroup located in westus, go to `deploy\az` folder and type:
+
+```
+create-resources.cmd sql\sqldeploy newResourceGroup -c westus
+```
+
+
+
+
+
+
+
+
+
+
diff --git a/deploy/az/sql/sqldeploy.json b/deploy/az/sql/sqldeploy.json
new file mode 100644
index 000000000..397c94ad6
--- /dev/null
+++ b/deploy/az/sql/sqldeploy.json
@@ -0,0 +1,123 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "sql_server": {
+ "type": "object"
+ },
+ "admin": {
+ "type": "string"
+ },
+ "adminpwd": {
+ "type": "string"
+ }
+ },
+ "variables": {
+ "sql_server_name": "[concat(parameters('sql_server').name, '-', uniqueString(resourceGroup().id))]",
+ "admin": "[parameters('admin')]",
+ "adminpwd": "[parameters('adminpwd')]"
+ },
+ "resources": [
+ {
+ "type": "Microsoft.Sql/servers",
+ "name": "[variables('sql_server_name')]",
+ "apiVersion": "2014-04-01-preview",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "administratorLogin": "[variables('admin')]",
+ "administratorLoginPassword": "[variables('adminpwd')]",
+ "version": "12.0"
+ },
+ "resources": [
+ {
+ "type": "databases",
+ "name": "[parameters('sql_server').dbs.ordering]",
+ "apiVersion": "2014-04-01-preview",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "edition": "Standard",
+ "collation": "SQL_Latin1_General_CP1_CI_AS",
+ "maxSizeBytes": "1073741824",
+ "requestedServiceObjectiveName": "S1"
+ },
+ "dependsOn": [
+ "[concat('Microsoft.Sql/servers/', variables('sql_server_name'))]"
+ ]
+ },
+ {
+ "type": "databases",
+ "name": "[parameters('sql_server').dbs.identity]",
+ "apiVersion": "2014-04-01-preview",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "edition": "Standard",
+ "collation": "SQL_Latin1_General_CP1_CI_AS",
+ "maxSizeBytes": "1073741824",
+ "requestedServiceObjectiveName": "S1"
+ },
+ "dependsOn": [
+ "[concat('Microsoft.Sql/servers/', variables('sql_server_name'))]"
+ ]
+ },
+ {
+ "type": "databases",
+ "name": "[parameters('sql_server').dbs.catalog]",
+ "apiVersion": "2014-04-01-preview",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "edition": "Standard",
+ "collation": "SQL_Latin1_General_CP1_CI_AS",
+ "maxSizeBytes": "1073741824",
+ "requestedServiceObjectiveName": "S1"
+ },
+ "dependsOn": [
+ "[concat('Microsoft.Sql/servers/', variables('sql_server_name'))]"
+ ]
+ },
+ {
+ "type": "databases",
+ "name": "[parameters('sql_server').dbs.marketing]",
+ "apiVersion": "2014-04-01-preview",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "edition": "Standard",
+ "collation": "SQL_Latin1_General_CP1_CI_AS",
+ "maxSizeBytes": "1073741824",
+ "requestedServiceObjectiveName": "S1"
+ },
+ "dependsOn": [
+ "[concat('Microsoft.Sql/servers/', variables('sql_server_name'))]"
+ ]
+ },
+ {
+ "type": "firewallrules",
+ "name": "AllowAllWindowsAzureIps",
+ "apiVersion": "2014-04-01-preview",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "startIpAddress": "0.0.0.0",
+ "endIpAddress": "0.0.0.0"
+ },
+ "dependsOn": [
+ "[concat('Microsoft.Sql/servers/', variables('sql_server_name'))]"
+ ]
+ },
+ {
+ "type": "firewallrules",
+ "name": "AllConnectionsAllowed",
+ "apiVersion": "2014-04-01-preview",
+ "location": "[resourceGroup().location]",
+ "properties": {
+ "startIpAddress": "0.0.0.0",
+ "endIpAddress": "255.255.255.255"
+ },
+ "dependsOn": [
+ "[concat('Microsoft.Sql/servers/', variables('sql_server_name'))]"
+ ]
+ }
+ ]
+ }
+ ],
+ "outputs": {
+ }
+}
diff --git a/deploy/az/sql/sqldeploy.parameters.json b/deploy/az/sql/sqldeploy.parameters.json
new file mode 100644
index 000000000..982e78f4c
--- /dev/null
+++ b/deploy/az/sql/sqldeploy.parameters.json
@@ -0,0 +1,23 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "sql_server": {
+ "value": {
+ "name": "eshopsql",
+ "dbs": {
+ "ordering": "orderingdb",
+ "identity": "identitydb",
+ "catalog": "catalogdb",
+ "marketing": "marketingdb"
+ }
+ }
+ },
+ "admin": {
+ "value": null
+ },
+ "adminpwd": {
+ "value": null
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/storage/catalog/deploystorage.json b/deploy/az/storage/catalog/deploystorage.json
new file mode 100644
index 000000000..e3fced6b2
--- /dev/null
+++ b/deploy/az/storage/catalog/deploystorage.json
@@ -0,0 +1,91 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "catalogstorage": {
+ "type": "string"
+ },
+ "profileName" : {
+ "type": "string"
+ }
+ },
+ "variables": {
+ "catalogstorage": "[concat(parameters('catalogstorage'), uniqueString(resourceGroup().id))]",
+ "endpointName": "[concat('endpoint-', uniqueString(resourceGroup().id))]",
+ "profileName": "[parameters('profileName')]"
+ },
+ "resources": [
+ {
+ "type": "Microsoft.Storage/storageAccounts",
+ "name": "[variables('catalogstorage')]",
+ "apiVersion": "2016-01-01",
+ "location": "[resourceGroup().location]",
+ "tags": {
+ "displayName": "[variables('catalogstorage')]"
+ },
+ "sku": {
+ "name": "Standard_LRS"
+ },
+ "kind": "Storage"
+ },
+ {
+ "name": "[variables('profileName')]",
+ "type": "Microsoft.Cdn/profiles",
+ "location": "[resourceGroup().location]",
+ "apiVersion": "2016-04-02",
+ "tags": {
+ "displayName": "[variables('profileName')]"
+ },
+ "sku": {
+ "name": "Standard_Verizon"
+ },
+ "resources": [
+ {
+ "apiVersion": "2016-04-02",
+ "name": "[variables('endpointName')]",
+ "type": "endpoints",
+ "dependsOn": [
+ "[variables('profileName')]",
+ "[variables('catalogstorage')]"
+ ],
+ "location": "[resourceGroup().location]",
+ "tags": {
+ "displayName": "[variables('endpointName')]"
+ },
+ "properties": {
+ "originHostHeader": "[replace(replace(reference(resourceId('Microsoft.Storage/storageAccounts', variables('catalogstorage')),'2015-06-15' ).primaryEndpoints.blob,'https://',''),'/','')]",
+ "isHttpAllowed": true,
+ "isHttpsAllowed": true,
+ "queryStringCachingBehavior": "IgnoreQueryString",
+ "contentTypesToCompress": [
+ "text/plain",
+ "text/html",
+ "text/css",
+ "application/x-javascript",
+ "text/javascript"
+ ],
+ "isCompressionEnabled": "True",
+ "origins": [
+ {
+ "name": "origin1",
+ "properties": {
+ "hostName": "[replace(replace(reference(resourceId('Microsoft.Storage/storageAccounts', variables('catalogstorage')),'2015-06-15' ).primaryEndpoints.blob,'https://',''),'/','')]"
+ }
+ }
+ ]
+ }
+ }
+ ]
+ }
+ ],
+ "outputs": {
+ "hostName": {
+ "type": "string",
+ "value": "[reference(resourceId('Microsoft.cdn/profiles/endpoints', variables('profileName'), variables('endpointName'))).hostName]"
+ },
+ "originHostHeader": {
+ "type": "string",
+ "value": "[reference(resourceId('Microsoft.cdn/profiles/endpoints', variables('profileName'), variables('endpointName'))).originHostHeader]"
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/storage/catalog/deploystorage.parameters.json b/deploy/az/storage/catalog/deploystorage.parameters.json
new file mode 100644
index 000000000..2c5256a09
--- /dev/null
+++ b/deploy/az/storage/catalog/deploystorage.parameters.json
@@ -0,0 +1,12 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "catalogstorage": {
+ "value": "catalog"
+ },
+ "profileName":{
+ "value": "eshopcatalog"
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/storage/marketing/deploystorage.json b/deploy/az/storage/marketing/deploystorage.json
new file mode 100644
index 000000000..cceb524d0
--- /dev/null
+++ b/deploy/az/storage/marketing/deploystorage.json
@@ -0,0 +1,91 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "marketingstorage": {
+ "type": "string"
+ },
+ "profileName" : {
+ "type": "string"
+ }
+ },
+ "variables": {
+ "marketingstorage": "[concat(parameters('marketingstorage'), uniqueString(resourceGroup().id))]",
+ "endpointName": "[concat('endpoint-', uniqueString(resourceGroup().id))]",
+ "profileName": "[parameters('profileName')]"
+ },
+ "resources": [
+ {
+ "type": "Microsoft.Storage/storageAccounts",
+ "name": "[variables('marketingstorage')]",
+ "apiVersion": "2016-01-01",
+ "location": "[resourceGroup().location]",
+ "tags": {
+ "displayName": "[variables('marketingstorage')]"
+ },
+ "sku": {
+ "name": "Standard_LRS"
+ },
+ "kind": "Storage"
+ },
+ {
+ "name": "[variables('profileName')]",
+ "type": "Microsoft.Cdn/profiles",
+ "location": "[resourceGroup().location]",
+ "apiVersion": "2016-04-02",
+ "tags": {
+ "displayName": "[variables('profileName')]"
+ },
+ "sku": {
+ "name": "Standard_Verizon"
+ },
+ "resources": [
+ {
+ "apiVersion": "2016-04-02",
+ "name": "[variables('endpointName')]",
+ "type": "endpoints",
+ "dependsOn": [
+ "[variables('profileName')]",
+ "[variables('marketingstorage')]"
+ ],
+ "location": "[resourceGroup().location]",
+ "tags": {
+ "displayName": "[variables('endpointName')]"
+ },
+ "properties": {
+ "originHostHeader": "[replace(replace(reference(resourceId('Microsoft.Storage/storageAccounts', variables('marketingstorage')),'2015-06-15' ).primaryEndpoints.blob,'https://',''),'/','')]",
+ "isHttpAllowed": true,
+ "isHttpsAllowed": true,
+ "queryStringCachingBehavior": "IgnoreQueryString",
+ "contentTypesToCompress": [
+ "text/plain",
+ "text/html",
+ "text/css",
+ "application/x-javascript",
+ "text/javascript"
+ ],
+ "isCompressionEnabled": "True",
+ "origins": [
+ {
+ "name": "origin1",
+ "properties": {
+ "hostName": "[replace(replace(reference(resourceId('Microsoft.Storage/storageAccounts', variables('marketingstorage')),'2015-06-15' ).primaryEndpoints.blob,'https://',''),'/','')]"
+ }
+ }
+ ]
+ }
+ }
+ ]
+ }
+ ],
+ "outputs": {
+ "hostName": {
+ "type": "string",
+ "value": "[reference(resourceId('Microsoft.cdn/profiles/endpoints', variables('profileName'), variables('endpointName'))).hostName]"
+ },
+ "originHostHeader": {
+ "type": "string",
+ "value": "[reference(resourceId('Microsoft.cdn/profiles/endpoints', variables('profileName'), variables('endpointName'))).originHostHeader]"
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/storage/marketing/deploystorage.parameters.json b/deploy/az/storage/marketing/deploystorage.parameters.json
new file mode 100644
index 000000000..1608fd34a
--- /dev/null
+++ b/deploy/az/storage/marketing/deploystorage.parameters.json
@@ -0,0 +1,12 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+ "contentVersion": "1.0.0.0",
+ "parameters": {
+ "marketingstorage": {
+ "value": "marketing"
+ },
+ "profileName":{
+ "value": "eshopmarketing"
+ }
+ }
+}
\ No newline at end of file
diff --git a/deploy/az/vms/docker-machine.md b/deploy/az/vms/docker-machine.md
new file mode 100644
index 000000000..71cbbd4a7
--- /dev/null
+++ b/deploy/az/vms/docker-machine.md
@@ -0,0 +1,48 @@
+# Create a VM using docker-machine
+
+Ensure you are logged in the desired subscription Refer to [this article](https://docs.microsoft.com/en-us/cli/azure/authenticate-azure-cli) for more details.
+
+1. Use `az account show` to find your subscription id.
+2. Use `docker-machine create --driver azure --azure-subscription-id