Drop CLIENT_DEV_SERVER from webserver internals completely (we just proxy instead)

This commit is contained in:
Dannon Baker
2021-03-05 09:52:02 -05:00
parent 3282a02b79
commit 00270ace03
2 changed files with 0 additions and 14 deletions
-6
View File
@@ -18,7 +18,6 @@ CREATE_VENV=1
REPLACE_PIP=$SET_VENV
COPY_SAMPLE_FILES=1
SKIP_CLIENT_BUILD=${GALAXY_SKIP_CLIENT_BUILD:-0}
CLIENT_DEV_SERVER=${GALAXY_CLIENT_DEV_SERVER:-0}
NODE_VERSION=${GALAXY_NODE_VERSION:-"$(cat client/.node_version)"}
for arg in "$@"; do
@@ -33,11 +32,6 @@ for arg in "$@"; do
[ "$arg" = "--skip-client-build" ] && SKIP_CLIENT_BUILD=1
done
# If a client dev server is being configured, skip the client build.
if [ $CLIENT_DEV_SERVER -ne 0 ]; then
SKIP_CLIENT_BUILD=1
fi
SAMPLES="
lib/tool_shed/scripts/bootstrap_tool_shed/user_info.xml.sample
tool-data/shared/ucsc/builds.txt.sample
-8
View File
@@ -107,14 +107,6 @@ def _get_uwsgi_args(cliargs, kwargs):
if not __arg_set('virtualenv', uwsgi_kwargs) and ('VIRTUAL_ENV' in os.environ or os.path.exists('.venv')):
__add_arg(args, 'virtualenv', os.environ.get('VIRTUAL_ENV', '.venv'))
# Client dev server for HMR
hmr_server = os.environ.get('GALAXY_CLIENT_DEV_SERVER', None)
if hmr_server:
# Something like this, which is the default in the package scripts
# route: ^/static/scripts/bundled/ http:127.0.0.1:8081
if hmr_server.lower() in ['1', 'true', 'default']:
hmr_server = "http:127.0.0.1:8081"
__add_arg(args, 'route', f'^/static/dist/ {hmr_server}')
# We always want to append client/src/assets as static-safe.
__add_arg(args, 'static-safe', f'{os.getcwd()}/client/src/assets')