From a1c5257fdddcb98dfd618fa34ebe3c109879cecd Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Wed, 6 May 2020 23:57:26 +0200 Subject: [PATCH 1/3] delete old images --- .../magicmirroros/filesystem/home/pi/scripts/run_magicmirroros | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/magicmirroros/filesystem/home/pi/scripts/run_magicmirroros b/src/modules/magicmirroros/filesystem/home/pi/scripts/run_magicmirroros index 15f236b..34bacd7 100755 --- a/src/modules/magicmirroros/filesystem/home/pi/scripts/run_magicmirroros +++ b/src/modules/magicmirroros/filesystem/home/pi/scripts/run_magicmirroros @@ -14,6 +14,8 @@ docker-compose up -d docker-compose pull # restart if image changed docker-compose up -d +# delete old images +docker image prune -f sleep infinity #xterm From c1c67bc175ff7d9ba52b950671b1068b19c3b06f Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Sat, 9 May 2020 17:29:47 +0200 Subject: [PATCH 2/3] prevent wlan power_save --- .../magicmirroros/filesystem/home/pi/scripts/run_magicmirroros | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/magicmirroros/filesystem/home/pi/scripts/run_magicmirroros b/src/modules/magicmirroros/filesystem/home/pi/scripts/run_magicmirroros index 34bacd7..7e50292 100755 --- a/src/modules/magicmirroros/filesystem/home/pi/scripts/run_magicmirroros +++ b/src/modules/magicmirroros/filesystem/home/pi/scripts/run_magicmirroros @@ -16,6 +16,8 @@ docker-compose pull docker-compose up -d # delete old images docker image prune -f +# disable wlan power save +sudo iw wlan0 set power_save off sleep infinity #xterm From 7cf57c14394d8056270966eac0f0f1406421f48d Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Sat, 9 May 2020 20:07:36 +0200 Subject: [PATCH 3/3] improve run_magicmirroros --- .../home/pi/scripts/run_magicmirroros | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/src/modules/magicmirroros/filesystem/home/pi/scripts/run_magicmirroros b/src/modules/magicmirroros/filesystem/home/pi/scripts/run_magicmirroros index 7e50292..b6a4754 100755 --- a/src/modules/magicmirroros/filesystem/home/pi/scripts/run_magicmirroros +++ b/src/modules/magicmirroros/filesystem/home/pi/scripts/run_magicmirroros @@ -1,27 +1,37 @@ #!/bin/bash -if [ ! -f /home/pi/magicmirror/run/docker-compose.yml ]; then - cd /home/pi/ - git clone https://gitlab.com/khassel/magicmirror.git +_log=$HOME/scripts/start.log +echo "---------log-of-run_magicmirroros---------" > $_log + +if [ ! -f $HOME/magicmirror/run/docker-compose.yml ]; then + sudo update-ca-certificates &>> $_log + _curl=1 + until [ $_curl -eq 0 ] + do + curl -f -L -s https://gitlab.com + _curl=$? + if [ ! $_curl -eq 0 ]; then + echo "cannot connect to gitlab.com ..." &>> $_log + sleep 5s + fi + done + cd $HOME/ + rm -rf magicmirror + git clone https://gitlab.com/khassel/magicmirror.git &>> $_log cd magicmirror/run - cp rpi.yml docker-compose.yml - mkdir -p /home/pi/magicmirror/mounts + cp -v rpi.yml docker-compose.yml &>> $_log + mkdir -p $HOME/magicmirror/mounts fi -cd /home/pi/magicmirror/run +cd $HOME/magicmirror/run # start mm -docker-compose up -d +docker-compose up -d &>> $_log # pull newest docker image -docker-compose pull +docker-compose pull &>> $_log # restart if image changed -docker-compose up -d +docker-compose up -d &>> $_log # delete old images -docker image prune -f +docker image prune -f &>> $_log # disable wlan power save sudo iw wlan0 set power_save off sleep infinity -#xterm -# while true -# do -# sleep 10 -# done