diff --git a/hosting/docker-compose.dev.yaml b/hosting/docker-compose.dev.yaml index 4dd656066d..1626d520b6 100644 --- a/hosting/docker-compose.dev.yaml +++ b/hosting/docker-compose.dev.yaml @@ -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 diff --git a/packages/server/scripts/dev/manage.js b/packages/server/scripts/dev/manage.js index 8d1a7b1585..80f21cd043 100644 --- a/packages/server/scripts/dev/manage.js +++ b/packages/server/scripts/dev/manage.js @@ -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 => {