no dummy file anymore, use /dev/null instead

This commit is contained in:
jr-k 2024-05-12 22:53:53 +02:00
parent d7a9f6d947
commit e17338552b
7 changed files with 25 additions and 22 deletions

View File

@ -1,4 +1,4 @@
DEBUG=false DEBUG=false
PORT=5000 PORT=5000
SECRET_KEY=ANY_SECRET_KEY_HERE 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

1
.gitignore vendored
View File

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

View File

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

View File

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

16
docker-compose.norpi.yml Normal file
View File

@ -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

View File

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

View File

@ -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