Browse Source

Some changes after trying system for first time.

gh-pages
mike12345567 6 years ago
parent
commit
13c368109e
  1. 1
      hosting/docker-compose.yaml
  2. 4
      hosting/envoy.dev.yaml.hbs
  3. 3
      packages/server/scripts/dev/manage.js
  4. 3
      packages/server/src/app.js
  5. 4
      packages/worker/scripts/dev/manage.js
  6. 3
      packages/worker/src/index.js

1
hosting/docker-compose.yaml

@ -35,6 +35,7 @@ services:
environment:
SELF_HOSTED: 1
PORT: 4003
JWT_SECRET: ${JWT_SECRET}
MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY}
MINIO_SECRET_KEY: ${MINIO_SECRET_KEY}
MINIO_URL: http://minio-service:9000

4
hosting/envoy.dev.yaml.hbs

@ -46,6 +46,10 @@ static_resources:
route:
cluster: builder-dev
prefix_rewrite: "/builder/"
# special case in dev to redirect no path to builder
- match: { path: "/" }
redirect: { path_redirect: "/builder/" }
# minio is on the default route because this works
# best, minio + AWS SDK doesn't handle path proxy

3
packages/server/scripts/dev/manage.js

@ -33,9 +33,6 @@ async function init() {
fs.writeFileSync(envoyOutputPath, processStringSync(contents, config))
const envFilePath = path.join(process.cwd(), ".env")
if (fs.existsSync(envFilePath)) {
return
}
const envFileJson = {
PORT: 4001,
MINIO_URL: "http://localhost:10000/",

3
packages/server/src/app.js

@ -1,3 +1,5 @@
// need to load environment first
const env = require("./environment")
const Koa = require("koa")
const destroyable = require("server-destroy")
const electron = require("electron")
@ -5,7 +7,6 @@ const koaBody = require("koa-body")
const logger = require("koa-pino-logger")
const http = require("http")
const api = require("./api")
const env = require("./environment")
const eventEmitter = require("./events")
const automations = require("./automations/index")
const Sentry = require("@sentry/node")

4
packages/worker/scripts/dev/manage.js

@ -4,12 +4,10 @@ const fs = require("fs")
async function init() {
const envFilePath = path.join(process.cwd(), ".env")
if (fs.existsSync(envFilePath)) {
return
}
const envFileJson = {
SELF_HOSTED: 1,
PORT: 4002,
JWT_SECRET: "testsecret",
MINIO_ACCESS_KEY: "budibase",
MINIO_SECRET_KEY: "budibase",
COUCH_DB_USER: "budibase",

3
packages/worker/src/index.js

@ -1,3 +1,5 @@
// need to load environment first
const env = require("./environment")
const Koa = require("koa")
const destroyable = require("server-destroy")
const koaBody = require("koa-body")
@ -5,7 +7,6 @@ const { passport } = require("@budibase/auth")
const logger = require("koa-pino-logger")
const http = require("http")
const api = require("./api")
const env = require("./environment")
const app = new Koa()

Loading…
Cancel
Save