From 3cc8ffc352e7c8a74400e5b6b48e1ad3ade4d3e2 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Thu, 11 Oct 2018 10:26:42 +0530
Subject: [PATCH 1/3] Issue #0000 feat: Updated upgradation

dev
---
 pages/developer-docs/upgrading.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pages/developer-docs/upgrading.md b/pages/developer-docs/upgrading.md
index d5d9716cd..e1a0ff7f7 100644
--- a/pages/developer-docs/upgrading.md
+++ b/pages/developer-docs/upgrading.md
@@ -113,10 +113,17 @@ To restore the Postgres database:
  
         `git -C sunbird-devops pull || git clone https://github.com/project-sunbird/sunbird-devops`
  
-   2. Run the command `cd sunbird-devops/deploy && ./sunbird-install.sh`
+   2. Run the followig commands
+
+   <pre>
+   cd sunbird-devops/deploy 
+  ./sunbird-install.sh -s dbs
+  ./sunbird-install.sh -s apis
+  ./sunbird-install.sh -s core
+   </pre>
 
 **Note:** 
 
    - Executing the command deploys the latest version of Sunbird services and also updates the latest schema in the databases
 
-   - The latest image versions of all the services are updated in the master branch. To get a hotfix image of any Sunbird service, update the minor version in the `sunbird-devops/deploy/deploy-core.sh` file and re-run the `sunbird-devops/deploy/deploy-core.sh` script.
+   - The latest image versions of all the services are updated in the master branch. To get a hotfix image of any Sunbird service, update the minor version in the `sunbird-devops/deploy/version.env` file and re-run the `sunbird-devops/deploy/deploy-core.sh` script.

From 645b06692033306830bfc59a1911e9f8a5057d6a Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Thu, 11 Oct 2018 11:04:53 +0530
Subject: [PATCH 2/3] Creating the config

---
 pages/developer-docs/upgrading.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pages/developer-docs/upgrading.md b/pages/developer-docs/upgrading.md
index e1a0ff7f7..90a9220de 100644
--- a/pages/developer-docs/upgrading.md
+++ b/pages/developer-docs/upgrading.md
@@ -117,6 +117,7 @@ To restore the Postgres database:
 
    <pre>
    cd sunbird-devops/deploy 
+  ./sunbird-install.sh -s config
   ./sunbird-install.sh -s dbs
   ./sunbird-install.sh -s apis
   ./sunbird-install.sh -s core

From 2584a00b9239ad1b7fe5a04bad103dd498cc851d Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Thu, 11 Oct 2018 11:47:41 +0530
Subject: [PATCH 3/3] Update upgrading.md

---
 pages/developer-docs/upgrading.md | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pages/developer-docs/upgrading.md b/pages/developer-docs/upgrading.md
index 90a9220de..4e72d1253 100644
--- a/pages/developer-docs/upgrading.md
+++ b/pages/developer-docs/upgrading.md
@@ -109,10 +109,21 @@ To restore the Postgres database:
 	
 ## Upgrading Sunbird Services 
 
-   1. Pull the latest code of `project-sunbird/sunbird-devops` from its master branch
- 
+   1. Pull the latest code of `project-sunbird/sunbird-devops` from its master branch or tag, follow **a or b**
+     
+   - a. pulling the latest code in same folder
+   
         `git -C sunbird-devops pull || git clone https://github.com/project-sunbird/sunbird-devops`
- 
+        
+        update the config file if necessary
+     
+  - b. if you don't want to deal with merge conflicts, clone a fresh repo, create a new directory
+	
+	`git clone https://github.com/project-sunbird/sunbird-devops`
+	`git checkout <tag>/<branch>`
+	
+	update values for `deploy/config` file
+	
    2. Run the followig commands
 
    <pre>