From 17295f1305aa614cce3064475766d2f8e2fe136e Mon Sep 17 00:00:00 2001
From: Kasra Bigdeli <kasra85@gmail.com>
Date: Sun, 27 Jan 2019 23:07:14 -0800
Subject: [PATCH] Bugfix for ordering of migration

---
 src/utils/MigrateCaptainDuckDuck.ts | 34 +++++++++++++++--------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/utils/MigrateCaptainDuckDuck.ts b/src/utils/MigrateCaptainDuckDuck.ts
index e30d56d..87d0c9f 100644
--- a/src/utils/MigrateCaptainDuckDuck.ts
+++ b/src/utils/MigrateCaptainDuckDuck.ts
@@ -248,22 +248,7 @@ export default class MigrateCaptainDuckDuck {
                                 repoInfo.repo = extracted.repo
                             }
 
-                            return appStore
-                                .updateAppDefinitionInDb(
-                                    appName,
-                                    Number(app.instanceCount),
-                                    app.envVars || [],
-                                    app.volumes || [],
-                                    app.nodeId || '',
-                                    !!app.notExposeAsWebApp,
-                                    80,
-                                    !!app.forceSsl,
-                                    app.ports || [],
-                                    repoInfo,
-                                    self.authenticator,
-                                    app.customNginxConfig,
-                                    app.preDeployFunction
-                                )
+                            return Promise.resolve()
                                 .then(function() {
                                     const customDomains = app.customDomain || []
                                     const hasDefaultSubDomainSsl = !!app.hasDefaultSubDomainSsl
@@ -332,6 +317,23 @@ export default class MigrateCaptainDuckDuck {
                                         deployedVersion
                                     )
                                 })
+                                .then(function() {
+                                    return appStore.updateAppDefinitionInDb(
+                                        appName,
+                                        Number(app.instanceCount),
+                                        app.envVars || [],
+                                        app.volumes || [],
+                                        app.nodeId || '',
+                                        !!app.notExposeAsWebApp,
+                                        80,
+                                        !!app.forceSsl,
+                                        app.ports || [],
+                                        repoInfo,
+                                        self.authenticator,
+                                        app.customNginxConfig,
+                                        app.preDeployFunction
+                                    )
+                                })
                         })
                     promises.push(p)
                 })