Skip to content

Commit 25329c4

Browse files
thelamerthelamer
authored
Ubuntu xfce resolute (#406)
* rebase xfce-ubuntu to resolute * use proper header
1 parent 5190218 commit 25329c4

4 files changed

Lines changed: 21 additions & 24 deletions

File tree

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble
1+
FROM ghcr.io/linuxserver/baseimage-selkies:ubunturesolute
22

33
# set version label
44
ARG BUILD_DATE

‎Dockerfile.aarch64‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-ubuntunoble
1+
FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-ubunturesolute
22

33
# set version label
44
ARG BUILD_DATE

‎package_versions.txt‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ dirmngr 2.
7676
distro 1.9.0 python
7777
distro-info-data 0.60ubuntu0.5 deb
7878
dnspython 2.8.0 python
79-
docker-buildx-plugin 0.33.0-1~ubuntu.24.04~noble deb
80-
docker-ce 5:29.3.1-1~ubuntu.24.04~noble deb
81-
docker-ce-cli 5:29.3.1-1~ubuntu.24.04~noble deb
79+
docker-buildx-plugin 0.31.1-1~ubuntu.24.04~noble deb
80+
docker-ce 5:29.3.0-1~ubuntu.24.04~noble deb
81+
docker-ce-cli 5:29.3.0-1~ubuntu.24.04~noble deb
8282
docker-compose-plugin 5.1.1-1~ubuntu.24.04~noble deb
8383
dpkg 1.22.6ubuntu6.5 deb
8484
dunst 1.9.2-1build2 deb
@@ -188,8 +188,8 @@ github.com/containerd/cgroups/v3 v3
188188
github.com/containerd/cgroups/v3 v3.1.3 go-module
189189
github.com/containerd/console v1.0.5 go-module (+6 duplicates)
190190
github.com/containerd/containerd/api v1.10.0 go-module (+5 duplicates)
191-
github.com/containerd/containerd/v2 v2.2.1 go-module
192-
github.com/containerd/containerd/v2 v2.2.2 go-module (+4 duplicates)
191+
github.com/containerd/containerd/v2 v2.2.1 go-module (+1 duplicate)
192+
github.com/containerd/containerd/v2 v2.2.2 go-module (+3 duplicates)
193193
github.com/containerd/continuity v0.4.5 go-module (+5 duplicates)
194194
github.com/containerd/errdefs v1.0.0 go-module (+5 duplicates)
195195
github.com/containerd/errdefs/pkg v0.3.0 go-module (+5 duplicates)
@@ -381,11 +381,13 @@ github.com/moby/docker-image-spec v1
381381
github.com/moby/go-archive v0.2.0 go-module (+2 duplicates)
382382
github.com/moby/ipvs v1.1.0 go-module
383383
github.com/moby/locker v1.0.1 go-module (+4 duplicates)
384-
github.com/moby/moby/api v1.54.0 go-module (+2 duplicates)
385-
github.com/moby/moby/client v0.3.0 go-module (+1 duplicate)
386-
github.com/moby/moby/v2 v29.3.1 go-module (+1 duplicate)
387-
github.com/moby/patternmatcher v0.6.0 go-module
388-
github.com/moby/patternmatcher v0.6.1 go-module (+1 duplicate)
384+
github.com/moby/moby/api v1.52.0 go-module
385+
github.com/moby/moby/api v1.54.0 go-module (+1 duplicate)
386+
github.com/moby/moby/client v0.2.1 go-module
387+
github.com/moby/moby/client v0.3.0 go-module
388+
github.com/moby/moby/v2 v29.3.0 go-module (+1 duplicate)
389+
github.com/moby/patternmatcher v0.6.0 go-module (+2 duplicates)
390+
github.com/moby/policy-helpers v0.0.0-20251206004813-9fcc1a9ec5c9 go-module
389391
github.com/moby/policy-helpers v0.0.0-20260211190020-824747bfdd3c go-module
390392
github.com/moby/policy-helpers v0.0.0-20260324161837-b7c0b994300b go-module
391393
github.com/moby/profiles/apparmor v0.1.0 go-module
@@ -572,8 +574,9 @@ golang.org/x/sync v0
572574
golang.org/x/sync v0.20.0 go-module
573575
golang.org/x/sys v0.30.0 go-module
574576
golang.org/x/sys v0.38.0 go-module (+2 duplicates)
577+
golang.org/x/sys v0.39.0 go-module
575578
golang.org/x/sys v0.41.0 go-module (+1 duplicate)
576-
golang.org/x/sys v0.42.0 go-module (+1 duplicate)
579+
golang.org/x/sys v0.42.0 go-module
577580
golang.org/x/term v0.37.0 go-module
578581
golang.org/x/term v0.38.0 go-module
579582
golang.org/x/term v0.40.0 go-module
@@ -1220,7 +1223,9 @@ sigs.k8s.io/yaml v1
12201223
six 1.16.0 python
12211224
software-properties-common 0.99.49.4 deb
12221225
ssl-cert 1.1.2ubuntu1 deb
1223-
stdlib go1.25.8 go-module (+8 duplicates)
1226+
stdlib go1.25.6 go-module
1227+
stdlib go1.25.7 go-module (+2 duplicates)
1228+
stdlib go1.25.8 go-module (+4 duplicates)
12241229
stterm 0.9-1 deb
12251230
sudo 1.9.15p5-3ubuntu5.24.04.2 deb
12261231
systemd 255.4-1ubuntu8.14 deb

‎root/defaults/startwm_wayland.sh‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
#!/bin/bash
2-
3-
# Default settings
4-
if [ ! -d "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml ]; then
5-
mkdir -p "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml
6-
cp /defaults/xfce/* "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/
7-
fi
1+
#!/usr/bin/with-contenv bash
82

93
# Start DE
10-
WAYLAND_DISPLAY=wayland-1 Xwayland :1 &
11-
sleep 2
12-
exec dbus-launch --exit-with-session /usr/bin/xfce4-session > /dev/null 2>&1
4+
WAYLAND_DISPLAY=wayland-1 startxfce4 --wayland > /dev/null 2>&1

0 commit comments

Comments
 (0)