From 43c15dacd31559f8b83374860f604613b94ecdb5 Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 10 Jun 2026 10:36:32 -0400 Subject: [PATCH] rebase to 3.24 xfce --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- README.md | 3 ++- readme-vars.yml | 3 ++- root/defaults/startwm_wayland.sh | 4 +--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index b13989692..4451e2922 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-selkies:alpine323 +FROM ghcr.io/linuxserver/baseimage-selkies:alpine324 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 87f40b4e3..3a173745c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-alpine323 +FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-alpine324 # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index 6e5540274..2080d2e52 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ This image provides various versions that are available via tags. Please read th | Tag | Available | Description | | :----: | :----: |--- | -| latest | ✅ | XFCE Alpine | +| latest | ✅ | XFCE Alpine *Wayland Support | | alpine-i3 | ✅ | i3 Alpine *Wayland Support | | alpine-kde | ✅ | KDE Alpine *Wayland Only | | alpine-mate | ✅ | MATE Alpine | @@ -670,6 +670,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **10.06.26:** - Rebase Alpine images to 3.24. * **07.05.26:** - Deprecate Enterprise Linux tags. * **07.04.26:** - Rebase Ubuntu images to Resolute. * **26.03.26:** - Rebase Fedora images to 44. diff --git a/readme-vars.yml b/readme-vars.yml index 87dacac5d..92d16268d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -15,7 +15,7 @@ available_architectures: # development version development_versions: true development_versions_items: - - {tag: "latest", desc: "XFCE Alpine"} + - {tag: "latest", desc: "XFCE Alpine *Wayland Support"} - {tag: "alpine-i3", desc: "i3 Alpine *Wayland Support"} - {tag: "alpine-kde", desc: "KDE Alpine *Wayland Only"} - {tag: "alpine-mate", desc: "MATE Alpine"} @@ -123,6 +123,7 @@ init_diagram: | "webtop:latest" <- Base Images # changelog changelogs: + - {date: "10.06.26:", desc: "Rebase Alpine images to 3.24."} - {date: "07.05.26:", desc: "Deprecate Enterprise Linux tags."} - {date: "07.04.26:", desc: "Rebase Ubuntu images to Resolute."} - {date: "26.03.26:", desc: "Rebase Fedora images to 44."} diff --git a/root/defaults/startwm_wayland.sh b/root/defaults/startwm_wayland.sh index 846e806b5..487ca2da1 100755 --- a/root/defaults/startwm_wayland.sh +++ b/root/defaults/startwm_wayland.sh @@ -7,6 +7,4 @@ if [ ! -d "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml ]; then fi # Start DE -WAYLAND_DISPLAY=wayland-1 Xwayland :1 & -sleep 2 -exec dbus-launch --exit-with-session /usr/bin/xfce4-session > /dev/null 2>&1 +WAYLAND_DISPLAY=wayland-1 startxfce4 --wayland > /dev/null 2>&1