From 9b7ca9a4c44c72047d5cd3b0086abf2128ff9a00 Mon Sep 17 00:00:00 2001
From: RamonTC <ramon.tomas84@hotmail.com>
Date: Wed, 13 Sep 2017 13:27:51 +0200
Subject: [PATCH] Updated 11. Setting the solution up in Service Fabric
 (markdown)

---
 ...tting-the-solution-up-in-Service-Fabric.md | 45 ++++++++++++++++---
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/11.-Setting-the-solution-up-in-Service-Fabric.md b/11.-Setting-the-solution-up-in-Service-Fabric.md
index a9ea100..3921ac2 100644
--- a/11.-Setting-the-solution-up-in-Service-Fabric.md
+++ b/11.-Setting-the-solution-up-in-Service-Fabric.md
@@ -1,5 +1,40 @@
-TBD - Blocking this Wiki page for this content.
-Development and Testing in eShopOncontainers for Service Fabric is in progress.
-There will be two options:
-- Deploying eShopOncontainers as Linux Containers to Azure Service Fabric
-- Deploying eShopOncontainers as Windows Containers to Azure Service Fabric
+### - Deploying eShopOncontainers as Windows Containers to Azure Service Fabric
+
+In order to deploy eShopOnContainers as Windows Containers an Azure SF environment must be first set. There is available an ARM template to do that job in the following link [SF Win ARM deployment](https://github.com/dotnet-architecture/eShopOnContainers/tree/eShopOnServiceFabric-Win/deploy/az/servicefabric/WindowsContainers). Follow the steps in [create SF](https://github.com/dotnet-architecture/eShopOnContainers/blob/eShopOnServiceFabric-Win/deploy/az/servicefabric/WindowsContainers/readme.md). 
+The ARM script will generate all the necessary Azure resources to publish eShopOnContainers as windows containers.
+
+Once the SF resources have been successfully created, the next step is to publish the SF projects. These projects are under the directory [SF Directory](https://github.com/dotnet-architecture/eShopOnContainers/tree/eShopOnServiceFabric-Win/ServiceFabric) and contains all the xml config files needed to configure and publish eShopOnContainers. SF is composed by 4 SF apps:
+
+<img src="img/sf/sf-directory.png">
+
+- eShopOnServiceFabric: contains all the api services consumed by eShop.
+- eShopOnServiceFabricIdSrv: contains the Identity server for authentication.
+- eShopOnServiceFabricWebMVC: contains the MVC web app.
+- eShopOnServiceFabricWebSPA: containes the SPA web app.
+- eShopOnServiceFabricWebStatus: contains the web app for service health checking.
+
+Before deploying, replace **ALL** the external urls in the cloud.xml config file of each SF app which reference the SF dns name with the dns name of your SF. Example:
+
+<img src="img/sf/cloud-config.png">
+
+<img src="img/sf/cloud-config-idsrv.png">
+
+<img src="img/sf/cloud-config-spa.png">
+
+<img src="img/sf/cloud-config-mvc.png">
+
+To deploy the SF apps, open the eShopOnContainers-ServicesAndWebApps.sln with vs2017 (Service Fabric SDK installation must be installed) and right-click on each SF project selecting the publish button. 
+
+<img src="img/sf/publish-button.png">
+
+A new window will be prompted allowing you to select the SF cluster you have previously created.
+
+<img src="img/sf/publish-window.png">
+
+Open the SF explorer page to check out the deployment and healthcheck status.
+
+<img src="img/sf/explorer-apps-status.png">
+
+<img src="img/sf/explorer-deployment-status.png">
+
+### - Deploying eShopOncontainers as Linux Containers to Azure Service Fabric (TBD)
\ No newline at end of file