feat: docker auto upgrade

client/components/admin/admin-system.vue

@@ -27,6 +27,16 @@
                     v-list-item-subtitle {{ info.latestVersion }}
                   v-list-item-action
                     v-list-item-action-text {{ $t('admin:system.published') }} {{ info.latestVersionReleaseDate | moment('from') }}
+              v-card-actions(v-if='upgradeCapable && !isLatestVersion && info.platform === `docker`', :class='$vuetify.theme.dark ? `grey darken-3-d5` : `indigo lighten-5`')
+                .caption.indigo--text.pl-3(:class='$vuetify.theme.dark ? `text--lighten-4` : ``') Wiki.js can perform the upgrade to the latest version for you.
+                v-spacer
+                v-btn.px-3(
+                  color='indigo'
+                  dark
+                  @click='performUpgrade'
+                  )
+                  v-icon(left) mdi-upload
+                  span Perform Upgrade
 
             v-card.mt-4.animated.fadeInUp.wait-p2s
               v-subheader {{ $t('admin:system.hostInfo') }}
@@ -92,24 +102,58 @@
                     v-list-item-subtitle {{ info.dbHost }}
 
                 v-alert.mt-3.mx-4(:value='isDbLimited', color='deep-orange darken-2', icon='mdi-alert', dark) {{ $t('admin:system.dbPartialSupport') }}
+
+    v-dialog(
+      v-model='isUpgrading'
+      persistent
+      width='450'
+      )
+      v-card.blue.darken-5(dark)
+        v-card-text.text-center.pa-10
+          self-building-square-spinner(
+            :animation-duration='4000'
+            :size='40'
+            color='#FFF'
+            style='margin: 0 auto;'
+            )
+          .body-2.mt-5.blue--text.text--lighten-4 Your Wiki.js container is being upgraded...
+          .caption.blue--text.text--lighten-2 Please wait
+          v-progress-linear.mt-5(
+            color='blue lighten-2'
+            :value='upgradeProgress'
+            :buffer-value='upgradeProgress'
+            rounded
+            :stream='isUpgradingStarted'
+            query
+            :indeterminate='!isUpgradingStarted'
+          )
 </template>
 
 <script>
 import _ from 'lodash'
 
+import { SelfBuildingSquareSpinner } from 'epic-spinners'
+
 import systemInfoQuery from 'gql/admin/system/system-query-info.gql'
