From 974ccd2993905c0ee1b4ad0d137a51e786055198 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 21 Oct 2022 10:13:56 +0100 Subject: [PATCH 1/3] Migrate to s6v3 --- .github/workflows/external_trigger.yml | 2 +- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- Dockerfile.armhf | 3 ++- Jenkinsfile | 4 ++-- README.md | 3 ++- jenkins-vars.yml | 4 ++-- readme-vars.yml | 3 ++- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 9b209c29..0f27ef9e 100644 --- a/.github/workflows/external_trigger.yml +++ b/.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 ****" diff --git a/Dockerfile b/Dockerfile index 0515fc06..ce40e9ba 100644 --- a/Dockerfile +++ b/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 @@ -30,4 +30,5 @@ COPY /root / # ports and volumes EXPOSE 3000 + VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 439ac8bc..407137b2 100644 --- a/Dockerfile.aarch64 +++ b/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 @@ -30,4 +30,5 @@ COPY /root / # ports and volumes EXPOSE 3000 + VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 276d8de7..7f8b00e9 100644 --- a/Dockerfile.armhf +++ b/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 @@ -30,4 +30,5 @@ COPY /root / # ports and volumes EXPOSE 3000 + VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile index 8c0aad55..12c03ed3 100644 --- a/Jenkinsfile +++ b/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' diff --git a/README.md b/README.md index 568d76e1..d7c12853 100644 --- a/README.md +++ b/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. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 2b74aef3..06507d1b 100644 --- a/jenkins-vars.yml +++ b/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' diff --git a/readme-vars.yml b/readme-vars.yml index 797e4d0b..b3f605f8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -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." } From 2afcfd413883223a88907c725fa4e88bb5d4c799 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 21 Oct 2022 10:18:27 +0100 Subject: [PATCH 2/3] Update project URL --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index b3f605f8..037855e2 100644 --- a/readme-vars.yml +++ b/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. From 80fa09ee6fe7d5dd31cd1a20e552a724c274c70d Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 21 Oct 2022 10:18:43 +0100 Subject: [PATCH 3/3] Don't use ESR package for firefox --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ce40e9ba..fbde5f65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN \ faenza-icon-theme \ faenza-icon-theme-xfce4-appfinder \ faenza-icon-theme-xfce4-panel \ - firefox-esr \ + firefox \ mousepad \ thunar \ xfce4 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 407137b2..68fa70f9 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -14,7 +14,7 @@ RUN \ faenza-icon-theme \ faenza-icon-theme-xfce4-appfinder \ faenza-icon-theme-xfce4-panel \ - firefox-esr \ + firefox \ mousepad \ thunar \ xfce4 \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7f8b00e9..0259f384 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -14,7 +14,7 @@ RUN \ faenza-icon-theme \ faenza-icon-theme-xfce4-appfinder \ faenza-icon-theme-xfce4-panel \ - firefox-esr \ + firefox \ mousepad \ thunar \ xfce4 \