diff --git a/docker/Dockerfile b/docker/Dockerfile index 218e0745..13843ab5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -46,15 +46,15 @@ ENV CONFIG_FILE="/opt/meshcentral/meshcentral-data/config.json" ENV DYNAMIC_CONFIG="true" # environment variables for the above defined MeshCentral Config.json -ENV ALLOWPLUGINS="false" +ENV ALLOW_PLUGINS="false" ENV ALLOW_NEW_ACCOUNTS="false" ENV ALLOWED_ORIGIN="false" ENV ARGS="" ENV HOSTNAME="localhost" ENV IFRAME="false" -ENV LOCALSESSIONRECORDING="true" +ENV LOCAL_SESSION_RECORDING="true" ENV MINIFY="true" -ENV REGENSESSIONKEY="false" +ENV REGEN_SESSIONKEY="false" ENV REVERSE_PROXY="" ENV REVERSE_PROXY_TLS_PORT="443" ENV WEBRTC="false" diff --git a/docker/README.md b/docker/README.md index 070d1a3d..5c2c2732 100644 --- a/docker/README.md +++ b/docker/README.md @@ -12,15 +12,15 @@ Below is a breakdown of environment variables used in this setup. | NODE_ENV | production | Specifies the Node.js environment. | | CONFIG_FILE | /opt/meshcentral/meshcentral-data/config.json | Path to the configuration file. | | DYNAMIC_CONFIG | true | Enables/disables dynamic configuration. This means config is being rechecked every container restart. | -| ALLOWPLUGINS | false | Enables/disables plugins. | +| ALLOW_PLUGINS | false | Enables/disables plugins. | | ALLOW_NEW_ACCOUNTS | false | Enables/disables new account creation. | | ALLOWED_ORIGIN | false | Enables/disables allowed origin policy. | | ARGS | "" | Additional arguments for MeshCentral. | | HOSTNAME | localhost | Specifies the hostname. | | IFRAME | false | Enables/disables embedding in an iframe. | -| LOCALSESSIONRECORDING | true | Enables session recording. | +| LOCAL_SESSION_RECORDING | true | Enables session recording. | | MINIFY | true | Minifies the JavaScript and HTML output. | -| REGENSESSIONKEY | false | Regenerates the session key on each restart of the container. | +| REGEN_SESSIONKEY | false | Regenerates the session key on each restart of the container. | | REVERSE_PROXY | "" | Configures reverse proxy support through `certUrl`. | | REVERSE_PROXY_TLS_PORT | "443" | Configures reverse proxy TLS port, will be combined with: `REVERSE_PROXY`. | | WEBRTC | false | Enables/disables WebRTC support. | @@ -104,15 +104,15 @@ CONFIG_FILE=/opt/meshcentral/meshcentral-data/config.json DYNAMIC_CONFIG=true # MeshCentral Configuration -ALLOWPLUGINS=false +ALLOW_PLUGINS=false ALLOW_NEW_ACCOUNTS=false ALLOWED_ORIGIN=false ARGS= HOSTNAME=localhost IFRAME=false -LOCALSESSIONRECORDING=true +LOCAL_SESSION_RECORDING=true MINIFY=true -REGENSESSIONKEY=false +REGEN_SESSIONKEY=false REVERSE_PROXY= REVERSE_PROXY_TLS_PORT= WEBRTC=false diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index c99eef31..601d79c6 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -22,7 +22,7 @@ else fi if [[ "$DYNAMIC_CONFIG" =~ ^(true|yes)$ ]]; then - cat $CONFIG_FILE + cat "$CONFIG_FILE" echo "Using Dynamic Configuration values..." # BEGIN DATABASE CONFIGURATION FIELDS