pull out env vars on alpine (#248)

This commit is contained in:
Ryan Kuba 2024-05-23 15:14:54 +00:00 committed by GitHub
parent 8423e7141a
commit 1c1cf9a66d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 2 deletions

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine319 FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine320
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine319 FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine320
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE

View File

@ -394,6 +394,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **23.05.24:** - Rebase Alpine to 3.20.
* **22.04.24:** - Rebase Ubuntu to Noble. * **22.04.24:** - Rebase Ubuntu to Noble.
* **16.04.24:** - Add docs on PRoot Apps. * **16.04.24:** - Add docs on PRoot Apps.
* **14.04.24:** - Rebase Fedora to 40. * **14.04.24:** - Rebase Fedora to 40.

View File

@ -146,6 +146,7 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: "23.05.24:", desc: "Rebase Alpine to 3.20." }
- { date: "22.04.24:", desc: "Rebase Ubuntu to Noble." } - { date: "22.04.24:", desc: "Rebase Ubuntu to Noble." }
- { date: "16.04.24:", desc: "Add docs on PRoot Apps." } - { date: "16.04.24:", desc: "Add docs on PRoot Apps." }
- { date: "14.04.24:", desc: "Rebase Fedora to 40." } - { date: "14.04.24:", desc: "Rebase Fedora to 40." }

View File

@ -1,8 +1,11 @@
#!/bin/bash #!/bin/bash
# Disable compositing
if [ -f "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml ]; then if [ -f "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml ]; then
sed -i \ sed -i \
'/use_compositing/c <property name="use_compositing" type="bool" value="false"/>' \ '/use_compositing/c <property name="use_compositing" type="bool" value="false"/>' \
"${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
fi fi
# Start DE
/usr/bin/xfce4-session > /dev/null 2>&1 /usr/bin/xfce4-session > /dev/null 2>&1