From 39f5c0e7faf41dde691878f49c73a3e27f34947f Mon Sep 17 00:00:00 2001 From: mbattista Date: Sun, 21 Mar 2021 22:52:58 +0000 Subject: [PATCH 1/8] added vlc for local files and wesnoth as a showcase --- .m1k1o/build | 10 + .m1k1o/vlc/Dockerfile | 15 + .m1k1o/vlc/openbox.xml | 763 ++++++++++++++++++++++++++++++++ .m1k1o/vlc/supervisord.conf | 21 + .m1k1o/wesnoth/Dockerfile | 16 + .m1k1o/wesnoth/openbox.xml | 763 ++++++++++++++++++++++++++++++++ .m1k1o/wesnoth/supervisord.conf | 21 + README.md | 103 +++++ 8 files changed, 1712 insertions(+) create mode 100644 .m1k1o/vlc/Dockerfile create mode 100644 .m1k1o/vlc/openbox.xml create mode 100644 .m1k1o/vlc/supervisord.conf create mode 100644 .m1k1o/wesnoth/Dockerfile create mode 100644 .m1k1o/wesnoth/openbox.xml create mode 100644 .m1k1o/wesnoth/supervisord.conf diff --git a/.m1k1o/build b/.m1k1o/build index c342a7f..3764076 100755 --- a/.m1k1o/build +++ b/.m1k1o/build @@ -25,11 +25,21 @@ build_chromium() { docker build -t m1k1o/neko:chromium -f chromium/Dockerfile chromium/ } +build_wesnoth() { + docker build -t m1k1o/neko:wesnoth -f wesnoth/Dockerfile wesnoth/ +} + +build_vlc() { + docker build -t m1k1o/neko:vlc -f vlc/Dockerfile vlc/ +} + case $1 in client) build_client;; serve) build_server;; base) build_base;; firefox) build_firefox;; chromium) build_chromium;; + wesnoth) build_wesnoth;; + vlc) build_vlc;; *) echo "Unknown $1";; esac diff --git a/.m1k1o/vlc/Dockerfile b/.m1k1o/vlc/Dockerfile new file mode 100644 index 0000000..a40b17b --- /dev/null +++ b/.m1k1o/vlc/Dockerfile @@ -0,0 +1,15 @@ +FROM m1k1o1/neko:base + +# +# install firefox-esr +RUN set -eux; apt-get update; \ + apt-get install -y --no-install-recommends openbox vlc; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# +# copy configuation files +COPY supervisord.conf /etc/neko/supervisord/vlc.conf +COPY openbox.xml /etc/neko/openbox.xml diff --git a/.m1k1o/vlc/openbox.xml b/.m1k1o/vlc/openbox.xml new file mode 100644 index 0000000..95376a7 --- /dev/null +++ b/.m1k1o/vlc/openbox.xml @@ -0,0 +1,763 @@ + + + + + + + + 10 + 20 + + + + + + no + true + yes + normal + + + + + yes + + no + + yes + + no + + 200 + + no + + + + + Smart + +
yes
+ + Primary + + 1 + + + + + Clearlooks + NLIMC + + yes + yes + + sans + 8 + + bold + + normal + + + + sans + 8 + + bold + + normal + + + + sans + 9 + + normal + + normal + + + + sans + 9 + + normal + + normal + + + + sans + 9 + + bold + + normal + + + + sans + 9 + + bold + + normal + + + + + + + 1 + 1 + + + + 875 + + + + + yes + Nonpixel + + Center + + + + + 10 + + 10 + + + + + + + 0 + 0 + 0 + 0 + + + + TopLeft + + 0 + 0 + no + Above + + Vertical + + no + 300 + + 300 + + Middle + + + + + C-g + + + + leftno + + + rightno + + + upno + + + downno + + + leftno + + + rightno + + + upno + + + downno + + + 1 + + + 2 + + + 3 + + + 4 + + + + + + + + + + + + + + + + + + + + scrot -s + + + + + + + + + + + + + + + + + + + + + + + + yesyes + + + + + + + + + + + + right + + + + + left + + + + + up + + + + + down + + + + + + + + true + Konqueror + + kfmclient openProfile filemanagement + + + + + scrot + + + + + 1 + + 500 + + 400 + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + previous + + + next + + + previous + + + next + + + previous + + + next + + + + + + + + + + + + + + no + + + + + + + + + + + yes + + + + + + + + + + + + + + + + + + + + + + + + + + + top + + + + + + left + + + + + + right + + + + + + bottom + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vertical + + + horizontal + + + + + + + + + + + + + + + + + previous + + + next + + + + previous + + + next + + + previous + + + next + + + + + + + + + + + + + + + + + + + + previous + + + next + + + previous + + + next + + + + + + + + + + + menu.xml + 200 + + no + + 100 + + 400 + + yes + + yes + + + + + + + + diff --git a/.m1k1o/vlc/supervisord.conf b/.m1k1o/vlc/supervisord.conf new file mode 100644 index 0000000..dd5d991 --- /dev/null +++ b/.m1k1o/vlc/supervisord.conf @@ -0,0 +1,21 @@ +[program:vlc] +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" +command=/usr/bin/vlc --x11-display=%(ENV_DISPLAY)s +autorestart=true +priority=800 +user=%(ENV_USER)s +stdout_logfile=/var/log/neko/vlc.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true + +[program:openbox] +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" +command=/usr/bin/openbox --config-file /etc/neko/openbox.xml +autorestart=true +priority=300 +user=%(ENV_USER)s +stdout_logfile=/var/log/neko/openbox.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true diff --git a/.m1k1o/wesnoth/Dockerfile b/.m1k1o/wesnoth/Dockerfile new file mode 100644 index 0000000..e1d4daa --- /dev/null +++ b/.m1k1o/wesnoth/Dockerfile @@ -0,0 +1,16 @@ +FROM m1k1o/neko:base + +# +# install firefox-esr +RUN set -eux; apt-get update; \ + apt-get install -y --no-install-recommends openbox; \ + apt-get install -y wesnoth; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# +# copy configuation files +COPY supervisord.conf /etc/neko/supervisord/wesnoth.conf +COPY openbox.xml /etc/neko/openbox.xml diff --git a/.m1k1o/wesnoth/openbox.xml b/.m1k1o/wesnoth/openbox.xml new file mode 100644 index 0000000..b27311b --- /dev/null +++ b/.m1k1o/wesnoth/openbox.xml @@ -0,0 +1,763 @@ + + + + + + + + 10 + 20 + + + + + + no + true + yes + normal + + + + + yes + + no + + yes + + no + + 200 + + no + + + + + Smart + +
yes
+ + Primary + + 1 + + + + + Clearlooks + NLIMC + + yes + yes + + sans + 8 + + bold + + normal + + + + sans + 8 + + bold + + normal + + + + sans + 9 + + normal + + normal + + + + sans + 9 + + normal + + normal + + + + sans + 9 + + bold + + normal + + + + sans + 9 + + bold + + normal + + + + + + + 1 + 1 + + + + 875 + + + + + yes + Nonpixel + + Center + + + + + 10 + + 10 + + + + + + + 0 + 0 + 0 + 0 + + + + TopLeft + + 0 + 0 + no + Above + + Vertical + + no + 300 + + 300 + + Middle + + + + + C-g + + + + leftno + + + rightno + + + upno + + + downno + + + leftno + + + rightno + + + upno + + + downno + + + 1 + + + 2 + + + 3 + + + 4 + + + + + + + + + + + + + + + + + + + + scrot -s + + + + + + + + + + + + + + + + + + + + + + + + yesyes + + + + + + + + + + + + right + + + + + left + + + + + up + + + + + down + + + + + + + + true + Konqueror + + kfmclient openProfile filemanagement + + + + + scrot + + + + + 1 + + 500 + + 400 + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + previous + + + next + + + previous + + + next + + + previous + + + next + + + + + + + + + + + + + + no + + + + + + + + + + + yes + + + + + + + + + + + + + + + + + + + + + + + + + + + top + + + + + + left + + + + + + right + + + + + + bottom + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vertical + + + horizontal + + + + + + + + + + + + + + + + + previous + + + next + + + + previous + + + next + + + previous + + + next + + + + + + + + + + + + + + + + + + + + previous + + + next + + + previous + + + next + + + + + + + + + + + menu.xml + 200 + + no + + 100 + + 400 + + yes + + yes + + + + + + + + diff --git a/.m1k1o/wesnoth/supervisord.conf b/.m1k1o/wesnoth/supervisord.conf new file mode 100644 index 0000000..f32ed85 --- /dev/null +++ b/.m1k1o/wesnoth/supervisord.conf @@ -0,0 +1,21 @@ +[program:wesnoth] +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" +command=/usr/games/wesnoth -w +autorestart=true +priority=800 +user=%(ENV_USER)s +stdout_logfile=/var/log/neko/wesnoth.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true + +[program:openbox] +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" +command=/usr/bin/openbox --config-file /etc/neko/openbox.xml +autorestart=true +priority=300 +user=%(ENV_USER)s +stdout_logfile=/var/log/neko/openbox.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true diff --git a/README.md b/README.md index 13d762a..5161638 100644 --- a/README.md +++ b/README.md @@ -138,8 +138,111 @@ services: NEKO_NAT1TO1: ``` +## VLC + +```yaml +version: "3.4" +services: + neko: + image: "m1k1o/neko:vlc" + restart: "unless-stopped" + shm_size: "2gb" + volumes: + - ":/video" + ports: + - "8080:8080" + - "52000-52100:52000-52100/udp" + cap_add: + - SYS_ADMIN + environment: + NEKO_SCREEN: '1920x1080@30' + NEKO_PASSWORD: neko + NEKO_PASSWORD_ADMIN: admin + NEKO_EPR: 52000-52100 + NEKO_NAT1TO1: +``` + +## Wesnoth +Neko can share any application via docker. +For example the round-based strategy game wesnoth. + +```yaml +version: "3.4" +services: + neko: + image: "m1k1o/neko:wesnoth" + restart: "unless-stopped" + shm_size: "2gb" + ports: + - "8080:8080" + - "52000-52100:52000-52100/udp" + cap_add: + - SYS_ADMIN + environment: + NEKO_SCREEN: '1920x1080@30' + NEKO_PASSWORD: neko + NEKO_PASSWORD_ADMIN: admin + NEKO_EPR: 52000-52100 + NEKO_NAT1TO1: +``` + ## Mobile support Neko is now working on iOS and Android! Also, the UI screens have been fixed for small screens. ![mobile-screens](https://i.imgur.com/K9gfscU.png) + +## Docker-Compose Enviroment Options + +```code +NEKO_SCREEN: + - Resolution after startup. Only Admins can change this later. + - e.g. '1920x1080@30' +NEKO_PASSWORD: + - Password for the user login + - e.g. 'user_password' +NEKO_PASSWORD_ADMIN + - Password for the admin login + - e.g. 'admin_password' +NEKO_EPR: + - For WebRTC needed range of ports + - e.g. 52000-52100 +NEKO_VP8: + - If vp8 should be used as video encoder for the stream (default encoder) + - e.g. 'true' +NEKO_VP9: + - If vp9 should be used as video encoder for the stream (Parameter not optimized yet) + - e.g. 'false' +NEKO_H264: + - If h264 should be used as video encoder for the stream (second best option) + - e.g. 'false' +NEKO_VIDEO_BITRATE: + - Bitrate of the video stream in kb/s + - e.g. 3500 +NEKO_VIDEO: + - Makes it possible to create custom gstreamer pipelines. With this you could find the best quality for your CPU + - Installed are gstreamer1.0-plugins-base / gstreamer1.0-plugins-good / gstreamer1.0-plugins-bad / gstreamer1.0-plugins-ugly + - e.g. ' ximagesrc display-name=%s show-pointer=true use-damage=false ! video/x-raw,framerate=30/1 ! videoconvert ! queue ! video/x-raw,format=NV12 ! x264enc threads=4 bitrate=3500 key-int-max=60 vbv-buf-capacity=4000 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream ' +NEKO_MAX_FPS: + - The resulting stream frames per seconds should be capped (0 for uncapped) + - e.g. 0 +NEKO_OPUS: + - If opus should be used as audio encoder for the stream (default encoder) + - e.g. 'true' +NEKO_G722: + - If g722 should be used as audio encoder for the stream + - e.g. 'false' +NEKO_PCMU: + - If pcmu should be used as audio encoder for the stream + - e.g. 'false' +NEKO_PCMA: + - If pcma should be used as audio encoder for the stream + - e.g. 'false' +NEKO_CERT: + - Path to the SSL-Certificate + - e.g. '/certs/cert.pem' +NEKO_KEY: + - Path to the SSL-Certificate private key + - e.g. '/certs/key.pem' + +``` From 0d54b7105504151cb12b9a6dd6e5345f6fd2605b Mon Sep 17 00:00:00 2001 From: mbattista Date: Sun, 21 Mar 2021 23:00:33 +0000 Subject: [PATCH 2/8] fix some typos --- .m1k1o/vlc/Dockerfile | 2 +- README.md | 31 +++++++------------------------ 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/.m1k1o/vlc/Dockerfile b/.m1k1o/vlc/Dockerfile index a40b17b..23c8777 100644 --- a/.m1k1o/vlc/Dockerfile +++ b/.m1k1o/vlc/Dockerfile @@ -1,4 +1,4 @@ -FROM m1k1o1/neko:base +FROM m1k1o/neko:base # # install firefox-esr diff --git a/README.md b/README.md index 5161638..49ab480 100644 --- a/README.md +++ b/README.md @@ -58,12 +58,16 @@ For n.eko room management software visit https://github.com/m1k1o/neko-rooms. - Added `m1k1o/neko:vncviewer` tag, use `NEKO_VNC_URL` to specify VNC target and use n.eko as a bridge. - Abiltiy to include neko as a component in another Vue.Js project (by @gbrian). - Added HEALTHCHECK to Dockerfile. +- Added `m1k1o/neko:vlc` tag, use VLC to watch local files together (by @mbattista). +- Added `m1k1o/neko:wesnoth` tag, as an non video related showcase (by @mbattista). # Getting started & FAQ Use following docker images: - `m1k1o/neko:latest` - for Firefox. - `m1k1o/neko:chromium` - for Chromium Ungoogled (needs `--cap-add=SYS_ADMIN`). +- `m1k1o/neko:vlc` - for VLC Video player (needs `volumes` folder with local video files) +- `m1k1o/neko:wesnoth` - for playing wesnoth - `m1k1o/neko:base` - for custom base. Networking: @@ -162,30 +166,6 @@ services: NEKO_NAT1TO1: ``` -## Wesnoth -Neko can share any application via docker. -For example the round-based strategy game wesnoth. - -```yaml -version: "3.4" -services: - neko: - image: "m1k1o/neko:wesnoth" - restart: "unless-stopped" - shm_size: "2gb" - ports: - - "8080:8080" - - "52000-52100:52000-52100/udp" - cap_add: - - SYS_ADMIN - environment: - NEKO_SCREEN: '1920x1080@30' - NEKO_PASSWORD: neko - NEKO_PASSWORD_ADMIN: admin - NEKO_EPR: 52000-52100 - NEKO_NAT1TO1: -``` - ## Mobile support Neko is now working on iOS and Android! Also, the UI screens have been fixed for small screens. @@ -238,6 +218,9 @@ NEKO_PCMU: NEKO_PCMA: - If pcma should be used as audio encoder for the stream - e.g. 'false' +NEKO_AUDIO_BITRATE: + - Bitrate of the audio stream in kb/s + - e.g. 196 NEKO_CERT: - Path to the SSL-Certificate - e.g. '/certs/cert.pem' From 1b52d6db20464b7526aba38a9afa0cac6a1c4032 Mon Sep 17 00:00:00 2001 From: mbattista Date: Mon, 22 Mar 2021 15:22:52 +0000 Subject: [PATCH 3/8] removing wesnoth adding xfce --- .m1k1o/build | 6 +- .m1k1o/wesnoth/Dockerfile | 16 - .m1k1o/wesnoth/openbox.xml | 763 -------------------------------- .m1k1o/wesnoth/supervisord.conf | 21 - .m1k1o/xfce/Dockerfile | 18 + .m1k1o/xfce/supervisord.conf | 11 + 6 files changed, 32 insertions(+), 803 deletions(-) delete mode 100644 .m1k1o/wesnoth/Dockerfile delete mode 100644 .m1k1o/wesnoth/openbox.xml delete mode 100644 .m1k1o/wesnoth/supervisord.conf create mode 100644 .m1k1o/xfce/Dockerfile create mode 100644 .m1k1o/xfce/supervisord.conf diff --git a/.m1k1o/build b/.m1k1o/build index 3764076..5243d78 100755 --- a/.m1k1o/build +++ b/.m1k1o/build @@ -25,8 +25,8 @@ build_chromium() { docker build -t m1k1o/neko:chromium -f chromium/Dockerfile chromium/ } -build_wesnoth() { - docker build -t m1k1o/neko:wesnoth -f wesnoth/Dockerfile wesnoth/ +build_xfce() { + docker build -t m1k1o/neko:xfce -f xfce/Dockerfile xfce/ } build_vlc() { @@ -39,7 +39,7 @@ case $1 in base) build_base;; firefox) build_firefox;; chromium) build_chromium;; - wesnoth) build_wesnoth;; + xfce) build_xfce;; vlc) build_vlc;; *) echo "Unknown $1";; esac diff --git a/.m1k1o/wesnoth/Dockerfile b/.m1k1o/wesnoth/Dockerfile deleted file mode 100644 index e1d4daa..0000000 --- a/.m1k1o/wesnoth/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM m1k1o/neko:base - -# -# install firefox-esr -RUN set -eux; apt-get update; \ - apt-get install -y --no-install-recommends openbox; \ - apt-get install -y wesnoth; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* - -# -# copy configuation files -COPY supervisord.conf /etc/neko/supervisord/wesnoth.conf -COPY openbox.xml /etc/neko/openbox.xml diff --git a/.m1k1o/wesnoth/openbox.xml b/.m1k1o/wesnoth/openbox.xml deleted file mode 100644 index b27311b..0000000 --- a/.m1k1o/wesnoth/openbox.xml +++ /dev/null @@ -1,763 +0,0 @@ - - - - - - - - 10 - 20 - - - - - - no - true - yes - normal - - - - - yes - - no - - yes - - no - - 200 - - no - - - - - Smart - -
yes
- - Primary - - 1 - - - - - Clearlooks - NLIMC - - yes - yes - - sans - 8 - - bold - - normal - - - - sans - 8 - - bold - - normal - - - - sans - 9 - - normal - - normal - - - - sans - 9 - - normal - - normal - - - - sans - 9 - - bold - - normal - - - - sans - 9 - - bold - - normal - - - - - - - 1 - 1 - - - - 875 - - - - - yes - Nonpixel - - Center - - - - - 10 - - 10 - - - - - - - 0 - 0 - 0 - 0 - - - - TopLeft - - 0 - 0 - no - Above - - Vertical - - no - 300 - - 300 - - Middle - - - - - C-g - - - - leftno - - - rightno - - - upno - - - downno - - - leftno - - - rightno - - - upno - - - downno - - - 1 - - - 2 - - - 3 - - - 4 - - - - - - - - - - - - - - - - - - - - scrot -s - - - - - - - - - - - - - - - - - - - - - - - - yesyes - - - - - - - - - - - - right - - - - - left - - - - - up - - - - - down - - - - - - - - true - Konqueror - - kfmclient openProfile filemanagement - - - - - scrot - - - - - 1 - - 500 - - 400 - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - previous - - - next - - - previous - - - next - - - previous - - - next - - - - - - - - - - - - - - no - - - - - - - - - - - yes - - - - - - - - - - - - - - - - - - - - - - - - - - - top - - - - - - left - - - - - - right - - - - - - bottom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - vertical - - - horizontal - - - - - - - - - - - - - - - - - previous - - - next - - - - previous - - - next - - - previous - - - next - - - - - - - - - - - - - - - - - - - - previous - - - next - - - previous - - - next - - - - - - - - - - - menu.xml - 200 - - no - - 100 - - 400 - - yes - - yes - - - - - - - - diff --git a/.m1k1o/wesnoth/supervisord.conf b/.m1k1o/wesnoth/supervisord.conf deleted file mode 100644 index f32ed85..0000000 --- a/.m1k1o/wesnoth/supervisord.conf +++ /dev/null @@ -1,21 +0,0 @@ -[program:wesnoth] -environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" -command=/usr/games/wesnoth -w -autorestart=true -priority=800 -user=%(ENV_USER)s -stdout_logfile=/var/log/neko/wesnoth.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 -redirect_stderr=true - -[program:openbox] -environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" -command=/usr/bin/openbox --config-file /etc/neko/openbox.xml -autorestart=true -priority=300 -user=%(ENV_USER)s -stdout_logfile=/var/log/neko/openbox.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 -redirect_stderr=true diff --git a/.m1k1o/xfce/Dockerfile b/.m1k1o/xfce/Dockerfile new file mode 100644 index 0000000..743d3ae --- /dev/null +++ b/.m1k1o/xfce/Dockerfile @@ -0,0 +1,18 @@ +FROM m1k1o/neko:base + +# +# install firefox-esr +RUN set -eux; apt-get update; \ + apt-get install -y --no-install-recommends xfce4 xfce4-terminal sudo; \ + # + # add user to sudoers + usermod -aG sudo neko; \ + echo "neko:neko" | chpasswd; \ + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# +# copy configuation files +COPY supervisord.conf /etc/neko/supervisord/xfce.conf + diff --git a/.m1k1o/xfce/supervisord.conf b/.m1k1o/xfce/supervisord.conf new file mode 100644 index 0000000..c7664aa --- /dev/null +++ b/.m1k1o/xfce/supervisord.conf @@ -0,0 +1,11 @@ +[program:xfce] +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" +command=/usr/bin/startxfce4 +autorestart=true +priority=500 +user=%(ENV_USER)s +stdout_logfile=/var/log/neko/xfce.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true + From 2ad760c9875af3a97da865389058b095ea64c868 Mon Sep 17 00:00:00 2001 From: mbattista Date: Mon, 22 Mar 2021 15:36:48 +0000 Subject: [PATCH 4/8] changed README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 49ab480..792291c 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ For n.eko room management software visit https://github.com/m1k1o/neko-rooms. - Abiltiy to include neko as a component in another Vue.Js project (by @gbrian). - Added HEALTHCHECK to Dockerfile. - Added `m1k1o/neko:vlc` tag, use VLC to watch local files together (by @mbattista). -- Added `m1k1o/neko:wesnoth` tag, as an non video related showcase (by @mbattista). +- Added `m1k1o/neko:xfce` tag, as an non video related showcase (by @mbattista). # Getting started & FAQ @@ -67,7 +67,7 @@ Use following docker images: - `m1k1o/neko:latest` - for Firefox. - `m1k1o/neko:chromium` - for Chromium Ungoogled (needs `--cap-add=SYS_ADMIN`). - `m1k1o/neko:vlc` - for VLC Video player (needs `volumes` folder with local video files) -- `m1k1o/neko:wesnoth` - for playing wesnoth +- `m1k1o/neko:xfce` - for an shared desktop / installing shared software (sudo-pw: `neko`) - `m1k1o/neko:base` - for custom base. Networking: From 6699ff1c172c96b3e83da3fe444cf705fc386a71 Mon Sep 17 00:00:00 2001 From: mbattista Date: Mon, 22 Mar 2021 16:15:01 +0000 Subject: [PATCH 5/8] nopasswd for sudo --- .m1k1o/xfce/Dockerfile | 1 + README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.m1k1o/xfce/Dockerfile b/.m1k1o/xfce/Dockerfile index 743d3ae..4b7455c 100644 --- a/.m1k1o/xfce/Dockerfile +++ b/.m1k1o/xfce/Dockerfile @@ -8,6 +8,7 @@ RUN set -eux; apt-get update; \ # add user to sudoers usermod -aG sudo neko; \ echo "neko:neko" | chpasswd; \ + echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \ # clean up apt-get clean -y; \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* diff --git a/README.md b/README.md index 792291c..cbe0f1d 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Use following docker images: - `m1k1o/neko:latest` - for Firefox. - `m1k1o/neko:chromium` - for Chromium Ungoogled (needs `--cap-add=SYS_ADMIN`). - `m1k1o/neko:vlc` - for VLC Video player (needs `volumes` folder with local video files) -- `m1k1o/neko:xfce` - for an shared desktop / installing shared software (sudo-pw: `neko`) +- `m1k1o/neko:xfce` - for an shared desktop / installing shared software - `m1k1o/neko:base` - for custom base. Networking: From e01b60368c5fc79f9a5c3821db5961fa9538a743 Mon Sep 17 00:00:00 2001 From: m1k1o Date: Mon, 22 Mar 2021 18:53:41 +0100 Subject: [PATCH 6/8] vlc default folder, no startup dialog and fix openbox. --- .m1k1o/vlc/Dockerfile | 4 +++- .m1k1o/vlc/openbox.xml | 2 +- .m1k1o/vlc/supervisord.conf | 2 +- README.md | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.m1k1o/vlc/Dockerfile b/.m1k1o/vlc/Dockerfile index 23c8777..c9dccb1 100644 --- a/.m1k1o/vlc/Dockerfile +++ b/.m1k1o/vlc/Dockerfile @@ -1,7 +1,7 @@ FROM m1k1o/neko:base # -# install firefox-esr +# install vlc RUN set -eux; apt-get update; \ apt-get install -y --no-install-recommends openbox vlc; \ # @@ -9,6 +9,8 @@ RUN set -eux; apt-get update; \ apt-get clean -y; \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* +ENV VLC_MEDIA="/media" + # # copy configuation files COPY supervisord.conf /etc/neko/supervisord/vlc.conf diff --git a/.m1k1o/vlc/openbox.xml b/.m1k1o/vlc/openbox.xml index 95376a7..6b0339c 100644 --- a/.m1k1o/vlc/openbox.xml +++ b/.m1k1o/vlc/openbox.xml @@ -13,7 +13,7 @@ - + no true yes diff --git a/.m1k1o/vlc/supervisord.conf b/.m1k1o/vlc/supervisord.conf index dd5d991..f219e95 100644 --- a/.m1k1o/vlc/supervisord.conf +++ b/.m1k1o/vlc/supervisord.conf @@ -1,6 +1,6 @@ [program:vlc] environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" -command=/usr/bin/vlc --x11-display=%(ENV_DISPLAY)s +command=/usr/bin/vlc --x11-display=%(ENV_DISPLAY)s --no-qt-privacy-ask %(ENV_VLC_MEDIA)s autorestart=true priority=800 user=%(ENV_USER)s diff --git a/README.md b/README.md index cbe0f1d..8b53c17 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ For n.eko room management software visit https://github.com/m1k1o/neko-rooms. Use following docker images: - `m1k1o/neko:latest` - for Firefox. - `m1k1o/neko:chromium` - for Chromium Ungoogled (needs `--cap-add=SYS_ADMIN`). -- `m1k1o/neko:vlc` - for VLC Video player (needs `volumes` folder with local video files) +- `m1k1o/neko:vlc` - for VLC Video player (needs volume mounted to `/media` with local video files, or setting `VLC_MEDIA=/media` path). - `m1k1o/neko:xfce` - for an shared desktop / installing shared software - `m1k1o/neko:base` - for custom base. From 22622325ed43f51235353e43133bc9c1404344a4 Mon Sep 17 00:00:00 2001 From: m1k1o Date: Mon, 22 Mar 2021 18:55:45 +0100 Subject: [PATCH 7/8] fix comment. --- .m1k1o/xfce/Dockerfile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.m1k1o/xfce/Dockerfile b/.m1k1o/xfce/Dockerfile index 4b7455c..6c7da06 100644 --- a/.m1k1o/xfce/Dockerfile +++ b/.m1k1o/xfce/Dockerfile @@ -1,7 +1,7 @@ FROM m1k1o/neko:base # -# install firefox-esr +# install xfce RUN set -eux; apt-get update; \ apt-get install -y --no-install-recommends xfce4 xfce4-terminal sudo; \ # diff --git a/README.md b/README.md index 8b53c17..8934219 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Use following docker images: - `m1k1o/neko:latest` - for Firefox. - `m1k1o/neko:chromium` - for Chromium Ungoogled (needs `--cap-add=SYS_ADMIN`). - `m1k1o/neko:vlc` - for VLC Video player (needs volume mounted to `/media` with local video files, or setting `VLC_MEDIA=/media` path). -- `m1k1o/neko:xfce` - for an shared desktop / installing shared software +- `m1k1o/neko:xfce` - for an shared desktop / installing shared software. - `m1k1o/neko:base` - for custom base. Networking: From b0884352b8a45b259c6e741670fdc392bea74b95 Mon Sep 17 00:00:00 2001 From: m1k1o Date: Mon, 22 Mar 2021 18:56:51 +0100 Subject: [PATCH 8/8] add vncviewer to images. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8934219..35dcfa3 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,7 @@ For n.eko room management software visit https://github.com/m1k1o/neko-rooms. Use following docker images: - `m1k1o/neko:latest` - for Firefox. - `m1k1o/neko:chromium` - for Chromium Ungoogled (needs `--cap-add=SYS_ADMIN`). +- `m1k1o/neko:vncviewer` - for simple VNC viewer (specify `NEKO_VNC_URL` to your VNC target). - `m1k1o/neko:vlc` - for VLC Video player (needs volume mounted to `/media` with local video files, or setting `VLC_MEDIA=/media` path). - `m1k1o/neko:xfce` - for an shared desktop / installing shared software. - `m1k1o/neko:base` - for custom base.