update functionality complete

5 years ago · fe65313eed
12 changed files with 37 additions and 41 deletions
--- a/hosting/docker-compose.dev.yaml
+++ b/hosting/docker-compose.dev.yaml
@ -64,6 +64,20 @@ services:
      - "${REDIS_PORT}:6379"
    volumes:
      - redis_data:/data
+  
+  watchtower-service:
+    image: containrrr/watchtower
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    command: --debug --http-api-update budibase/apps budibase/worker
+    environment:
+      - WATCHTOWER_HTTP_API=true
+      - WATCHTOWER_HTTP_API_TOKEN=budibase
+      - WATCHTOWER_CLEANUP=true
+    labels:
+      - "com.centurylinklabs.watchtower.enable=false"
+    ports:
+      - 6161:8080

 volumes:
  couchdb3_data:
--- a/hosting/docker-compose.yaml
+++ b/hosting/docker-compose.yaml
@ -126,7 +126,7 @@ services:
    labels:
      - "com.centurylinklabs.watchtower.enable=false"
    ports:
-      - 6666:8080
+      - 6161:8080


 volumes:
--- a/hosting/envoy.dev.yaml.hbs
+++ b/hosting/envoy.dev.yaml.hbs
@ -132,5 +132,4 @@ static_resources:
            address:
              socket_address:
                address: {{ address }}
-                port_value: 4002
-
+                port_value: 4002
--- a/hosting/envoy.yaml
+++ b/hosting/envoy.yaml
@ -140,5 +140,5 @@ static_resources:
            address:
              socket_address: 
                address: watchtower-service
-                port_value: 6666
+                port_value: 6161

--- a/packages/builder/src/pages/builder/portal/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/_layout.svelte
@ -44,7 +44,7 @@
          href: "/builder/portal/settings/theming",
        },
        {
-          title: "Update",
+          title: "Updates",
          href: "/builder/portal/settings/update",
        },
      ])
--- a/packages/builder/src/pages/builder/portal/settings/organisation.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/organisation.svelte
@ -70,7 +70,6 @@

    loading = false
  }
-
 </script>

 {#if $auth.isAdmin}
--- a/packages/builder/src/pages/builder/portal/settings/update.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/update.svelte
@ -27,17 +27,16 @@
  async function updateBudibase() {
    try {
      notifications.info("Updating budibase..")
-      // const response = await fetch("http://localhost:6666/v1/update", {
-      //   headers: {
-      //     Authorization: "Bearer budibase"
-      //   }
-      // })
+      const response = await fetch("/v1/update", {
+        headers: {
+          Authorization: "Bearer budibase",
+        },
+      })
      notifications.success("Your budibase installation is up to date.")
    } catch (err) {
      notifications.error(`Error installing budibase update ${err}`)
    }
  }
-
 </script>

 {#if $auth.isAdmin}
@ -45,15 +44,16 @@
    <Layout gap="XS" noPadding>
      <Heading size="M">Update</Heading>
      <Body>
-        Keep your budibase installation up to date to take advantage of the latest features, security updates and much more.
+        Keep your budibase installation up to date to take advantage of the
+        latest features, security updates and much more.
      </Body>
    </Layout>
    <Divider size="S" />
-      <div class="fields">
-        <div class="field">
-          <Button cta on:click={updateBudibase}>Check For Updates</Button>
-        </div>
+    <div class="fields">
+      <div class="field">
+        <Button cta on:click={updateBudibase}>Check For Updates</Button>
      </div>
+    </div>
  </Layout>
 {/if}

--- a/packages/server/src/app.js
+++ b/packages/server/src/app.js
@ -28,14 +28,14 @@ app.use(
  })
 )

-let logger = pino({
-  prettyPrint: {
-    levelFirst: true,
-  },
-  level: env.LOG_LEVEL || "error",
-})
-
-app.use(logger)
+app.use(
+  pino({
+    prettyPrint: {
+      levelFirst: true,
+    },
+    level: env.LOG_LEVEL || "error",
+  })
+)

 if (!env.isTest()) {
  const bullApp = bullboard.init()
--- a/packages/worker/src/api/controllers/admin/debug.js
+++ b/packages/worker/src/api/controllers/admin/debug.js
@ -1,4 +0,0 @@
-exports.fetchDebugLogs = async ctx => {
-  // read them from file
-  // serve them
-}
--- a/packages/worker/src/api/controllers/admin/updates.js
+++ b/packages/worker/src/api/controllers/admin/updates.js
@ -1 +0,0 @@
-exports.updateSystem = async ctx => {}
--- a/packages/worker/src/api/routes/admin/debug.js
+++ b/packages/worker/src/api/routes/admin/debug.js
@ -1,9 +0,0 @@
-const Router = require("@koa/router")
-const controller = require("../../controllers/admin/debug")
-const adminOnly = require("../../../middleware/adminOnly")
-
-const router = Router()
-
-router.get("/api/admin/debug/logs", adminOnly, controller.fetchDebugLogs)
-
-module.exports = router
--- a/packages/worker/src/api/routes/index.js
+++ b/packages/worker/src/api/routes/index.js
@ -5,7 +5,6 @@ const templateRoutes = require("./admin/templates")
 const emailRoutes = require("./admin/email")
 const authRoutes = require("./admin/auth")
 const roleRoutes = require("./admin/roles")
-const updatesRoutes = require("./admin/updates")
 const appRoutes = require("./app")

 exports.routes = [
@ -17,5 +16,4 @@ exports.routes = [
  templateRoutes,
  emailRoutes,
  roleRoutes,
-  updatesRoutes,
 ]