From bf166be4192dbd882666c5d70953d3801174fcd2 Mon Sep 17 00:00:00 2001 From: j1nx Date: Wed, 30 Aug 2023 18:49:54 +0000 Subject: [PATCH] [ALL] Podman quadlets fixes and changes. --- .../etc/containers/systemd/users/ovos_audio.container | 6 +++--- .../etc/containers/systemd/users/ovos_cli.container | 1 + .../etc/containers/systemd/users/ovos_core.container | 3 +-- .../etc/containers/systemd/users/ovos_listener.container | 3 +-- .../etc/containers/systemd/users/ovos_messagebus.container | 1 + .../etc/containers/systemd/users/ovos_phal.container | 3 +-- .../etc/containers/systemd/users/ovos_phal_admin.container | 1 + .../etc/containers/systemd/users/ovos_tts_cache.volume | 4 ++++ 8 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_tts_cache.volume diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_audio.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_audio.container index b20346f7..effa784c 100644 --- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_audio.container +++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_audio.container @@ -14,15 +14,15 @@ LogDriver=journald HostName=ovos_audio Network=host Timezone=local +UserNS=keep-id:uid=%U,gid=%G Environment=PULSE_SERVER=unix:/run/user/1000/pulse/native -Environment=PULSE_COOKIE=/home/ovos/.config/pulse/cookie Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus AddDevice=/dev/snd Volume=%h/ovos/config:/home/ovos/.config/mycroft Volume=%h/ovos/tmp:/tmp/mycroft -Volume=%h/.config/pulse/cookie:/home/ovos/.config/pulse/cookie:ro Volume=%t/pulse:/run/user/1000/pulse:ro -Volume=%/bus:/run/user/1000/bus:ro +Volume=%t/bus:/run/user/1000/bus:ro +Volume=ovos_tts_cache:/home/ovos/.cache/mycroft [Service] TimeoutStartSec=900 diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_cli.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_cli.container index 4a491eaf..533f290b 100644 --- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_cli.container +++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_cli.container @@ -10,6 +10,7 @@ LogDriver=journald HostName=ovos_cli Network=host Timezone=local +UserNS=keep-id:uid=%U,gid=%G Volume=%h/ovos/config:/home/ovos/.config/mycroft Volume=%h/ovos/tmp:/tmp/mycroft diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_core.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_core.container index bba5de50..9becc5c9 100644 --- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_core.container +++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_core.container @@ -14,12 +14,11 @@ LogDriver=journald HostName=ovos_core Network=host Timezone=local +UserNS=keep-id:uid=%U,gid=%G Environment=PULSE_SERVER=unix:/run/user/1000/pulse/native -Environment=PULSE_COOKIE=/home/ovos/.config/pulse/cookie AddDevice=/dev/snd Volume=%h/ovos/config:/home/ovos/.config/mycroft Volume=%h/ovos/tmp:/tmp/mycroft -Volume=%h/.config/pulse/cookie:/home/ovos/.config/pulse/cookie:ro Volume=%t/pulse:/run/user/1000/pulse:ro Volume=ovos_nltk:/home/ovos/nltk_data Volume=%h/ovos/share:/home/ovos/.local/share/mycroft diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener.container index 06ebfb22..72a2ddfa 100644 --- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener.container +++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener.container @@ -14,12 +14,11 @@ LogDriver=journald HostName=ovos_listener Network=host Timezone=local +UserNS=keep-id:uid=%U,gid=%G Environment=PULSE_SERVER=unix:/run/user/1000/pulse/native -Environment=PULSE_COOKIE=/home/ovos/.config/pulse/cookie AddDevice=/dev/snd Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro Volume=%h/ovos/tmp:/tmp/mycroft -Volume=%h/.config/pulse/cookie:/home/ovos/.config/pulse/cookie:ro Volume=%t/pulse:/run/user/1000/pulse:ro Volume=ovos_listener_records:/home/ovos/.local/share/mycroft/listener Volume=ovos_models:/home/ovos/.local/share/precise-lite diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_messagebus.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_messagebus.container index 3e0f77cb..0c11231e 100644 --- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_messagebus.container +++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_messagebus.container @@ -10,6 +10,7 @@ LogDriver=journald HostName=ovos_messagebus Network=host Timezone=local +UserNS=keep-id:uid=%U,gid=%G Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro Volume=%h/ovos/tmp:/tmp/mycroft diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal.container index 08838ab6..fd11a672 100644 --- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal.container +++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal.container @@ -12,12 +12,11 @@ LogDriver=journald HostName=ovos_phal Network=host Timezone=local +UserNS=keep-id:uid=%U,gid=%G Environment=PULSE_SERVER=unix:/run/user/1000/pulse/native -Environment=PULSE_COOKIE=/home/ovos/.config/pulse/cookie AddDevice=/dev/snd Volume=%h/ovos/config:/home/ovos/.config/mycroft Volume=%h/ovos/tmp:/tmp/mycroft -Volume=%h/.config/pulse/cookie:/home/ovos/.config/pulse/cookie:ro Volume=%t/pulse:/run/user/1000/pulse:ro [Service] diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal_admin.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal_admin.container index 6edb2972..92c90e14 100644 --- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal_admin.container +++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal_admin.container @@ -12,6 +12,7 @@ LogDriver=journald HostName=ovos_phal_admin Network=host Timezone=local +UserNS=keep-id:uid=%U,gid=%G Volume=%h/ovos/config:/home/ovos/.config/mycroft Volume=%h/ovos/tmp:/tmp/mycroft Volume=/sys:/sys:ro diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_tts_cache.volume b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_tts_cache.volume new file mode 100644 index 00000000..79dfa1a8 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_tts_cache.volume @@ -0,0 +1,4 @@ +[Volume] +User=mycroft +Group=mycroft +Label=name=ovos_tts_cache