MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-master-into-develop

This commit is contained in:
Rory Powell 2022-02-18 17:42:00 +00:00
parent a4ea1dd8c0 c326771cb0
commit 66ca9e2165
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hosting/nginx.dev.conf.hbs
View File

@ -43,6 +43,10 @@ http {
proxy_pass http://{{ address }}:4001; proxy_pass http://{{ address }}:4001;
} }
location = / {
proxy_pass http://{{ address }}:4001;
}
location /app_ { location /app_ {
proxy_pass http://{{ address }}:4001; proxy_pass http://{{ address }}:4001;
} }

5
hosting/scripts/airgapped/airgappedDockerBuild.js
View File

@ -15,7 +15,7 @@ const IMAGES = {
const FILES = { const FILES = {
COMPOSE: "docker-compose.yaml", COMPOSE: "docker-compose.yaml",
NGINX: "nginx.conf" ENV: ".env"
} }
const OUTPUT_DIR = path.join(__dirname, "../", "bb-airgapped") const OUTPUT_DIR = path.join(__dirname, "../", "bb-airgapped")
@ -40,8 +40,7 @@ for (let image in IMAGES) {
// copy config files // copy config files
copyFile(FILES.COMPOSE) copyFile(FILES.COMPOSE)
copyFile(FILES.ENVOY) copyFile(FILES.ENV)
copyFile(FILES.PROPERTIES)
// compress // compress
execSync(`tar -czf bb-airgapped.tar.gz hosting/scripts/bb-airgapped`) execSync(`tar -czf bb-airgapped.tar.gz hosting/scripts/bb-airgapped`)

2
packages/backend-core/src/cloud/accounts.js
View File

@ -17,7 +17,7 @@ exports.getAccount = async email => {
const json = await response.json() const json = await response.json()
if (response.status !== 200) { if (response.status !== 200) {
throw Error(`Error getting account by email ${email}`, json) throw new Error(`Error getting account by email ${email}`, json)
} }
return json[0] return json[0]

2
packages/backend-core/src/context/index.js
View File

@ -121,7 +121,7 @@ exports.getTenantId = () => {
} }
const tenantId = cls.getFromContext(ContextKeys.TENANT_ID) const tenantId = cls.getFromContext(ContextKeys.TENANT_ID)
if (!tenantId) { if (!tenantId) {
throw Error("Tenant id not found") throw new Error("Tenant id not found")
} }
return tenantId return tenantId
} }