From 8c5e0a365265141150cfe05e3a43be956a356b1f Mon Sep 17 00:00:00 2001
From: j1nx
Date: Sat, 4 Nov 2023 10:52:58 +0000
Subject: [PATCH] [ALL] Changes for GUI podman quadlet
---
.../etc/containers/systemd/users/ovos_gui.container | 4 +++-
.../etc/containers/systemd/users/ovos_gui_files.volume | 4 ++++
.../etc/containers/systemd/users/ovos_gui_websocket.container | 1 +
3 files changed, 8 insertions(+), 1 deletion(-)
create mode 100644 buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui_files.volume
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui.container
index e4c5179b..3127d1cf 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui.container
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui.container
@@ -14,7 +14,7 @@ After=ovos_gui_websocker.service
[Container]
ContainerName=ovos_gui
-Image=docker.io/smartgic/ovos-gui:alpha
+Image=docker.io/smartgic/ovos-gui-shell:alpha
AutoUpdate=registry
LogDriver=journald
HostName=ovos_gui
@@ -22,6 +22,7 @@ Network=host
Timezone=local
UserNS=keep-id:uid=%U,gid=%G
Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus
+Environment=DISPLAY=:0
Environment=XDG_RUNTIME_DIR=%t
Environment=QT_QPA_PLATFORM=eglfs
Environment=QT_QPA_EGLFS_KMS_ATOMIC=1
@@ -41,6 +42,7 @@ Volume=/dev/shm:/tmp
Volume=%t/pipewire-0:/run/user/1000/pipewire-0:ro
Volume=%t/bus:/run/user/1000/bus:ro
Volume=%h/ovos/share:/home/ovos/.local/share/mycroft
+Volume=ovos_gui_files:/home/ovos/.cache/gui_files
[Service]
TimeoutStartSec=900
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui_files.volume b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui_files.volume
new file mode 100644
index 00000000..6de35e09
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui_files.volume
@@ -0,0 +1,4 @@
+[Volume]
+User=ovos
+Group=ovos
+Label=name=ovos_gui_files
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui_websocket.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui_websocket.container
index 95235156..97c77bb7 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui_websocket.container
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_gui_websocket.container
@@ -17,6 +17,7 @@ Timezone=local
UserNS=keep-id:uid=%U,gid=%G
Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro
Volume=/dev/shm:/tmp
+Volume=ovos_gui_files:/home/ovos/.cache/ovos_gui_file_server
[Service]
TimeoutStartSec=900