kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

fix run-start.sh: if running in docker-container, just start electron, see #1859

Browse Source
This commit is contained in:
Karsten Hassel 2020-01-03 19:12:02 +01:00
parent 69a887fb05
commit 20a9150ea3
2 changed files with 67 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed ### Fixed
- Force declaration of public ip adress in config file (ISSUE #1852) - 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 ### Updated

8
run-start.sh
View File

@ -2,6 +2,13 @@
# use bash instead of sh # use bash instead of sh
./untrack-css.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 if [ -z "$DISPLAY" ]; then #If not set DISPLAY is SSH remote or tty
export DISPLAY=:0 # Set by default display export DISPLAY=:0 # Set by default display
fi fi
@ -65,3 +72,4 @@ else
# we can use electron directly # we can use electron directly
electron js/electron.js $1; electron js/electron.js $1;
fi fi
fi