From 915d050109933632e67b97773173e2ba25944e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 18 Mar 2022 23:14:08 +0100 Subject: [PATCH] remove vncviewer. --- .docker/vncviewer/Dockerfile | 18 - .docker/vncviewer/openbox.xml | 763 ----------------------------- .docker/vncviewer/supervisord.conf | 22 - .github/workflows/build.yml | 2 +- .github/workflows/tags.yml | 2 - docs/changelog.md | 1 + docs/getting-started/README.md | 1 - 7 files changed, 2 insertions(+), 807 deletions(-) delete mode 100644 .docker/vncviewer/Dockerfile delete mode 100644 .docker/vncviewer/openbox.xml delete mode 100644 .docker/vncviewer/supervisord.conf diff --git a/.docker/vncviewer/Dockerfile b/.docker/vncviewer/Dockerfile deleted file mode 100644 index e630387..0000000 --- a/.docker/vncviewer/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -ARG BASE_IMAGE=m1k1o/neko:base -FROM $BASE_IMAGE - -# -# install vncviewer -RUN set -eux; apt-get update; \ - apt-get install -y --no-install-recommends openbox xtightvncviewer; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* - -ENV NEKO_VNC_URL="" - -# -# copy configuation files -COPY supervisord.conf /etc/neko/supervisord/vncviewer.conf -COPY openbox.xml /etc/neko/openbox.xml diff --git a/.docker/vncviewer/openbox.xml b/.docker/vncviewer/openbox.xml deleted file mode 100644 index 7b5f0ec..0000000 --- a/.docker/vncviewer/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/.docker/vncviewer/supervisord.conf b/.docker/vncviewer/supervisord.conf deleted file mode 100644 index 9032cb0..0000000 --- a/.docker/vncviewer/supervisord.conf +++ /dev/null @@ -1,22 +0,0 @@ -[program:vncviewer] -environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" -command=/usr/bin/vncviewer -autopass -x11cursor -nojpeg -quality 9 -compresslevel 9 %(ENV_NEKO_VNC_URL)s -stopsignal=INT -autorestart=true -priority=800 -user=%(ENV_USER)s -stdout_logfile=/var/log/neko/vncviewer.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/.github/workflows/build.yml b/.github/workflows/build.yml index 0fa58f1..0940a63 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: needs: [ build-base ] strategy: matrix: - tags: [ firefox, chromium, google-chrome, ungoogled-chromium, microsoft-edge, brave, tor-browser, vncviewer, remmina, vlc, xfce ] + tags: [ firefox, chromium, google-chrome, ungoogled-chromium, microsoft-edge, brave, tor-browser, remmina, vlc, xfce ] env: DOCKER_TAG: ${{ matrix.tags }} steps: diff --git a/.github/workflows/tags.yml b/.github/workflows/tags.yml index 45d62b5..6223f30 100644 --- a/.github/workflows/tags.yml +++ b/.github/workflows/tags.yml @@ -79,8 +79,6 @@ jobs: platforms: linux/amd64 - tag: tor-browser platforms: linux/amd64,linux/arm64 - - tag: vncviewer - platforms: linux/amd64,linux/arm64 - tag: remmina platforms: linux/amd64 - tag: vlc diff --git a/docs/changelog.md b/docs/changelog.md index f6b1007..ff2f547 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -18,6 +18,7 @@ - Added UDP and TCP mux for WebRTC connection. It should handle multiple peers. - Broadcast status change is sent to all admins now. - NordVPN replaced with Sponsorblock extension in default configuration #144. +- Removed `vncviewer` image, as its functionality is replaced and extended by remmina. ## [n.eko v2.5](https://github.com/m1k1o/neko/releases/tag/v2.5) diff --git a/docs/getting-started/README.md b/docs/getting-started/README.md index 4197d7b..38b0dd6 100644 --- a/docs/getting-started/README.md +++ b/docs/getting-started/README.md @@ -8,7 +8,6 @@ Use the following docker images: - `m1k1o/neko:microsoft-edge` - for Microsoft Edge (needs `--cap-add=SYS_ADMIN`, see the [security implications](https://www.redhat.com/en/blog/container-tidbits-adding-capabilities-container)). - `m1k1o/neko:brave` - for [Brave Browser](https://brave.com) (needs `--cap-add=SYS_ADMIN`, see the [security implications](https://www.redhat.com/en/blog/container-tidbits-adding-capabilities-container)). - `m1k1o/neko:tor-browser` - for Tor Browser. -- `m1k1o/neko:vncviewer` - for simple VNC viewer (specify `NEKO_VNC_URL` to your VNC target). - `m1k1o/neko:remmina` - for remote desktop connection (by @lowne). - Pass env var `REMMINA_URL=://[[:]@]server[:port]` (proto being `vnc`, `rdp` or `spice`). - Or create your custom configuration with remmina locally (it's saved in `~/.local/share/remmina/path_to_profile.remmina`) and bind-mount it, then pass env var `REMMINA_PROFILE=`.