diff --git a/.docker/build b/.docker/build index 1766faad..74dab774 100755 --- a/.docker/build +++ b/.docker/build @@ -55,7 +55,7 @@ build_firefox() { build_chromium() { set -eux; \ cd $DIR/.docker/files/chromium; \ - sudo docker build -f Dockerfile -t nurdism/neko:chromium -t nurdism/neko:latest . ; + sudo docker build -f Dockerfile -t nurdism/neko:chromium . ; } build_docker() { @@ -77,6 +77,8 @@ build_push() { sudo docker push nurdism/neko:chromium } +set -ex + case $1 in push) build_push ;; docker) build_docker ;; diff --git a/.docker/files/chromium/Dockerfile b/.docker/files/chromium/Dockerfile index 100e073a..47fefb19 100644 --- a/.docker/files/chromium/Dockerfile +++ b/.docker/files/chromium/Dockerfile @@ -14,7 +14,6 @@ RUN set -eux; apt-get update; \ # # clean up apt-get --purge autoremove -y unzip; \ - apt-get autoremove -y; \ apt-get clean -y; \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* diff --git a/.docker/files/chromium/policies.json b/.docker/files/chromium/policies.json index 58632e27..8ac6543c 100644 --- a/.docker/files/chromium/policies.json +++ b/.docker/files/chromium/policies.json @@ -25,12 +25,14 @@ "chrome://policy" ], "ExtensionInstallWhitelist": [ - "cjpalhdlnbpafiamejdnhcphjbkeiagm" + "cjpalhdlnbpafiamejdnhcphjbkeiagm", + "fjoaledfpmneenckfbpdfhkmimnjocfa" ], "ExtensionInstallBlacklist": [ "*" ], "ExtensionInstallForcelist": [ - "cjpalhdlnbpafiamejdnhcphjbkeiagm" + "cjpalhdlnbpafiamejdnhcphjbkeiagm", + "fjoaledfpmneenckfbpdfhkmimnjocfa" ] } \ No newline at end of file diff --git a/.docker/files/firefox/Dockerfile b/.docker/files/firefox/Dockerfile index 0b9f29a7..7c7e3612 100644 --- a/.docker/files/firefox/Dockerfile +++ b/.docker/files/firefox/Dockerfile @@ -11,7 +11,6 @@ RUN set -eux; apt-get update; \ wget -O /usr/lib/firefox-esr/distribution/extensions/nordvpnproxy@nordvpn.com.xpi https://addons.mozilla.org/firefox/downloads/latest/nordvpn-proxy-extension/latest.xpi; \ # # clean up - apt-get autoremove -y; \ apt-get clean -y; \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* diff --git a/.docker/files/jwm.xml b/.docker/files/jwm.xml new file mode 100644 index 00000000..d8a17960 --- /dev/null +++ b/.docker/files/jwm.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/test b/.docker/test index d4256777..753fbefa 100755 --- a/.docker/test +++ b/.docker/test @@ -13,7 +13,7 @@ export SCREEN_HEIGHT=720 export SCREEN_DEPTH=24 export DISPLAY=:99.0 -set -eux +set -ex # # create log folders diff --git a/server/.env.development b/server/.env.development index d3240ed1..b5884926 100644 --- a/server/.env.development +++ b/server/.env.development @@ -1 +1,2 @@ DISPLAY=:99.0 +PION_LOG_TRACE=all diff --git a/server/internal/gst/gst.go b/server/internal/gst/gst.go index 76cdb0c6..83038665 100644 --- a/server/internal/gst/gst.go +++ b/server/internal/gst/gst.go @@ -72,7 +72,7 @@ func CreatePipeline(codecName string, pipelineSrc string) (*Pipeline, error) { // https://gstreamer.freedesktop.org/documentation/vpx/vp8enc.html?gi-language=c // gstreamer1.0-plugins-good // vp8enc error-resilient=partitions keyframe-max-dist=10 auto-alt-ref=true cpu-used=5 deadline=1 - pipelineStr = pipelineSrc + " ! vp8enc error-resilient=partitions keyframe-max-dist=10 auto-alt-ref=true cpu-used=5 deadline=1 ! " + pipelineStr + pipelineStr = pipelineSrc + " ! vp8enc cpu-used=8 threads=2 deadline=1 error-resilient=partitions keyframe-max-dist=10 auto-alt-ref=true ! " + pipelineStr clockRate = videoClockRate if err := CheckPlugins([]string{"ximagesrc", "vpx"}); err != nil {