From 258af8a3ca76014dbabc1fe989aebf028c957680 Mon Sep 17 00:00:00 2001 From: Craig Date: Tue, 21 Apr 2020 19:58:56 +0000 Subject: [PATCH 01/10] docker base update --- .docker/files/base/Dockerfile | 11 ++-- .docker/files/base/neko.conf | 11 ++++ .docker/files/base/supervisord.conf | 42 ++++++++++++++ .docker/files/base/xorg.conf | 88 +++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 7 deletions(-) create mode 100644 .docker/files/base/neko.conf create mode 100644 .docker/files/base/supervisord.conf create mode 100644 .docker/files/base/xorg.conf diff --git a/.docker/files/base/Dockerfile b/.docker/files/base/Dockerfile index 0eb51c91..4342880f 100644 --- a/.docker/files/base/Dockerfile +++ b/.docker/files/base/Dockerfile @@ -11,7 +11,7 @@ ARG USER_GID=$USER_UID # # install neko dependencies RUN set -eux; apt-get update; \ - apt-get install -y --no-install-recommends wget ca-certificates; \ + apt-get install -y --no-install-recommends wget ca-certificates supervisor; \ # # create a non-root user groupadd --gid $USER_GID $USERNAME; \ @@ -45,12 +45,9 @@ ENV NEKO_BIND=:8080 # # neko config -COPY .docker/files/dbus /usr/bin/dbus -COPY .docker/files/openbox.xml /etc/neko/openbox.xml -COPY .docker/files/supervisord.conf /etc/neko/supervisord.conf -COPY .docker/files/xorg.conf /etc/neko/xorg.conf -COPY .docker/files/default.pa /etc/pulse/default.pa -COPY .docker/files/neko/supervisord.conf /etc/neko/supervisord/neko.conf +COPY .docker/files/base/supervisord.conf /etc/neko/supervisord.conf +COPY .docker/files/base/xorg.conf /etc/neko/xorg.conf +COPY .docker/files/base/neko.conf /etc/neko/supervisord/neko.conf # # neko dist diff --git a/.docker/files/base/neko.conf b/.docker/files/base/neko.conf new file mode 100644 index 00000000..e51a15ba --- /dev/null +++ b/.docker/files/base/neko.conf @@ -0,0 +1,11 @@ + +[program:neko] +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" +command=/usr/bin/neko serve -d --static "/var/www" +autorestart=true +priority=800 +user=%(ENV_USER)s +stdout_logfile=/var/log/neko/neko.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true \ No newline at end of file diff --git a/.docker/files/base/supervisord.conf b/.docker/files/base/supervisord.conf new file mode 100644 index 00000000..d33de54e --- /dev/null +++ b/.docker/files/base/supervisord.conf @@ -0,0 +1,42 @@ +[supervisord] +nodaemon=true +pidfile=/var/run/supervisord.pid +logfile=/dev/null +logfile_maxbytes=0 +loglevel=debug + +[include] +files=/etc/neko/supervisord/*.conf + +[program:dbus] +environment=HOME="/root",USER="root" +command=/usr/bin/dbus +autorestart=true +priority=100 +user=root +stdout_logfile=/var/log/neko/dbus.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true + +[program:x-server] +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s" +command=/usr/bin/X -config /etc/neko/xorg.conf %(ENV_DISPLAY)s +autorestart=true +priority=300 +user=%(ENV_USER)s +stdout_logfile=/var/log/neko/xorg.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true + +[program:pulseaudio] +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" +command=/usr/bin/pulseaudio --disallow-module-loading -vvvv --disallow-exit --exit-idle-time=-1 +autorestart=true +priority=300 +user=%(ENV_USER)s +stdout_logfile=/var/log/neko/pulseaudio.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true \ No newline at end of file diff --git a/.docker/files/base/xorg.conf b/.docker/files/base/xorg.conf new file mode 100644 index 00000000..c803041c --- /dev/null +++ b/.docker/files/base/xorg.conf @@ -0,0 +1,88 @@ +# This xorg configuration file is meant to be used by xpra +# to start a dummy X11 server. +# For details, please see: +# https://xpra.org/trac/wiki/Xdummy + +Section "ServerFlags" + Option "DontVTSwitch" "true" + Option "AllowMouseOpenFail" "true" + Option "PciForceNone" "true" + Option "AutoEnableDevices" "false" + Option "AutoAddDevices" "false" +EndSection + +Section "InputDevice" + Identifier "dummy_mouse" + Option "CorePointer" "true" + Driver "void" +EndSection + +Section "InputDevice" + Identifier "dummy_keyboard" + Option "CoreKeyboard" "true" + Driver "void" +EndSection + +Section "Device" + Identifier "dummy_videocard" + Driver "dummy" + Option "ConstantDPI" "true" + #VideoRam 4096000 + #VideoRam 256000 + VideoRam 192000 +EndSection + +Section "Monitor" + Identifier "dummy_monitor" + HorizSync 5.0 - 1000.0 + VertRefresh 5.0 - 200.0 + #This can be used to get a specific DPI, but only for the default resolution: + #DisplaySize 508 317 + #NOTE: the highest modes will not work without increasing the VideoRam + # for the dummy video card. + # https://arachnoid.com/modelines/ + + # 1280x720 @ 30.00 Hz (GTF) hsync: 21.99 kHz; pclk: 33.78 MHz + Modeline "1280x720_30.00" 33.78 1280 1288 1408 1536 720 721 724 733 -HSync +Vsync + + # 1280x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 74.48 MHz + Modeline "1280x720_60.00" 74.48 1280 1336 1472 1664 720 721 724 746 -HSync +Vsync + # 1152x648 @ 60.00 Hz (GTF) hsync: 40.26 kHz; pclk: 59.91 MHz + Modeline "1152x648_60.00" 59.91 1152 1200 1320 1488 648 649 652 671 -HSync +Vsync + # 1024x576 @ 60.00 Hz (GTF) hsync: 35.82 kHz; pclk: 47.00 MHz + Modeline "1024x576_60.00" 47.00 1024 1064 1168 1312 576 577 580 597 -HSync +Vsync + # 960x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 55.86 MHz + Modeline "960x720_60.00" 55.86 960 1008 1104 1248 720 721 724 746 -HSync +Vsync + # 800x600 @ 60.00 Hz (GTF) hsync: 37.32 kHz; pclk: 38.22 MHz + Modeline "800x600_60.00" 38.22 800 832 912 1024 600 601 604 622 -HSync +Vsync + + # 1920x1080 @ 30.00 Hz (GTF) hsync: 32.97 kHz; pclk: 80.18 MHz + Modeline "1920x1080_30.00" 80.18 1920 1984 2176 2432 1080 1081 1084 1099 -HSync +Vsync + # 1152x648 @ 30.00 Hz (GTF) hsync: 19.80 kHz; pclk: 26.93 MHz + Modeline "1152x648_30.00" 26.93 1152 1144 1256 1360 648 649 652 660 -HSync +Vsync + # 1024x576 @ 30.00 Hz (GTF) hsync: 17.61 kHz; pclk: 20.85 MHz + Modeline "1024x576_30.00" 20.85 1024 1008 1104 1184 576 577 580 587 -HSync +Vsync + # 960x720 @ 30.00 Hz (GTF) hsync: 21.99 kHz; pclk: 25.33 MHz + Modeline "960x720_30.00" 25.33 960 960 1056 1152 720 721 724 733 -HSync +Vsync + # 800x600 @ 30.00 Hz (GTF) hsync: 18.33 kHz; pclk: 17.01 MHz + Modeline "800x600_30.00" 17.01 800 792 864 928 600 601 604 611 -HSync +Vsync +EndSection + +Section "Screen" + Identifier "dummy_screen" + Device "dummy_videocard" + Monitor "dummy_monitor" + DefaultDepth 24 + SubSection "Display" + Viewport 0 0 + Depth 24 + Modes "1280x720_30.00" "1920x1080_60.00" "1280x720_60.00" "1152x648_60.00" "1024x576_60.00" "960x720_60.00" "800x600_60.00" "1920x1080_30.00" "1152x648_30.00" "1024x576_30.00" "960x720_30.00" "800x600_30.00" + EndSubSection +EndSection + +Section "ServerLayout" + Identifier "dummy_layout" + Screen "dummy_screen" + InputDevice "dummy_mouse" + InputDevice "dummy_keyboard" +EndSection \ No newline at end of file From 13817df1e4368b34bf24d379f0b22d9e5a7bc91e Mon Sep 17 00:00:00 2001 From: Craig Date: Tue, 21 Apr 2020 19:59:08 +0000 Subject: [PATCH 02/10] docker deps update --- .docker/files/deps/Dockerfile | 4 +++- .docker/files/deps/dbus | 11 +++++++++++ .docker/files/deps/default.pa | 7 +++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100755 .docker/files/deps/dbus create mode 100644 .docker/files/deps/default.pa diff --git a/.docker/files/deps/Dockerfile b/.docker/files/deps/Dockerfile index 715083a8..e81d5662 100644 --- a/.docker/files/deps/Dockerfile +++ b/.docker/files/deps/Dockerfile @@ -3,7 +3,7 @@ FROM debian:stretch-slim # # install neko dependencies RUN set -eux; apt-get update; \ - apt-get install -y --no-install-recommends pulseaudio openbox dbus-x11 xserver-xorg-video-dummy supervisor; \ + apt-get install -y --no-install-recommends pulseaudio dbus-x11 xserver-xorg-video-dummy; \ apt-get install -y --no-install-recommends libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx4; \ # # clean up @@ -19,3 +19,5 @@ ENV PKG_CONFIG_PATH=/gst/local/lib/pkgconfig:$PKG_CONFIG_PATH # # copy gst COPY .build/gst/local /gst/local/ +COPY .docker/files/deps/dbus /usr/bin/dbus +COPY .docker/files/deps/default.pa /etc/pulse/default.pa \ No newline at end of file diff --git a/.docker/files/deps/dbus b/.docker/files/deps/dbus new file mode 100755 index 00000000..2859a0e2 --- /dev/null +++ b/.docker/files/deps/dbus @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ ! -d /var/run/dbus ]; then + mkdir -p /var/run/dbus +fi + +if [ -f /var/run/dbus/pid ]; then + rm -f /var/run/dbus/pid +fi + +/usr/bin/dbus-daemon --nofork --print-pid --config-file=/usr/share/dbus-1/system.conf \ No newline at end of file diff --git a/.docker/files/deps/default.pa b/.docker/files/deps/default.pa new file mode 100644 index 00000000..799bba55 --- /dev/null +++ b/.docker/files/deps/default.pa @@ -0,0 +1,7 @@ +#!/usr/bin/pulseaudio -nF + +# Allow pulse audio to be accessed via TCP (from localhost only), to allow other users to access the virtual devices +load-module module-native-protocol-unix socket=/tmp/pulseaudio.socket auth-anonymous=1 + +### Make sure we always have a sink around, even if it is a null sink. +load-module module-always-sink \ No newline at end of file From 086d8322e02dbbaf0d0822ff83b1b01d0aff9019 Mon Sep 17 00:00:00 2001 From: Craig Date: Tue, 21 Apr 2020 19:59:28 +0000 Subject: [PATCH 03/10] docker chromium update --- .docker/files/chromium/Dockerfile | 5 +- .docker/files/chromium/openbox.xml | 763 ++++++++++++++++++++++++ .docker/files/chromium/supervisord.conf | 5 +- 3 files changed, 767 insertions(+), 6 deletions(-) create mode 100644 .docker/files/chromium/openbox.xml diff --git a/.docker/files/chromium/Dockerfile b/.docker/files/chromium/Dockerfile index f2cc3025..5b42c07b 100644 --- a/.docker/files/chromium/Dockerfile +++ b/.docker/files/chromium/Dockerfile @@ -1,4 +1,4 @@ -FROM nurdism/neko:base +FROM nurdism/neko:openbox # # install neko chromium @@ -21,4 +21,5 @@ RUN set -eux; apt-get update; \ # copy configuation files COPY .docker/files/chromium/supervisord.conf /etc/neko/supervisord/chromium.conf COPY .docker/files/chromium/preferences.json /usr/share/chromium/master_preferences -COPY .docker/files/chromium/policies.json /etc/chromium/policies/managed/policies.json \ No newline at end of file +COPY .docker/files/chromium/policies.json /etc/chromium/policies/managed/policies.json +COPY .docker/files/chromium/openbox.xml /etc/neko/openbox.xml \ No newline at end of file diff --git a/.docker/files/chromium/openbox.xml b/.docker/files/chromium/openbox.xml new file mode 100644 index 00000000..f79f3a3c --- /dev/null +++ b/.docker/files/chromium/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/.docker/files/chromium/supervisord.conf b/.docker/files/chromium/supervisord.conf index da86a77b..90125205 100644 --- a/.docker/files/chromium/supervisord.conf +++ b/.docker/files/chromium/supervisord.conf @@ -9,7 +9,4 @@ user=%(ENV_USER)s stdout_logfile=/var/log/neko/chromium.log stdout_logfile_maxbytes=100MB stdout_logfile_backups=10 -redirect_stderr=true -stderr_logfile=/var/log/neko/chromium.err.log -stderr_logfile_maxbytes=100MB -stderr_logfile_backups=10 \ No newline at end of file +redirect_stderr=true \ No newline at end of file From d8ec03694d7ec9d6b6fe088fe12ecb6302877d8c Mon Sep 17 00:00:00 2001 From: Craig Date: Tue, 21 Apr 2020 19:59:46 +0000 Subject: [PATCH 04/10] docker firefox update --- .docker/files/firefox/Dockerfile | 3 +- .docker/files/firefox/openbox.xml | 763 +++++++++++++++++++++++++ .docker/files/firefox/supervisord.conf | 5 +- 3 files changed, 766 insertions(+), 5 deletions(-) create mode 100644 .docker/files/firefox/openbox.xml diff --git a/.docker/files/firefox/Dockerfile b/.docker/files/firefox/Dockerfile index 0ef34a59..544bbd5e 100644 --- a/.docker/files/firefox/Dockerfile +++ b/.docker/files/firefox/Dockerfile @@ -1,4 +1,4 @@ -FROM nurdism/neko:base +FROM nurdism/neko:openbox # # install firefox-esr @@ -20,3 +20,4 @@ COPY .docker/files/firefox/supervisord.conf /etc/neko/supervisord/firefox.conf COPY .docker/files/firefox/neko.js /usr/lib/firefox-esr/mozilla.cfg COPY .docker/files/firefox/autoconfig.js /usr/lib/firefox-esr/defaults/pref/autoconfig.js COPY .docker/files/firefox/policies.json /usr/lib/firefox-esr/distribution/policies.json +COPY .docker/files/firefox/openbox.xml /etc/neko/openbox.xml diff --git a/.docker/files/firefox/openbox.xml b/.docker/files/firefox/openbox.xml new file mode 100644 index 00000000..0e73a076 --- /dev/null +++ b/.docker/files/firefox/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/.docker/files/firefox/supervisord.conf b/.docker/files/firefox/supervisord.conf index 312ef888..8eb9dccd 100644 --- a/.docker/files/firefox/supervisord.conf +++ b/.docker/files/firefox/supervisord.conf @@ -8,7 +8,4 @@ user=%(ENV_USER)s stdout_logfile=/var/log/neko/firefox-esr.log stdout_logfile_maxbytes=100MB stdout_logfile_backups=10 -redirect_stderr=true -stderr_logfile=/var/log/neko/firefox-esr.err.log -stderr_logfile_maxbytes=100MB -stderr_logfile_backups=10 \ No newline at end of file +redirect_stderr=true \ No newline at end of file From ea4fa1720c46d81341842f540dd0421658521cf3 Mon Sep 17 00:00:00 2001 From: Craig Date: Tue, 21 Apr 2020 20:00:11 +0000 Subject: [PATCH 05/10] added docker openbox --- .docker/files/openbox/Dockerfile | 11 + .docker/files/openbox/conf.xml | 753 +++++++++++++++++++++++++ .docker/files/openbox/supervisord.conf | 10 + 3 files changed, 774 insertions(+) create mode 100644 .docker/files/openbox/Dockerfile create mode 100644 .docker/files/openbox/conf.xml create mode 100644 .docker/files/openbox/supervisord.conf diff --git a/.docker/files/openbox/Dockerfile b/.docker/files/openbox/Dockerfile new file mode 100644 index 00000000..c7d9635e --- /dev/null +++ b/.docker/files/openbox/Dockerfile @@ -0,0 +1,11 @@ +FROM nurdism/neko:base + +# +# install openbox +RUN set -eux; apt-get update; \ + apt-get install -y --no-install-recommends openbox; + +# +# copy openbox conf and supervisord conf +COPY .docker/files/openbox/supervisord.conf /etc/neko/supervisord/openbox.conf +COPY .docker/files/openbox/conf.xml /etc/neko/openbox.xml diff --git a/.docker/files/openbox/conf.xml b/.docker/files/openbox/conf.xml new file mode 100644 index 00000000..5e7aff0e --- /dev/null +++ b/.docker/files/openbox/conf.xml @@ -0,0 +1,753 @@ + + + + + + + + 10 + 20 + + + + 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 + + + + + + + 10 + 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 + + + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + + top + + + + + + left + + + + + + right + + + + + + bottom + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vertical + + + horizontal + + + + + + + + + + + + + + + + + previous + + + next + + + + previous + + + next + + + previous + + + next + + + + + + + + + + + + + + + + client-list-combined-menu + + + root-menu + + + + + + previous + + + next + + + previous + + + next + + + + + + + + + + + menu.xml + 200 + + no + + 100 + + 400 + + yes + + yes + + + + + + + +
diff --git a/.docker/files/openbox/supervisord.conf b/.docker/files/openbox/supervisord.conf new file mode 100644 index 00000000..eb906344 --- /dev/null +++ b/.docker/files/openbox/supervisord.conf @@ -0,0 +1,10 @@ +[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 From 28c87742f29e888d8bc4745595e9316d87232bc1 Mon Sep 17 00:00:00 2001 From: Craig Date: Tue, 21 Apr 2020 20:00:22 +0000 Subject: [PATCH 06/10] added docker jwm --- .docker/files/jwm/Dockerfile | 11 ++ .docker/files/jwm/conf.xml | 209 +++++++++++++++++++++++++++++ .docker/files/jwm/supervisord.conf | 10 ++ 3 files changed, 230 insertions(+) create mode 100644 .docker/files/jwm/Dockerfile create mode 100644 .docker/files/jwm/conf.xml create mode 100644 .docker/files/jwm/supervisord.conf diff --git a/.docker/files/jwm/Dockerfile b/.docker/files/jwm/Dockerfile new file mode 100644 index 00000000..7a7ab59e --- /dev/null +++ b/.docker/files/jwm/Dockerfile @@ -0,0 +1,11 @@ +FROM nurdism/neko:base + +# +# install jwm +RUN set -eux; apt-get update; \ + apt-get install -y --no-install-recommends jwm; + +# +# copy jwm conf and supervisord conf +COPY .docker/files/jwm/supervisord.conf /etc/neko/supervisord/jwm.conf +COPY .docker/files/jwm/conf.xml /etc/neko/jwm.xml diff --git a/.docker/files/jwm/conf.xml b/.docker/files/jwm/conf.xml new file mode 100644 index 00000000..d8a17960 --- /dev/null +++ b/.docker/files/jwm/conf.xml @@ -0,0 +1,209 @@ + + + + + + /etc/jwm/debian-menu + xterm + + + xlock -mode blank + + + + + + + + + + + + + Pidgin + + + + xterm + + + + xclock + + + + + + + + root:1 + + showdesktop + + + + + + + + + + + + + + Sans-9:bold + 4 + 21 + 3 + #FFFFFF + #555555 + #000000 + 0.5 + + #FFFFFF + #0077CC + #000000 + 1.0 + + + + Sans-9 + #333333 + #FFFFFF + #000000 + 0.75 + + + #000000 + #555555 + #333333 + #FFFFFF + + #0077CC + #004488 + + + + Sans-9 + #FFFFFF + #333333 + #000000 + + #FFFFFF + #0077CC + + 0.85 + + + Sans-9 + #000000 + #999999 + + + + /usr/share/icons/gnome/256x256/actions + /usr/share/icons/gnome/256x256/apps + /usr/share/icons/gnome/256x256/categories + /usr/share/icons/gnome/256x256/devices + /usr/share/icons/gnome/256x256/emblems + /usr/share/icons/gnome/256x256/mimetypes + /usr/share/icons/gnome/256x256/places + /usr/share/icons/gnome/256x256/status + /usr/share/icons/gnome/32x32/actions + /usr/share/icons/gnome/32x32/animations + /usr/share/icons/gnome/32x32/apps + /usr/share/icons/gnome/32x32/categories + /usr/share/icons/gnome/32x32/devices + /usr/share/icons/gnome/32x32/emblems + /usr/share/icons/gnome/32x32/mimetypes + /usr/share/icons/gnome/32x32/places + /usr/share/icons/gnome/32x32/status + /usr/share/icons/gnome/scalable/actions + /usr/share/icons/gnome/scalable/apps + /usr/share/icons/gnome/scalable/categories + /usr/share/icons/gnome/scalable/devices + /usr/share/icons/gnome/scalable/emblems + /usr/share/icons/gnome/scalable/mimetypes + /usr/share/icons/gnome/scalable/places + /usr/share/icons/gnome/scalable/status + /usr/share/icons/hicolor/256x256/apps + /usr/share/icons/hicolor/256x256/mimetypes + /usr/share/icons/hicolor/32x32/actions + /usr/share/icons/hicolor/32x32/apps + /usr/share/icons/hicolor/32x32/categories + /usr/share/icons/hicolor/32x32/devices + /usr/share/icons/hicolor/32x32/emblems + /usr/share/icons/hicolor/32x32/mimetypes + /usr/share/icons/hicolor/32x32/status + /usr/share/icons/hicolor/512x512/apps + /usr/share/icons/hicolor/512x512/mimetypes + /usr/share/icons/hicolor/scalable/actions + /usr/share/icons/hicolor/scalable/apps + /usr/share/icons/hicolor/scalable/categories + /usr/share/icons/hicolor/scalable/devices + /usr/share/icons/hicolor/scalable/emblems + /usr/share/icons/hicolor/scalable/mimetypes + /usr/share/icons/hicolor/scalable/places + /usr/share/icons/hicolor/scalable/status + /usr/share/icons + /usr/share/pixmaps + + /usr/local/share/jwm + + + + + + + #111111 + + + + 400 + + + 2 + + + sloppy + + + border + + + opaque + + + opaque + + + up + down + right + left + left + down + up + right + select + escape + + nextstacked + close + desktop# + root:1 + window + maximize + rdesktop + ldesktop + udesktop + ddesktop + + \ No newline at end of file diff --git a/.docker/files/jwm/supervisord.conf b/.docker/files/jwm/supervisord.conf new file mode 100644 index 00000000..ddac11d9 --- /dev/null +++ b/.docker/files/jwm/supervisord.conf @@ -0,0 +1,10 @@ +[program:jwm] +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" +command=/usr/bin/jwm -f /etc/neko/jwm.xml -display %(ENV_DISPLAY)s +autorestart=true +priority=300 +user=%(ENV_USER)s +stdout_logfile=/var/log/neko/jwm.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true \ No newline at end of file From d451173cf09d58b9b972e5e12992c4b0696b7141 Mon Sep 17 00:00:00 2001 From: Craig Date: Tue, 21 Apr 2020 20:00:39 +0000 Subject: [PATCH 07/10] added docker xfce4 --- .docker/files/xfce4/Dockerfile | 11 +++++++++++ .docker/files/xfce4/supervisord.conf | 10 ++++++++++ 2 files changed, 21 insertions(+) create mode 100644 .docker/files/xfce4/Dockerfile create mode 100644 .docker/files/xfce4/supervisord.conf diff --git a/.docker/files/xfce4/Dockerfile b/.docker/files/xfce4/Dockerfile new file mode 100644 index 00000000..12105f3f --- /dev/null +++ b/.docker/files/xfce4/Dockerfile @@ -0,0 +1,11 @@ +FROM nurdism/neko:base + +# +# install xfce4 +RUN set -eux; apt-get update; \ + apt-get install -y --no-install-recommends xfce4; + +# +# copy xfce4 conf and supervisord conf +COPY .docker/files/xfce4/supervisord.conf /etc/neko/openbox.xml +# COPY .docker/files/xfce4/xfconf /etc/neko/xfconf diff --git a/.docker/files/xfce4/supervisord.conf b/.docker/files/xfce4/supervisord.conf new file mode 100644 index 00000000..7eecca65 --- /dev/null +++ b/.docker/files/xfce4/supervisord.conf @@ -0,0 +1,10 @@ +[program:xfce4] +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" +command=/usr/bin/xfce4-session +autorestart=true +priority=300 +user=%(ENV_USER)s +stdout_logfile=/var/log/neko/xfce4.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true From 09b31687ccab05b9d1b0c743388ed65e554343a9 Mon Sep 17 00:00:00 2001 From: Craig Date: Tue, 21 Apr 2020 20:00:51 +0000 Subject: [PATCH 08/10] added docker popcorn time (wip) --- .docker/files/popcorn/Dockerfile | 15 + .docker/files/popcorn/openbox.xml | 763 +++++++++++++++++++++++++ .docker/files/popcorn/supervisord.conf | 11 + 3 files changed, 789 insertions(+) create mode 100644 .docker/files/popcorn/Dockerfile create mode 100644 .docker/files/popcorn/openbox.xml create mode 100644 .docker/files/popcorn/supervisord.conf diff --git a/.docker/files/popcorn/Dockerfile b/.docker/files/popcorn/Dockerfile new file mode 100644 index 00000000..18f342b2 --- /dev/null +++ b/.docker/files/popcorn/Dockerfile @@ -0,0 +1,15 @@ +FROM nurdism/neko:openbox + +# +# install popcorn time +RUN set -eux; apt-get update; \ + apt-get install -y --no-install-recommends ; \ + # + # clean up + apt-get clean -y; \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# +# copy configuation files +COPY .docker/files/popcorn/supervisord.conf /etc/neko/supervisord/popcorn.conf +COPY .docker/files/popcorn/openbox.xml /etc/neko/openbox.xml \ No newline at end of file diff --git a/.docker/files/popcorn/openbox.xml b/.docker/files/popcorn/openbox.xml new file mode 100644 index 00000000..0e73a076 --- /dev/null +++ b/.docker/files/popcorn/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/.docker/files/popcorn/supervisord.conf b/.docker/files/popcorn/supervisord.conf new file mode 100644 index 00000000..3ba90fcc --- /dev/null +++ b/.docker/files/popcorn/supervisord.conf @@ -0,0 +1,11 @@ + +[program:popcorn] +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" +command= +autorestart=true +priority=800 +user=%(ENV_USER)s +stdout_logfile=/var/log/neko/popcorn.log +stdout_logfile_maxbytes=100MB +stdout_logfile_backups=10 +redirect_stderr=true \ No newline at end of file From 2d45eb5ca4de47133b493c5566ed1f35f185bd61 Mon Sep 17 00:00:00 2001 From: Craig Date: Tue, 21 Apr 2020 20:01:12 +0000 Subject: [PATCH 09/10] clean up old files --- .docker/files/brave/.gitkeep | 0 .docker/files/dbus | 11 - .docker/files/default.pa | 7 - .docker/files/jwm.xml | 209 -------- .docker/files/neko/supervisord.conf | 14 - .docker/files/openbox.xml | 769 ---------------------------- .docker/files/opera/.gitkeep | 0 .docker/files/supervisord.conf | 53 -- .docker/files/xorg.conf | 88 ---- 9 files changed, 1151 deletions(-) delete mode 100644 .docker/files/brave/.gitkeep delete mode 100755 .docker/files/dbus delete mode 100644 .docker/files/default.pa delete mode 100644 .docker/files/jwm.xml delete mode 100644 .docker/files/neko/supervisord.conf delete mode 100644 .docker/files/openbox.xml delete mode 100644 .docker/files/opera/.gitkeep delete mode 100644 .docker/files/supervisord.conf delete mode 100644 .docker/files/xorg.conf diff --git a/.docker/files/brave/.gitkeep b/.docker/files/brave/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/.docker/files/dbus b/.docker/files/dbus deleted file mode 100755 index 2859a0e2..00000000 --- a/.docker/files/dbus +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -if [ ! -d /var/run/dbus ]; then - mkdir -p /var/run/dbus -fi - -if [ -f /var/run/dbus/pid ]; then - rm -f /var/run/dbus/pid -fi - -/usr/bin/dbus-daemon --nofork --print-pid --config-file=/usr/share/dbus-1/system.conf \ No newline at end of file diff --git a/.docker/files/default.pa b/.docker/files/default.pa deleted file mode 100644 index 799bba55..00000000 --- a/.docker/files/default.pa +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/pulseaudio -nF - -# Allow pulse audio to be accessed via TCP (from localhost only), to allow other users to access the virtual devices -load-module module-native-protocol-unix socket=/tmp/pulseaudio.socket auth-anonymous=1 - -### Make sure we always have a sink around, even if it is a null sink. -load-module module-always-sink \ No newline at end of file diff --git a/.docker/files/jwm.xml b/.docker/files/jwm.xml deleted file mode 100644 index d8a17960..00000000 --- a/.docker/files/jwm.xml +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - /etc/jwm/debian-menu - xterm - - - xlock -mode blank - - - - - - - - - - - - - Pidgin - - - - xterm - - - - xclock - - - - - - - - root:1 - - showdesktop - - - - - - - - - - - - - - Sans-9:bold - 4 - 21 - 3 - #FFFFFF - #555555 - #000000 - 0.5 - - #FFFFFF - #0077CC - #000000 - 1.0 - - - - Sans-9 - #333333 - #FFFFFF - #000000 - 0.75 - - - #000000 - #555555 - #333333 - #FFFFFF - - #0077CC - #004488 - - - - Sans-9 - #FFFFFF - #333333 - #000000 - - #FFFFFF - #0077CC - - 0.85 - - - Sans-9 - #000000 - #999999 - - - - /usr/share/icons/gnome/256x256/actions - /usr/share/icons/gnome/256x256/apps - /usr/share/icons/gnome/256x256/categories - /usr/share/icons/gnome/256x256/devices - /usr/share/icons/gnome/256x256/emblems - /usr/share/icons/gnome/256x256/mimetypes - /usr/share/icons/gnome/256x256/places - /usr/share/icons/gnome/256x256/status - /usr/share/icons/gnome/32x32/actions - /usr/share/icons/gnome/32x32/animations - /usr/share/icons/gnome/32x32/apps - /usr/share/icons/gnome/32x32/categories - /usr/share/icons/gnome/32x32/devices - /usr/share/icons/gnome/32x32/emblems - /usr/share/icons/gnome/32x32/mimetypes - /usr/share/icons/gnome/32x32/places - /usr/share/icons/gnome/32x32/status - /usr/share/icons/gnome/scalable/actions - /usr/share/icons/gnome/scalable/apps - /usr/share/icons/gnome/scalable/categories - /usr/share/icons/gnome/scalable/devices - /usr/share/icons/gnome/scalable/emblems - /usr/share/icons/gnome/scalable/mimetypes - /usr/share/icons/gnome/scalable/places - /usr/share/icons/gnome/scalable/status - /usr/share/icons/hicolor/256x256/apps - /usr/share/icons/hicolor/256x256/mimetypes - /usr/share/icons/hicolor/32x32/actions - /usr/share/icons/hicolor/32x32/apps - /usr/share/icons/hicolor/32x32/categories - /usr/share/icons/hicolor/32x32/devices - /usr/share/icons/hicolor/32x32/emblems - /usr/share/icons/hicolor/32x32/mimetypes - /usr/share/icons/hicolor/32x32/status - /usr/share/icons/hicolor/512x512/apps - /usr/share/icons/hicolor/512x512/mimetypes - /usr/share/icons/hicolor/scalable/actions - /usr/share/icons/hicolor/scalable/apps - /usr/share/icons/hicolor/scalable/categories - /usr/share/icons/hicolor/scalable/devices - /usr/share/icons/hicolor/scalable/emblems - /usr/share/icons/hicolor/scalable/mimetypes - /usr/share/icons/hicolor/scalable/places - /usr/share/icons/hicolor/scalable/status - /usr/share/icons - /usr/share/pixmaps - - /usr/local/share/jwm - - - - - - - #111111 - - - - 400 - - - 2 - - - sloppy - - - border - - - opaque - - - opaque - - - up - down - right - left - left - down - up - right - select - escape - - nextstacked - close - desktop# - root:1 - window - maximize - rdesktop - ldesktop - udesktop - ddesktop - - \ No newline at end of file diff --git a/.docker/files/neko/supervisord.conf b/.docker/files/neko/supervisord.conf deleted file mode 100644 index 84e418a7..00000000 --- a/.docker/files/neko/supervisord.conf +++ /dev/null @@ -1,14 +0,0 @@ - -[program:neko] -environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" -command=/usr/bin/neko serve -d --static "/var/www" -autorestart=true -priority=800 -user=%(ENV_USER)s -stdout_logfile=/var/log/neko/neko.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 -redirect_stderr=true -stderr_logfile=/var/log/neko/neko.err.log -stderr_logfile_maxbytes=100MB -stderr_logfile_backups=10 \ No newline at end of file diff --git a/.docker/files/openbox.xml b/.docker/files/openbox.xml deleted file mode 100644 index ec8ec927..00000000 --- a/.docker/files/openbox.xml +++ /dev/null @@ -1,769 +0,0 @@ - - - - - - - - 10 - 20 - - - - - - no - true - yes - normal - - - 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 - - - - - - - 4 - 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/.docker/files/opera/.gitkeep b/.docker/files/opera/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/.docker/files/supervisord.conf b/.docker/files/supervisord.conf deleted file mode 100644 index b132c556..00000000 --- a/.docker/files/supervisord.conf +++ /dev/null @@ -1,53 +0,0 @@ -[supervisord] -nodaemon=true -pidfile=/var/run/supervisord.pid -logfile=/dev/null -logfile_maxbytes=0 -loglevel=debug - -[include] -files=/etc/neko/supervisord/*.conf - -[program:dbus] -environment=HOME="/root",USER="root" -command=/usr/bin/dbus -autorestart=true -priority=100 -user=root -stdout_logfile=/var/log/neko/dbus.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 -redirect_stderr=true - -[program:x-server] -environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s" -command=/usr/bin/X -config /etc/neko/xorg.conf %(ENV_DISPLAY)s -autorestart=true -priority=300 -user=%(ENV_USER)s -stdout_logfile=/var/log/neko/xorg.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 -redirect_stderr=true - -[program:pulseaudio] -environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" -command=/usr/bin/pulseaudio --disallow-module-loading -vvvv --disallow-exit --exit-idle-time=-1 -autorestart=true -priority=300 -user=%(ENV_USER)s -stdout_logfile=/var/log/neko/pulseaudio.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/.docker/files/xorg.conf b/.docker/files/xorg.conf deleted file mode 100644 index c803041c..00000000 --- a/.docker/files/xorg.conf +++ /dev/null @@ -1,88 +0,0 @@ -# This xorg configuration file is meant to be used by xpra -# to start a dummy X11 server. -# For details, please see: -# https://xpra.org/trac/wiki/Xdummy - -Section "ServerFlags" - Option "DontVTSwitch" "true" - Option "AllowMouseOpenFail" "true" - Option "PciForceNone" "true" - Option "AutoEnableDevices" "false" - Option "AutoAddDevices" "false" -EndSection - -Section "InputDevice" - Identifier "dummy_mouse" - Option "CorePointer" "true" - Driver "void" -EndSection - -Section "InputDevice" - Identifier "dummy_keyboard" - Option "CoreKeyboard" "true" - Driver "void" -EndSection - -Section "Device" - Identifier "dummy_videocard" - Driver "dummy" - Option "ConstantDPI" "true" - #VideoRam 4096000 - #VideoRam 256000 - VideoRam 192000 -EndSection - -Section "Monitor" - Identifier "dummy_monitor" - HorizSync 5.0 - 1000.0 - VertRefresh 5.0 - 200.0 - #This can be used to get a specific DPI, but only for the default resolution: - #DisplaySize 508 317 - #NOTE: the highest modes will not work without increasing the VideoRam - # for the dummy video card. - # https://arachnoid.com/modelines/ - - # 1280x720 @ 30.00 Hz (GTF) hsync: 21.99 kHz; pclk: 33.78 MHz - Modeline "1280x720_30.00" 33.78 1280 1288 1408 1536 720 721 724 733 -HSync +Vsync - - # 1280x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 74.48 MHz - Modeline "1280x720_60.00" 74.48 1280 1336 1472 1664 720 721 724 746 -HSync +Vsync - # 1152x648 @ 60.00 Hz (GTF) hsync: 40.26 kHz; pclk: 59.91 MHz - Modeline "1152x648_60.00" 59.91 1152 1200 1320 1488 648 649 652 671 -HSync +Vsync - # 1024x576 @ 60.00 Hz (GTF) hsync: 35.82 kHz; pclk: 47.00 MHz - Modeline "1024x576_60.00" 47.00 1024 1064 1168 1312 576 577 580 597 -HSync +Vsync - # 960x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 55.86 MHz - Modeline "960x720_60.00" 55.86 960 1008 1104 1248 720 721 724 746 -HSync +Vsync - # 800x600 @ 60.00 Hz (GTF) hsync: 37.32 kHz; pclk: 38.22 MHz - Modeline "800x600_60.00" 38.22 800 832 912 1024 600 601 604 622 -HSync +Vsync - - # 1920x1080 @ 30.00 Hz (GTF) hsync: 32.97 kHz; pclk: 80.18 MHz - Modeline "1920x1080_30.00" 80.18 1920 1984 2176 2432 1080 1081 1084 1099 -HSync +Vsync - # 1152x648 @ 30.00 Hz (GTF) hsync: 19.80 kHz; pclk: 26.93 MHz - Modeline "1152x648_30.00" 26.93 1152 1144 1256 1360 648 649 652 660 -HSync +Vsync - # 1024x576 @ 30.00 Hz (GTF) hsync: 17.61 kHz; pclk: 20.85 MHz - Modeline "1024x576_30.00" 20.85 1024 1008 1104 1184 576 577 580 587 -HSync +Vsync - # 960x720 @ 30.00 Hz (GTF) hsync: 21.99 kHz; pclk: 25.33 MHz - Modeline "960x720_30.00" 25.33 960 960 1056 1152 720 721 724 733 -HSync +Vsync - # 800x600 @ 30.00 Hz (GTF) hsync: 18.33 kHz; pclk: 17.01 MHz - Modeline "800x600_30.00" 17.01 800 792 864 928 600 601 604 611 -HSync +Vsync -EndSection - -Section "Screen" - Identifier "dummy_screen" - Device "dummy_videocard" - Monitor "dummy_monitor" - DefaultDepth 24 - SubSection "Display" - Viewport 0 0 - Depth 24 - Modes "1280x720_30.00" "1920x1080_60.00" "1280x720_60.00" "1152x648_60.00" "1024x576_60.00" "960x720_60.00" "800x600_60.00" "1920x1080_30.00" "1152x648_30.00" "1024x576_30.00" "960x720_30.00" "800x600_30.00" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "dummy_layout" - Screen "dummy_screen" - InputDevice "dummy_mouse" - InputDevice "dummy_keyboard" -EndSection \ No newline at end of file From b2348e083559164a6607ad1fd5f48ef7f66a9c85 Mon Sep 17 00:00:00 2001 From: Craig Date: Tue, 21 Apr 2020 20:01:21 +0000 Subject: [PATCH 10/10] update build script --- .docker/build | 75 +++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/.docker/build b/.docker/build index 732c4c4d..067b09a1 100755 --- a/.docker/build +++ b/.docker/build @@ -40,62 +40,67 @@ build_gst() { done' } -build_dev() { - set -eux; \ - sudo docker build -f files/dev/Dockerfile -t nurdism/neko:dev $DIR ; \ - sudo docker push nurdism/neko:dev; -} - -build_deps() { - set -eux; \ - sudo docker build -f files/deps/Dockerfile -t nurdism/neko:deps $DIR ; \ - sudo docker push nurdism/neko:deps; -} - build_base() { set -eux; \ cd $DIR/server; go get -v -t -d . ; ./build; \ cd $DIR/client; npm install; npm run build; \ - cd $DIR; sudo docker build -f .docker/files/base/Dockerfile -t nurdism/neko:base $DIR ; + cd $DIR; sudo docker build -f .docker/files/base/Dockerfile -t nurdism/neko:base . ; } -build_firefox() { +build_latest() { set -eux; \ - sudo docker build -f files/firefox/Dockerfile -t nurdism/neko:firefox -t nurdism/neko:latest $DIR ; + cd $DIR; sudo docker build -f .docker/files/$1/Dockerfile -t nurdism/neko:latest . ; } -build_chromium() { +build_image() { set -eux; \ - sudo docker build -f files/chromium/Dockerfile -t nurdism/neko:chromium $DIR ; + cd $DIR; sudo docker build -f .docker/files/$1/Dockerfile -t nurdism/neko:$1 . ; } -build_docker() { +build() { if [ ! -d /gst/local ]; then build_gst fi - set -eux; \ - build_base; \ - build_firefox; \ - build_chromium; \ - sudo docker images nurdism/neko + if [ $1 != "" ]; then + build_image $1 + else + set -eux; \ + build_image "deps"; \ + build_image "base"; \ + build_base; \ + build_image "openbox"; \ + build_image "xfce4"; \ + build_image "jwm"; \ + build_image "firefox"; \ + build_image "chromium"; + fi + + sudo docker images nurdism/neko } -build_push() { - sudo docker push nurdism/neko:base - sudo docker push nurdism/neko:latest - sudo docker push nurdism/neko:firefox - sudo docker push nurdism/neko:chromium +push() { + if [ $1 != "" ]; then + sudo docker push nurdism/neko:$1 + else + sudo docker push nurdism/neko:deps + sudo docker push nurdism/neko:base + sudo docker push nurdism/neko:openbox + sudo docker push nurdism/neko:xfce4 + sudo docker push nurdism/neko:jwm + sudo docker push nurdism/neko:firefox + sudo docker push nurdism/neko:chromium + fi } -set -ex - case $1 in - push) build_push ;; - docker) build_docker ;; - base) build_base ;; - deps) build_deps ;; - dev) build_dev ;; + images) build;; + image) build $2 ;; + push) push $2 ;; + latest) build_latest ;; + base) build_image "base" ;; + deps) build_image "deps" ;; + dev) build_image "dev" ;; gst) build_gst ;; *) build_docker ;; esac