Merge pull request #49 from jr-k/develop

Release v1.12

.env.dist

@@ -1,4 +1,4 @@
 DEBUG=false
 PORT=5000
 SECRET_KEY=ANY_SECRET_KEY_HERE
-AUTOCONFIGURE_LX_FILE=/home/pi/.config/lxsession/LXDE-pi/autostart # Replace by "./var/run/dummy" if not needed
+AUTOCONFIGURE_LX_FILE=/home/pi/.config/lxsession/LXDE-pi/autostart # Replace by "/dev/null" if not needed

.gitignore

@@ -14,6 +14,5 @@ __pycache__/
 *.log
 var/run/*
 !var/run/.gitkeep
-!var/run/dummy
 *.swp
 .env

README.md

@@ -29,8 +29,10 @@ Use a RaspberryPi to show a full-screen slideshow (Kiosk-mode)
 mkdir -p obscreen/data/db obscreen/data/uploads && cd obscreen
 
 # Run the Docker container
-# 🚨 If you ARE NOT on a RaspberryPi ignore the line (-v /home/pi/...)
-# 🚨 Else make sure that /home/pi/.config/lxsession/LXDE-pi/autostart file exists and is writeable !
+# 🚨 If you ARE NOT on a RaspberryPi 
+#    - replace '/home/pi/.config/lxsession/LXDE-pi/autostart' with '/dev/null'
+# 🚨 Else make sure that 
+#    - file '/home/pi/.config/lxsession/LXDE-pi/autostart' exists and is writeable
 docker run --rm --name obscreen --pull=always \
   -e DEBUG=false \
   -e PORT=5000 \
@@ -49,10 +51,10 @@ docker run --rm --name obscreen --pull=always \
 mkdir -p obscreen/data/db obscreen/data/uploads && cd obscreen
 
 # Download docker-compose.yml
+# 🚨 If you ARE NOT on a RaspberryPi 
 curl https://raw.githubusercontent.com/jr-k/obscreen/master/docker-compose.yml > docker-compose.yml
-
-# If you ARE NOT on a RaspberryPi execute the line below
-uname | grep -q 'Darwin' && sed -i '' '/\/home\/pi/s/^/#/' docker-compose.yml || sed -i '/\/home\/pi/s/^/#/' docker-compose.yml
+# 🚨 If you ARE on a RaspberryPi
+curl https://raw.githubusercontent.com/jr-k/obscreen/master/docker-compose.norpi.yml > docker-compose.yml
 
 # Run
 docker compose up

docker-compose.dev.yml

@@ -13,6 +13,6 @@ services:
       - SECRET_KEY=${SECRET_KEY-ANY_SECRET_KEY_HERE}
     volumes:
       - .:/app
-      - ${AUTOCONFIGURE_LX_FILE-./var/run/dummy}:/app/var/run/lxfile
+      - ${AUTOCONFIGURE_LX_FILE-/dev/null}:/app/var/run/lxfile
     ports:
       - ${PORT}:${PORT}

docker-compose.norpi.yml

@@ -0,0 +1,16 @@
+services:
+  webapp:
+    container_name: obscreen
+    restart: unless-stopped
+    image: jierka/obscreen:latest
+    environment:
+      - DEBUG=false
+      - PORT=5000
+      - AUTOCONFIGURE_LX_FILE=/app/var/run/lxfile
+      - SECRET_KEY=ANY_SECRET_KEY_HERE
+    volumes:
+      - /dev/null:/app/var/run/lxfile
+      - ./data/db:/app/data/db
+      - ./data/uploads:/app/data/uploads
+    ports:
+      - 5000:5000

docker-compose.yml

@@ -9,7 +9,6 @@ services:
       - AUTOCONFIGURE_LX_FILE=/app/var/run/lxfile
       - SECRET_KEY=ANY_SECRET_KEY_HERE
     volumes:
-      # If you aren't on a RaspberryPi comment the line below
       - /home/pi/.config/lxsession/LXDE-pi/autostart:/app/var/run/lxfile
       - ./data/db:/app/data/db
       - ./data/uploads:/app/data/uploads

var/run/dummy

@@ -1,13 +0,0 @@
-
-@lxpanel --profile LXDE-pi
-@pcmanfm --desktop --profile LXDE-pi
-@xscreensaver -no-splash
-#@point-rpi
-@xset s off
-@xset -dpms
-@xset s noblank
-@unclutter -display :0 -noevents -grab
-@sed -i 's/"exited_cleanly": false/"exited_cleanly": true/' ~/.config/chromium/Default/Preferences
-#@sleep 10
-@chromium-browser --disable-features=Translate --ignore-certificate-errors --disable-web-security --disable-restore-session-state --autoplay-policy=no-user-gesture-required --start-maximized --allow-running-insecure-content --remember-cert-error-decisions --disable-restore-session-state --noerrdialogs --kiosk --incognito --window-position=0,0 --display=:0 http://localhost:5000
-