Pulling image before updating

Author: githubsaturn

CHANGELOG.md

@@ -1,6 +1,6 @@
 ## [Next Version - available as `edge`]
 
--   TBD
+-   Improved: Pulling the new image before attempt to upgrade the CapRover engine to improve reliability of upgrades
 
 ## [1.10.1] - 2021-10-09
 

src/routes/user/system/SystemRouter.ts

@@ -180,10 +180,17 @@ router.get('/versionInfo/', function (req, res, next) {
 
 router.post('/versionInfo/', function (req, res, next) {
     const latestVersion = req.body.latestVersion
+    const registryHelper =
+        InjectionExtractor.extractUserFromInjected(
+            res
+        ).user.serviceManager.getRegistryHelper()
 
     return Promise.resolve()
         .then(function () {
-            return VersionManager.get().updateCaptain(latestVersion)
+            return VersionManager.get().updateCaptain(
+                latestVersion,
+                registryHelper
+            )
         })
         .then(function () {
             const baseApi = new BaseApi(

src/user/system/VersionManager.ts

@@ -3,6 +3,7 @@ import axios from 'axios'
 import DockerApi from '../../docker/DockerApi'
 import CaptainConstants from '../../utils/CaptainConstants'
 import Logger from '../../utils/Logger'
+import DockerRegistryHelper from '../DockerRegistryHelper'
 
 class VersionManager {
     private dockerApi: DockerApi
@@ -148,27 +149,40 @@ class VersionManager {
         })
     }
 
-    updateCaptain(versionTag: string) {
+    updateCaptain(
+        versionTag: string,
+        dockerRegistryHelper: DockerRegistryHelper
+    ) {
         const self = this
-        return Promise.resolve().then(function () {
-            return self.dockerApi.updateService(
-                CaptainConstants.captainServiceName,
-                `${CaptainConstants.configs.publishedNameOnDockerHub}:${versionTag}`,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined
-            )
-        })
+        const providedImageName = `${CaptainConstants.configs.publishedNameOnDockerHub}:${versionTag}`
+        return Promise.resolve()
+            .then(function () {
+                return dockerRegistryHelper.getDockerAuthObjectForImageName(
+                    providedImageName
+                )
+            })
+            .then(function (authObj) {
+                return self.dockerApi.pullImage(providedImageName, authObj)
+            })
+            .then(function () {
+                return self.dockerApi.updateService(
+                    CaptainConstants.captainServiceName,
+                    providedImageName,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined
+                )
+            })
     }
 
     private static captainManagerInstance: VersionManager | undefined