Merge pull request #86 from linuxserver/s6v3-master

.github/workflows/external_trigger.yml

@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_WEBTOP_MASTER\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
             && awk '/^P:'"xfce4"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/rdesktop-web:alpine
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:3.16
 
 # set version label
 ARG BUILD_DATE
@@ -14,7 +14,7 @@ RUN \
     faenza-icon-theme \
     faenza-icon-theme-xfce4-appfinder \
     faenza-icon-theme-xfce4-panel \
-    firefox-esr \
+    firefox \
     mousepad \
     thunar \
     xfce4 \
@@ -30,4 +30,5 @@ COPY /root /
 
 # ports and volumes
 EXPOSE 3000
+
 VOLUME /config

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM lsiobase/rdesktop-web:arm64v8-alpine
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -14,7 +14,7 @@ RUN \
     faenza-icon-theme \
     faenza-icon-theme-xfce4-appfinder \
     faenza-icon-theme-xfce4-panel \
-    firefox-esr \
+    firefox \
     mousepad \
     thunar \
     xfce4 \
@@ -30,4 +30,5 @@ COPY /root /
 
 # ports and volumes
 EXPOSE 3000
+
 VOLUME /config

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM lsiobase/rdesktop-web:arm32v7-alpine
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -14,7 +14,7 @@ RUN \
     faenza-icon-theme \
     faenza-icon-theme-xfce4-appfinder \
     faenza-icon-theme-xfce4-panel \
-    firefox-esr \
+    firefox \
     mousepad \
     thunar \
     xfce4 \
@@ -30,4 +30,5 @@ COPY /root /
 
 # ports and volumes
 EXPOSE 3000
+
 VOLUME /config

Jenkinsfile

@@ -25,8 +25,8 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/webtop'
     PR_DOCKERHUB_IMAGE = 'lspipepr/webtop'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.14'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/community/'
+    DIST_TAG = '3.16'
+    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/community/'
     DIST_REPO_PACKAGES = 'xfce4'
     MULTIARCH = 'true'
     CI = 'true'

README.md

@@ -226,7 +226,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-v /var/run/docker.sock` | Docker Socket on the system, if you want to use Docker in the container |
 | `--device /dev/dri` | Add this for GL support (Linux hosts only) |
 | `--shm-size=` | We set this to 1 gig to prevent modern web browsers from crashing |
-| `--security-opt seccomp=unconfined` | For Docker Engine only, many modern gui apps need this to function as syscalls are unkown to Docker. |
+| `--security-opt seccomp=unconfined` | For Docker Engine only, many modern gui apps need this to function on older hosts as syscalls are unknown to Docker. |
 
 ## Environment variables from files (Docker secrets)
 
@@ -337,6 +337,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **21.10.22:** - Rebase xfce to Alpine 3.16, migrate to s6v3.
 * **12.03.22:** - Add documentation for mounting in a GPU.
 * **05.02.22:** - Rebase KDE Ubuntu to Jammy, add new documentation for updated gclient, stop recommending priv mode.
 * **21.09.21:** - Add Fedora and Arch images, show seccomp settings in readme.

jenkins-vars.yml

@@ -15,8 +15,8 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/webtop'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/webtop'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.14'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/community/'
+  - DIST_TAG = '3.16'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/community/'
   - DIST_REPO_PACKAGES = 'xfce4'
   - MULTIARCH = 'true'
   - CI = 'true'

readme-vars.yml

@@ -2,7 +2,7 @@
 
 # project information
 project_name: webtop
-project_url: "https://github.com/linuxserver/gclient"
+project_url: "https://github.com/linuxserver/docker-webtop"
 project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png"
 project_blurb: |
   [{{ project_name|capitalize }}]({{ project_url }}) - Alpine, Ubuntu, Fedora, and Arch based containers containing full desktop environments in officially supported flavors accessible via any modern web browser.
@@ -66,7 +66,7 @@ opt_custom_params:
   - { name: "shm-size", name_compose: "shm_size", value: "1gb",desc: "We set this to 1 gig to prevent modern web browsers from crashing" }
 opt_security_opt_param: true
 opt_security_opt_param_vars:
-  - { run_var: "seccomp=unconfined", compose_var: "seccomp:unconfined", desc: "For Docker Engine only, many modern gui apps need this to function as syscalls are unkown to Docker." }
+  - { run_var: "seccomp=unconfined", compose_var: "seccomp:unconfined", desc: "For Docker Engine only, many modern gui apps need this to function on older hosts as syscalls are unknown to Docker." }
 opt_param_device_map: true
 opt_param_devices:
   - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "Add this for GL support (Linux hosts only)" }
@@ -140,6 +140,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "21.10.22:", desc: "Rebase xfce to Alpine 3.16, migrate to s6v3." }
   - { date: "12.03.22:", desc: "Add documentation for mounting in a GPU." }
   - { date: "05.02.22:", desc: "Rebase KDE Ubuntu to Jammy, add new documentation for updated gclient, stop recommending priv mode." }
   - { date: "21.09.21:", desc: "Add Fedora and Arch images, show seccomp settings in readme." }