mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 11:50:00 +00:00
fix run-start.sh: if running in docker-container, just start electron, see #1859
This commit is contained in:
parent
69a887fb05
commit
20a9150ea3
@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
||||
|
||||
### Fixed
|
||||
- Force declaration of public ip adress in config file (ISSUE #1852)
|
||||
- Fixes `run-start.sh`: If running in docker-container, don't check the environment, just start electron (ISSUE #1859)
|
||||
|
||||
### Updated
|
||||
|
||||
|
@ -2,6 +2,13 @@
|
||||
# use bash instead of sh
|
||||
./untrack-css.sh
|
||||
|
||||
if grep docker /proc/1/cgroup -qa; then
|
||||
# if running in docker, only start electron
|
||||
|
||||
electron js/electron.js $1;
|
||||
else
|
||||
# not running in docker
|
||||
|
||||
if [ -z "$DISPLAY" ]; then #If not set DISPLAY is SSH remote or tty
|
||||
export DISPLAY=:0 # Set by default display
|
||||
fi
|
||||
@ -65,3 +72,4 @@ else
|
||||
# we can use electron directly
|
||||
electron js/electron.js $1;
|
||||
fi
|
||||
fi
|
Loading…
x
Reference in New Issue
Block a user