rixty/OpenVoiceOS
1
1
Fork 0
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS synced 2025-02-03 12:07:46 +01:00
Code Issues Releases Wiki Activity

[ALL] Pass the pipewire sockets into the containers instead of pulseaudio

Browse Source
This commit is contained in:
j1nx 2023-08-31 13:33:35 +00:00
parent 521897077b
commit 1bc5fe7ea5
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_audio.container
View File

@ -1,6 +1,8 @@
[Unit] [Unit]
Description=OpenVoiceOS Audio Service Description=OpenVoiceOS Audio Service
After=local-fs.target After=local-fs.target
Wants=pipewire.service
After=pipewire.service
Wants=ovos_messagebus.service Wants=ovos_messagebus.service
After=ovos_messagebus.service After=ovos_messagebus.service
Wants=ovos_phal.service Wants=ovos_phal.service
@ -15,12 +17,11 @@ HostName=ovos_audio
Network=host Network=host
Timezone=local Timezone=local
UserNS=keep-id:uid=%U,gid=%G UserNS=keep-id:uid=%U,gid=%G
Environment=PULSE_SERVER=unix:/run/user/1000/pulse/native EnvironmentHost=true
Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus
AddDevice=/dev/snd AddDevice=/dev/snd
Volume=%h/ovos/config:/home/ovos/.config/mycroft Volume=%h/ovos/config:/home/ovos/.config/mycroft
Volume=%h/ovos/tmp:/tmp/mycroft Volume=%h/ovos/tmp:/tmp/mycroft
Volume=%t/pulse:/run/user/1000/pulse:ro Volume=%t/pipewire-0:/run/user/1000/pipewire-0:ro
Volume=%t/bus:/run/user/1000/bus:ro Volume=%t/bus:/run/user/1000/bus:ro
Volume=ovos_tts_cache:/home/ovos/.cache/mycroft Volume=ovos_tts_cache:/home/ovos/.cache/mycroft

6
buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_core.container
View File

@ -1,6 +1,8 @@
[Unit] [Unit]
Description=OpenVoiceOS Core Service Description=OpenVoiceOS Core Service
After=local-fs.target After=local-fs.target
Wants=pipewire.service
After=pipewire.service
Wants=ovos_messagebus.service Wants=ovos_messagebus.service
After=ovos_messagebus.service After=ovos_messagebus.service
Wants=ovos_phal.service Wants=ovos_phal.service
@ -15,11 +17,11 @@ HostName=ovos_core
Network=host Network=host
Timezone=local Timezone=local
UserNS=keep-id:uid=%U,gid=%G UserNS=keep-id:uid=%U,gid=%G
Environment=PULSE_SERVER=unix:/run/user/1000/pulse/native EnvironmentHost=true
AddDevice=/dev/snd AddDevice=/dev/snd
Volume=%h/ovos/config:/home/ovos/.config/mycroft Volume=%h/ovos/config:/home/ovos/.config/mycroft
Volume=%h/ovos/tmp:/tmp/mycroft Volume=%h/ovos/tmp:/tmp/mycroft
Volume=%t/pulse:/run/user/1000/pulse:ro Volume=%t/pipewire-0:/run/user/1000/pipewire-0:ro
Volume=ovos_nltk:/home/ovos/nltk_data Volume=ovos_nltk:/home/ovos/nltk_data
Volume=%h/ovos/share:/home/ovos/.local/share/mycroft Volume=%h/ovos/share:/home/ovos/.local/share/mycroft

6
buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener.container
View File

@ -1,6 +1,8 @@
[Unit] [Unit]
Description=OpenVoiceOS Dinkum Listener Service Description=OpenVoiceOS Dinkum Listener Service
After=local-fs.target After=local-fs.target
Wants=pipewire.service
After=pipewire.service
Wants=ovos_messagebus.service Wants=ovos_messagebus.service
After=ovos_messagebus.service After=ovos_messagebus.service
Wants=ovos_phal.service Wants=ovos_phal.service
@ -15,11 +17,11 @@ HostName=ovos_listener
Network=host Network=host
Timezone=local Timezone=local
UserNS=keep-id:uid=%U,gid=%G UserNS=keep-id:uid=%U,gid=%G
Environment=PULSE_SERVER=unix:/run/user/1000/pulse/native EnvironmentHost=true
AddDevice=/dev/snd AddDevice=/dev/snd
Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro
Volume=%h/ovos/tmp:/tmp/mycroft Volume=%h/ovos/tmp:/tmp/mycroft
Volume=%t/pulse:/run/user/1000/pulse:ro Volume=%t/pipewire-0:/run/user/1000/pipewire-0:ro
Volume=ovos_listener_records:/home/ovos/.local/share/mycroft/listener Volume=ovos_listener_records:/home/ovos/.local/share/mycroft/listener
Volume=ovos_models:/home/ovos/.local/share/precise-lite Volume=ovos_models:/home/ovos/.local/share/precise-lite
Volume=ovos_vosk:/home/ovos/.local/share/vosk Volume=ovos_vosk:/home/ovos/.local/share/vosk

6
buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal.container
View File

@ -1,6 +1,8 @@
[Unit] [Unit]
Description=OpenVoiceOS PHAL Service Description=OpenVoiceOS PHAL Service
After=local-fs.target After=local-fs.target
Wants=pipewire.service
After=pipewire.service
Wants=ovos_messagebus.service Wants=ovos_messagebus.service
After=ovos_messagebus.service After=ovos_messagebus.service
@ -13,11 +15,11 @@ HostName=ovos_phal
Network=host Network=host
Timezone=local Timezone=local
UserNS=keep-id:uid=%U,gid=%G UserNS=keep-id:uid=%U,gid=%G
Environment=PULSE_SERVER=unix:/run/user/1000/pulse/native EnvironmentHost=true
AddDevice=/dev/snd AddDevice=/dev/snd
Volume=%h/ovos/config:/home/ovos/.config/mycroft Volume=%h/ovos/config:/home/ovos/.config/mycroft
Volume=%h/ovos/tmp:/tmp/mycroft Volume=%h/ovos/tmp:/tmp/mycroft
Volume=%t/pulse:/run/user/1000/pulse:ro Volume=%t/pipewire-0:/run/user/1000/pipewire-0:ro
[Service] [Service]
TimeoutStartSec=900 TimeoutStartSec=900