From bbcccea4f0e2ca9aa2df9e39f07a309e5c7588c3 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Thu, 23 May 2024 08:45:05 -0400
Subject: [PATCH] pull out env vars on alpine

---
 Dockerfile               | 2 +-
 Dockerfile.aarch64       | 2 +-
 README.md                | 1 +
 readme-vars.yml          | 1 +
 root/defaults/startwm.sh | 3 +++
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index be30e2c9..0e6bc328 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine319
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine320
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 545625de..99b93730 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine319
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine320
 
 # set version label
 ARG BUILD_DATE
diff --git a/README.md b/README.md
index 2b20716c..4407d23b 100644
--- a/README.md
+++ b/README.md
@@ -394,6 +394,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **23.05.24:** - Rebase Alpine to 3.20.
 * **22.04.24:** - Rebase Ubuntu to Noble.
 * **16.04.24:** - Add docs on PRoot Apps.
 * **14.04.24:** - Rebase Fedora to 40.
diff --git a/readme-vars.yml b/readme-vars.yml
index 59db04d8..16f2fe99 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -146,6 +146,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "23.05.24:", desc: "Rebase Alpine to 3.20." }
   - { date: "22.04.24:", desc: "Rebase Ubuntu to Noble." }
   - { date: "16.04.24:", desc: "Add docs on PRoot Apps." }
   - { date: "14.04.24:", desc: "Rebase Fedora to 40." }
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index f9b074c1..38f0246c 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,8 +1,11 @@
 #!/bin/bash
 
+# Disable compositing
 if [ -f "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml ]; then
   sed -i \
     '/use_compositing/c <property name="use_compositing" type="bool" value="false"/>' \
     "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
 fi
+
+# Start DE
 /usr/bin/xfce4-session > /dev/null 2>&1