+import performUpgradeMutation from 'gql/admin/system/system-mutation-upgrade.gql'
 
 export default {
-  data() {
+  components: {
+    SelfBuildingSquareSpinner
+  },
+  data () {
     return {
+      isUpgrading: false,
+      isUpgradingStarted: false,
+      upgradeProgress: 0,
       info: {}
     }
   },
   computed: {
-    dbVersion() {
+    dbVersion () {
       return _.get(this.info, 'dbVersion', '').replace(/(?:\r\n|\r|\n)/g, '<br />')
     },
-    platformLogo() {
+    platformLogo () {
       switch (this.info.platform) {
         case 'docker':
           return 'mdi-docker'
@@ -127,18 +171,49 @@ export default {
           return ''
       }
     },
-    isDbLimited() {
+    isDbLimited () {
       return this.info.dbType === 'MySQL' && this.dbVersion.indexOf('5.') === 0
+    },
+    isLatestVersion () {
+      return this.info.currentVersion === this.info.latestVersion
     }
   },
   methods: {
-    async refresh() {
+    async refresh () {
       await this.$apollo.queries.info.refetch()
       this.$store.commit('showNotification', {
         message: this.$t('admin:system.refreshSuccess'),
         style: 'success',
         icon: 'cached'
       })
+    },
+    async performUpgrade () {
+      this.isUpgrading = true
+      this.isUpgradingStarted = false
+      this.upgradeProgress = 0
+      this.$store.commit(`loadingStart`, 'admin-system-upgrade')
+      try {
+        const respRaw = await this.$apollo.mutate({
+          mutation: performUpgradeMutation
+        })
+        const resp = _.get(respRaw, 'data.system.performUpgrade.responseResult', {})
+        if (resp.succeeded) {
+          this.isUpgradingStarted = true
+          let progressInterval = setInterval(() => {
+            this.upgradeProgress += 0.83
+          }, 500)
+          _.delay(() => {
+            clearInterval(progressInterval)
+            window.location.reload(true)
+          }, 60000)
+        } else {
+          throw new Error(resp.message)
+        }
+      } catch (err) {
+        this.$store.commit('pushGraphError', err)
+        this.$store.commit(`loadingStop`, 'admin-system-upgrade')
+        this.isUpgrading = false
+      }
     }
   },
   apollo: {

client/components/editor/editor-modal-editorselect.vue

@@ -169,16 +169,16 @@
           v-toolbar(dense, flat, color='light-green darken-3')
             v-spacer
             .caption.mr-1 or convert from
-            v-btn.mx-1(depressed, color='light-green darken-2', @click='', disabled)
+            v-btn.mx-1.animated.fadeInUp(depressed, color='light-green darken-2', @click='', disabled)
               v-icon(left) mdi-alpha-a-circle
               .body-2.text-none AsciiDoc
-            v-btn.mx-1(depressed, color='light-green darken-2', @click='', disabled)
+            v-btn.mx-1.animated.fadeInUp.wait-p1s(depressed, color='light-green darken-2', @click='', disabled)
               v-icon(left) mdi-alpha-c-circle
               .body-2.text-none CREOLE
-            v-btn.mx-1(depressed, color='light-green darken-2', @click='', disabled)
+            v-btn.mx-1.animated.fadeInUp.wait-p2s(depressed, color='light-green darken-2', @click='', disabled)
               v-icon(left) mdi-alpha-t-circle
               .body-2.text-none Textile
-            v-btn.mx-1(depressed, color='light-green darken-2', @click='', disabled)
+            v-btn.mx-1.animated.fadeInUp.wait-p3s(depressed, color='light-green darken-2', @click='', disabled)
               v-icon(left) mdi-alpha-w-circle
               .body-2.text-none WikiText
             v-spacer

client/components/setup.vue

@@ -168,10 +168,12 @@ export default {
           }).then(res => res.json())
 
           if (resp.ok === true) {
-            this.success = true
             _.delay(() => {
-              window.location.assign('/login')
+              this.success = true
-            }, 3000)
+              _.delay(() => {
+                window.location.assign('/login')
+              }, 3000)
+            }, 10000)
           } else {
             this.error = true
             this.errorMessage = resp.error

client/graph/admin/system/system-mutation-upgrade.gql

@@ -0,0 +1,12 @@
+mutation {
+  system {
+    performUpgrade {
+      responseResult {
+        succeeded
+        errorCode
+        slug
+        message
+      }
+    }
+  }
+}

client/graph/admin/system/system-query-info.gql

@@ -2,19 +2,20 @@ query {
   system {
     info {
       configFile
+      cpuCores
       currentVersion
+      dbHost
       dbType
       dbVersion
-      dbHost
+      hostname
       latestVersion
       latestVersionReleaseDate
+      nodeVersion
       operatingSystem
       platform
-      hostname
-      cpuCores
       ramTotal
+      upgradeCapable
       workingDirectory
-      nodeVersion
     }
   }
 }

package.json

@@ -60,6 +60,7 @@
     "dependency-graph": "0.8.0",
     "diff": "4.0.1",
     "diff2html": "2.11.3",
+    "dockerode": "2.5.8",
     "dotize": "0.3.0",
     "elasticsearch6": "npm:@elastic/elasticsearch@6",
     "elasticsearch7": "npm:@elastic/elasticsearch@7",

server/graph/resolvers/system.js

@@ -7,6 +7,7 @@ const path = require('path')
 const fs = require('fs-extra')
 const moment = require('moment')
 const graphHelper = require('../../helpers/graph')
+const Docker = require('dockerode')
 
 /* global WIKI */
 
@@ -20,13 +21,13 @@ const dbTypes = {
 
 module.exports = {
   Query: {
-    async system() { return {} }
+    async system () { return {} }
   },
   Mutation: {
-    async system() { return {} }
+    async system () { return {} }
   },
   SystemQuery: {
-    flags() {
+    flags () {
       return _.transform(WIKI.config.flags, (result, value, key) => {
         result.push({ key, value })
       }, [])
@@ -34,7 +35,7 @@ module.exports = {
     async info() { return {} }
   },
   SystemMutation: {
-    async updateFlags(obj, args, context) {
+    async updateFlags (obj, args, context) {
       WIKI.config.flags = _.transform(args.flags, (result, row) => {
         _.set(result, row.key, row.value)
       }, {})
@@ -44,7 +45,7 @@ module.exports = {
         responseResult: graphHelper.generateSuccess('System Flags applied successfully')
       }
     },
-    async resetTelemetryClientId(obj, args, context) {
+    async resetTelemetryClientId (obj, args, context) {
       try {
         WIKI.telemetry.generateClientId()
         await WIKI.configSvc.saveToDb(['telemetry'])
@@ -55,7 +56,7 @@ module.exports = {
         return graphHelper.generateError(err)
       }
     },
-    async setTelemetry(obj, args, context) {
+    async setTelemetry (obj, args, context) {
       try {
         _.set(WIKI.config, 'telemetry.isEnabled', args.enabled)
         WIKI.telemetry.enabled = args.enabled
@@ -66,22 +67,44 @@ module.exports = {
       } catch (err) {
         return graphHelper.generateError(err)
       }
+    },
+    async performUpgrade (obj, args, context) {
+      try {
+        const dockerEngine = new Docker({ socketPath: '/var/run/docker.sock' })
+        await dockerEngine.run('containrrr/watchtower', ['--cleanup', '--run-once', 'wiki'], process.stdout, {
+          HostConfig: {
+            AutoRemove: true,
+            Mounts: [
+              {
+                Target: '/var/run/docker.sock',
+                Source: '/var/run/docker.sock',
+                Type: 'bind'
+              }
+            ]
+          }
+        })
+        return {
+          responseResult: graphHelper.generateSuccess('Upgrade has started.')
+        }
+      } catch (err) {
+        return graphHelper.generateError(err)
+      }
     }
   },
   SystemInfo: {
-    configFile() {
+    configFile () {
       return path.join(process.cwd(), 'config.yml')
     },
-    cpuCores() {
+    cpuCores () {
       return os.cpus().length
     },
-    currentVersion() {
+    currentVersion () {
       return WIKI.version
     },
-    dbType() {
+    dbType () {
       return _.get(dbTypes, WIKI.config.db.type, 'Unknown DB')
     },
-    async dbVersion() {
+    async dbVersion () {
       let version = 'Unknown Version'
       switch (WIKI.config.db.type) {
         case 'mariadb':
@@ -102,26 +125,26 @@ module.exports = {
       }
       return version
     },
-    dbHost() {
+    dbHost () {
       if (WIKI.config.db.type === 'sqlite') {
         return WIKI.config.db.storage
       } else {
         return WIKI.config.db.host
       }
     },
-    hostname() {
+    hostname () {
       return os.hostname()
     },
-    latestVersion() {
+    latestVersion () {
       return WIKI.system.updates.version
     },
-    latestVersionReleaseDate() {
+    latestVersionReleaseDate () {
       return moment.utc(WIKI.system.updates.releaseDate)
     },
-    nodeVersion() {
+    nodeVersion () {
       return process.version.substr(1)
     },
-    async operatingSystem() {
+    async operatingSystem () {
       let osLabel = `${os.type()} (${os.platform()}) ${os.release()} ${os.arch()}`
       if (os.platform() === 'linux') {
         const osInfo = await getos()
@@ -136,27 +159,30 @@ module.exports = {
       }
       return os.platform()
     },
-    ramTotal() {
+    ramTotal () {
       return filesize(os.totalmem())
     },
-    telemetry() {
+    telemetry () {
       return WIKI.telemetry.enabled
     },
-    telemetryClientId() {
+    telemetryClientId () {
       return WIKI.config.telemetry.clientId
     },
-    workingDirectory() {
+    async upgradeCapable () {
+      return fs.pathExists('/var/run/docker.sock')
+    },
+    workingDirectory () {
       return process.cwd()
     },
-    async groupsTotal() {
+    async groupsTotal () {
       const total = await WIKI.models.groups.query().count('* as total').first().pluck('total')
       return _.toSafeInteger(total)
     },
-    async pagesTotal() {
+    async pagesTotal () {
       const total = await WIKI.models.pages.query().count('* as total').first().pluck('total')
       return _.toSafeInteger(total)
     },
-    async usersTotal() {
+    async usersTotal () {
       const total = await WIKI.models.users.query().count('* as total').first().pluck('total')
       return _.toSafeInteger(total)
     }

server/graph/schemas/system.graphql

@@ -33,6 +33,8 @@ type SystemMutation {
   setTelemetry(
     enabled: Boolean!
   ): DefaultResponse @auth(requires: ["manage:system"])
+
+  performUpgrade: DefaultResponse @auth(requires: ["manage:system"])
 }
 
 # -----------------------------------------------
@@ -67,6 +69,7 @@ type SystemInfo {
   ramTotal: String @auth(requires: ["manage:system"])
   telemetry: Boolean @auth(requires: ["manage:system"])
   telemetryClientId: String @auth(requires: ["manage:system"])
+  upgradeCapable: Boolean @auth(requires: ["manage:system"])
   usersTotal: Int @auth(requires: ["manage:system", "manage:navigation", "manage:groups", "write:groups", "manage:users", "write:users"])
   workingDirectory: String @auth(requires: ["manage:system"])
 }