1
0
Fork 0
mirror of synced 2024-08-18 11:31:28 +12:00

Fix local dev hosting and allow primary foreign keys (#9330)

* adding host.docker.internal mapping to PROXY_ADDRESS

* Allow primary keys to be foreign key

* Revert "Allow primary keys to be foreign key"

This reverts commit d10dfc1e28.

Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>
This commit is contained in:
melohagan 2023-01-12 18:35:49 +00:00 committed by GitHub
parent 3fc59faaeb
commit 86063bce4a
2 changed files with 3 additions and 9 deletions

View file

@ -25,9 +25,9 @@ services:
proxy-service:
container_name: budi-nginx-dev
restart: on-failure
image: nginx:latest
image: budibase/proxy:latest
volumes:
- ./nginx.dev.conf:/etc/nginx/nginx.conf
- ./nginx.dev.conf:/etc/nginx/templates/nginx.conf.template
- ./proxy/error.html:/usr/share/nginx/html/error.html
ports:
- "${MAIN_PORT}:10000"
@ -37,7 +37,7 @@ services:
extra_hosts:
- "host.docker.internal:host-gateway"
environment:
- PROXY_ADDRESS=${PROXY_ADDRESS}
- PROXY_ADDRESS=host.docker.internal
couchdb-service:
# platform: linux/amd64

View file

@ -2,11 +2,6 @@
const compose = require("docker-compose")
const path = require("path")
const fs = require("fs")
const isWsl = require("is-wsl")
function isLinux() {
return !isWsl && process.platform !== "darwin" && process.platform !== "win32"
}
// This script wraps docker-compose allowing you to manage your dev infrastructure with simple commands.
const CONFIG = {
@ -49,7 +44,6 @@ async function init() {
BB_ADMIN_USER_PASSWORD: "",
PLUGINS_DIR: "",
TENANT_FEATURE_FLAGS: "*:LICENSING,*:USER_GROUPS",
PROXY_ADDRESS: isLinux() ? "172.17.0.1" : "host.docker.internal",
}
let envFile = ""
Object.keys(envFileJson).forEach(key => {