Merge pull request #4 from linuxserver/wayland-default

make wayland default

Author: thelamer

Dockerfile

@@ -10,7 +10,9 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"
 
 # title
-ENV TITLE=Joplin
+ENV TITLE=Joplin \
+    NO_GAMEPAD=true \
+    PIXELFLUX_WAYLAND=true
 
 RUN \
   echo "**** add icon ****" && \
@@ -28,6 +30,9 @@ RUN \
     "https://github.com/laurent22/joplin/releases/download/${JOPLIN_VERSION}/Joplin-$(echo ${JOPLIN_VERSION}| sed 's/^v//g').deb" && \
   apt-get install -y \
     /tmp/joplin.deb && \
+  mv \
+    /usr/bin/joplin \
+    /usr/bin/joplin-real && \
   echo "**** cleanup ****" && \
   apt-get autoclean && \
   rm -rf \

README.md

@@ -612,6 +612,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **03.04.26:** - Make Wayland default disable with PIXELFLUX_WAYLAND=false.
 * **21.03.26:** - Use Wayland ozone platform fixes scaling and acceleration.
 * **28.12.25:** - Add Wayland init logic.
 * **19.08.25:** - Initial release.

readme-vars.yml

@@ -106,6 +106,7 @@ init_diagram: |
   "joplin:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "03.04.26:", desc: "Make Wayland default disable with PIXELFLUX_WAYLAND=false."}
   - {date: "21.03.26:", desc: "Use Wayland ozone platform fixes scaling and acceleration."}
   - {date: "28.12.25:", desc: "Add Wayland init logic."}
   - {date: "19.08.25:", desc: "Initial release."}

root/defaults/autostart

@@ -1 +1 @@
-joplin --no-sandbox
+joplin

root/defaults/autostart_wayland

@@ -1 +1 @@
-joplin --ozone-platform=wayland --no-sandbox
+joplin

root/usr/bin/joplin

@@ -0,0 +1,12 @@
+#! /bin/bash
+
+BIN=/usr/bin/joplin-real
+
+# Wayland check
+if ls -l /dev/dri/* > /dev/null 2>&1; then
+  if pgrep labwc > /dev/null 2>&1; then
+    WAYLAND="--ozone-platform=wayland"
+  fi
+fi
+
+${BIN} ${WAYLAND} --no-sandbox "$@"