mirror of
https://github.com/OpenVoiceOS/OpenVoiceOS
synced 2025-05-19 21:04:40 +02:00
[All] Switch back to ovos-messagebus and configured shared volums as such
This commit is contained in:
parent
59d3088fb8
commit
23a94cc1db
@ -11,6 +11,7 @@ OVOS_CONTAINERS_SITE = $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/ovos-containers
|
|||||||
OVOS_CONTAINERS_SITE_METHOD = local
|
OVOS_CONTAINERS_SITE_METHOD = local
|
||||||
|
|
||||||
OVOS_CONTAINERS_IMAGES = ovos-phal \
|
OVOS_CONTAINERS_IMAGES = ovos-phal \
|
||||||
|
ovos-messagebus \
|
||||||
ovos-listener-dinkum \
|
ovos-listener-dinkum \
|
||||||
ovos-audio \
|
ovos-audio \
|
||||||
ovos-core \
|
ovos-core \
|
||||||
|
@ -5,10 +5,10 @@ After=network-online.target
|
|||||||
Wants=network-online.target
|
Wants=network-online.target
|
||||||
Wants=pipewire.service
|
Wants=pipewire.service
|
||||||
After=pipewire.service
|
After=pipewire.service
|
||||||
Wants=ovos-bus-server.service
|
#Wants=ovos-bus-server.service
|
||||||
After=ovos-bus-server.service
|
#After=ovos-bus-server.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
|
||||||
After=ovos-phal.service
|
After=ovos-phal.service
|
||||||
|
|
||||||
@ -25,12 +25,12 @@ UserNS=keep-id:uid=%U,gid=%G
|
|||||||
SecurityLabelDisable=true
|
SecurityLabelDisable=true
|
||||||
EnvironmentFile=%h/.config/containers/env
|
EnvironmentFile=%h/.config/containers/env
|
||||||
AddDevice=/dev/snd
|
AddDevice=/dev/snd
|
||||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft
|
Volume=%h/ovos/config:/home/ovos/.config/mycroft:z
|
||||||
Volume=%h/ovos/tmp:/tmp
|
Volume=%h/ovos/tmp:/tmp:z
|
||||||
Volume=%t/pipewire-0:/run/user/1000/pipewire-0: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_local_state:/home/ovos/.local/state/mycroft
|
Volume=ovos_local_state:/home/ovos/.local/state/mycroft:z
|
||||||
Volume=ovos_tts_cache:/home/ovos/.cache/mycroft
|
Volume=ovos_tts_cache:/home/ovos/.cache/mycroft:z
|
||||||
Volume=ovos_venv_audio:/home/ovos/.venv
|
Volume=ovos_venv_audio:/home/ovos/.venv
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
[Container]
|
[Container]
|
||||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro,z
|
||||||
|
@ -15,9 +15,9 @@ Network=host
|
|||||||
Timezone=local
|
Timezone=local
|
||||||
UserNS=keep-id:uid=%U,gid=%G
|
UserNS=keep-id:uid=%U,gid=%G
|
||||||
SecurityLabelDisable=true
|
SecurityLabelDisable=true
|
||||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft
|
Volume=%h/ovos/config:/home/ovos/.config/mycroft:z
|
||||||
Volume=%h/ovos/tmp:/tmp
|
Volume=%h/ovos/tmp:/tmp:z
|
||||||
Volume=ovos_local_state:/home/ovos/.local/state/mycroft
|
Volume=ovos_local_state:/home/ovos/.local/state/mycroft:z
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
TimeoutStartSec=900
|
TimeoutStartSec=900
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
[Container]
|
[Container]
|
||||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro,z
|
||||||
|
@ -5,10 +5,10 @@ After=network-online.target
|
|||||||
Wants=network-online.target
|
Wants=network-online.target
|
||||||
Wants=pipewire.service
|
Wants=pipewire.service
|
||||||
After=pipewire.service
|
After=pipewire.service
|
||||||
Wants=ovos-bus-server.service
|
#Wants=ovos-bus-server.service
|
||||||
After=ovos-bus-server.service
|
#After=ovos-bus-server.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
|
||||||
After=ovos-phal.service
|
After=ovos-phal.service
|
||||||
|
|
||||||
@ -25,13 +25,13 @@ UserNS=keep-id:uid=%U,gid=%G
|
|||||||
SecurityLabelDisable=true
|
SecurityLabelDisable=true
|
||||||
EnvironmentFile=%h/.config/containers/env
|
EnvironmentFile=%h/.config/containers/env
|
||||||
AddDevice=/dev/snd
|
AddDevice=/dev/snd
|
||||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft
|
Volume=%h/ovos/config:/home/ovos/.config/mycroft:z
|
||||||
Volume=%h/ovos/tmp:/tmp
|
Volume=%h/ovos/tmp:/tmp:z
|
||||||
Volume=%t/pipewire-0:/run/user/1000/pipewire-0:ro
|
Volume=%t/pipewire-0:/run/user/1000/pipewire-0:ro
|
||||||
Volume=ovos_local_state:/home/ovos/.local/state/mycroft
|
Volume=ovos_local_state:/home/ovos/.local/state/mycroft:z
|
||||||
Volume=ovos_nltk:/home/ovos/nltk_data
|
Volume=ovos_nltk:/home/ovos/nltk_data:z
|
||||||
Volume=ovos_venv_core:/home/ovos/.venv
|
Volume=ovos_venv_core:/home/ovos/.venv
|
||||||
Volume=%h/ovos/share:/home/ovos/.local/share/mycroft
|
Volume=%h/ovos/share:/home/ovos/.local/share/mycroft:z
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
TimeoutStartSec=900
|
TimeoutStartSec=900
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
[Container]
|
[Container]
|
||||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro,z
|
||||||
|
@ -27,12 +27,12 @@ EnvironmentFile=%h/.config/containers/env
|
|||||||
AddDevice=/dev/snd
|
AddDevice=/dev/snd
|
||||||
AddDevice=/dev/dri
|
AddDevice=/dev/dri
|
||||||
AddDevice=/dev/input
|
AddDevice=/dev/input
|
||||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft
|
Volume=%h/ovos/config:/home/ovos/.config/mycroft:z
|
||||||
Volume=%h/ovos/tmp:/tmp
|
Volume=%h/ovos/tmp:/tmp:z
|
||||||
Volume=%t/pipewire-0:/run/user/1000/pipewire-0: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=%h/ovos/share:/home/ovos/.local/share/mycroft
|
Volume=%h/ovos/share:/home/ovos/.local/share/mycroft:z
|
||||||
Volume=ovos_gui_files:/home/ovos/.cache/gui_files
|
Volume=ovos_gui_files:/home/ovos/.cache/gui_files:z
|
||||||
Volume=/run/udev/data:/run/udev/data:ro
|
Volume=/run/udev/data:/run/udev/data:ro
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
[Container]
|
[Container]
|
||||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro,z
|
||||||
|
@ -3,10 +3,10 @@ Description=OpenVoiceOS GUI Websocket Service
|
|||||||
After=local-fs.target
|
After=local-fs.target
|
||||||
After=network-online.target
|
After=network-online.target
|
||||||
Wants=network-online.target
|
Wants=network-online.target
|
||||||
Wants=ovos-bus-server.service
|
#Wants=ovos-bus-server.service
|
||||||
After=ovos-bus-server.service
|
#After=ovos-bus-server.service
|
||||||
#Wants=ovos-messagebus.service
|
Wants=ovos-messagebus.service
|
||||||
#After=ovos-messagebus.service
|
After=ovos-messagebus.service
|
||||||
|
|
||||||
[Container]
|
[Container]
|
||||||
ContainerName=ovos-gui-websocket
|
ContainerName=ovos-gui-websocket
|
||||||
@ -19,9 +19,9 @@ Network=host
|
|||||||
Timezone=local
|
Timezone=local
|
||||||
UserNS=keep-id:uid=%U,gid=%G
|
UserNS=keep-id:uid=%U,gid=%G
|
||||||
SecurityLabelDisable=true
|
SecurityLabelDisable=true
|
||||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro
|
Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro,z
|
||||||
Volume=%h/ovos/tmp:/tmp
|
Volume=%h/ovos/tmp:/tmp:z
|
||||||
Volume=ovos_gui_files:/home/ovos/.cache/ovos_gui_file_server
|
Volume=ovos_gui_files:/home/ovos/.cache/ovos_gui_file_server:z
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
TimeoutStartSec=900
|
TimeoutStartSec=900
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
[Container]
|
[Container]
|
||||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro,z
|
||||||
|
@ -5,10 +5,10 @@ After=network-online.target
|
|||||||
Wants=network-online.target
|
Wants=network-online.target
|
||||||
Wants=pipewire.service
|
Wants=pipewire.service
|
||||||
After=pipewire.service
|
After=pipewire.service
|
||||||
Wants=ovos-bus-server.service
|
#Wants=ovos-bus-server.service
|
||||||
After=ovos-bus-server.service
|
#After=ovos-bus-server.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
|
||||||
After=ovos-phal.service
|
After=ovos-phal.service
|
||||||
|
|
||||||
@ -25,11 +25,11 @@ UserNS=keep-id:uid=%U,gid=%G
|
|||||||
SecurityLabelDisable=true
|
SecurityLabelDisable=true
|
||||||
EnvironmentFile=%h/.config/containers/env
|
EnvironmentFile=%h/.config/containers/env
|
||||||
AddDevice=/dev/snd
|
AddDevice=/dev/snd
|
||||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro
|
Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro,z
|
||||||
Volume=%h/ovos/tmp:/tmp
|
Volume=%h/ovos/tmp:/tmp:z
|
||||||
Volume=%t/pipewire-0:/run/user/1000/pipewire-0: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:z
|
||||||
Volume=ovos_local_state:/home/ovos/.local/state/mycroft
|
Volume=ovos_local_state:/home/ovos/.local/state/mycroft:z
|
||||||
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
|
||||||
Volume=ovos_venv_listener:/home/ovos/.venv
|
Volume=ovos_venv_listener:/home/ovos/.venv
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
[Container]
|
[Container]
|
||||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro,z
|
||||||
|
@ -15,9 +15,9 @@ Network=host
|
|||||||
Timezone=local
|
Timezone=local
|
||||||
UserNS=keep-id:uid=%U,gid=%G
|
UserNS=keep-id:uid=%U,gid=%G
|
||||||
SecurityLabelDisable=true
|
SecurityLabelDisable=true
|
||||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro
|
Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro,z
|
||||||
Volume=ovos_local_state:/home/ovos/.local/state/mycroft
|
Volume=ovos_local_state:/home/ovos/.local/state/mycroft:z
|
||||||
Volume=%h/ovos/tmp:/tmp
|
Volume=%h/ovos/tmp:/tmp:z
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
TimeoutStartSec=900
|
TimeoutStartSec=900
|
||||||
|
@ -0,0 +1,2 @@
|
|||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target default.target
|
@ -1,2 +1,2 @@
|
|||||||
[Container]
|
[Container]
|
||||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro,z
|
||||||
|
@ -5,10 +5,10 @@ After=network-online.target
|
|||||||
Wants=network-online.target
|
Wants=network-online.target
|
||||||
Wants=pipewire.service
|
Wants=pipewire.service
|
||||||
After=pipewire.service
|
After=pipewire.service
|
||||||
Wants=ovos-bus-server.service
|
#Wants=ovos-bus-server.service
|
||||||
After=ovos-bus-server.service
|
#After=ovos-bus-server.service
|
||||||
#Wants=ovos-messagebus.service
|
Wants=ovos-messagebus.service
|
||||||
#After=ovos-messagebus.service
|
After=ovos-messagebus.service
|
||||||
|
|
||||||
[Container]
|
[Container]
|
||||||
ContainerName=ovos-phal
|
ContainerName=ovos-phal
|
||||||
@ -23,9 +23,9 @@ UserNS=keep-id:uid=%U,gid=%G
|
|||||||
SecurityLabelDisable=true
|
SecurityLabelDisable=true
|
||||||
EnvironmentFile=%h/.config/containers/env
|
EnvironmentFile=%h/.config/containers/env
|
||||||
AddDevice=/dev/snd
|
AddDevice=/dev/snd
|
||||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft
|
Volume=%h/ovos/config:/home/ovos/.config/mycroft:z
|
||||||
Volume=ovos_local_state:/home/ovos/.local/state/mycroft
|
Volume=ovos_local_state:/home/ovos/.local/state/mycroft:z
|
||||||
Volume=%h/ovos/tmp:/tmp
|
Volume=%h/ovos/tmp:/tmp:z
|
||||||
Volume=%t/pipewire-0:/run/user/1000/pipewire-0:ro
|
Volume=%t/pipewire-0:/run/user/1000/pipewire-0:ro
|
||||||
Volume=ovos_venv_phal:/home/ovos/.venv
|
Volume=ovos_venv_phal:/home/ovos/.venv
|
||||||
|
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
[Container]
|
[Container]
|
||||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro,z
|
||||||
|
@ -8,8 +8,8 @@ enable ovos-splash-start.service
|
|||||||
enable ovos-splash-systemd.service
|
enable ovos-splash-systemd.service
|
||||||
enable mglru.service
|
enable mglru.service
|
||||||
enable connectivity-check.service
|
enable connectivity-check.service
|
||||||
enable ovos-bus-server.service
|
|
||||||
|
|
||||||
|
disable ovos-bus-server.service
|
||||||
disable ovos-splash-quit.service
|
disable ovos-splash-quit.service
|
||||||
disable pipewire.service
|
disable pipewire.service
|
||||||
disable pipewire-pulse.service
|
disable pipewire-pulse.service
|
||||||
|
Loading…
x
Reference in New Issue
Block a user