From 2d8a7846dea77910afffe532a00c7c4aa3bed35b Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 7 Oct 2024 12:29:52 +0000 Subject: [PATCH] Implement latest container images --- .../ovos/.config/containers/systemd/ovos-audio.container | 2 +- .../home/ovos/.config/containers/systemd/ovos-cli.container | 2 +- .../ovos/.config/containers/systemd/ovos-core.container | 2 +- .../.config/containers/systemd/ovos-gui-shell.container | 2 +- .../.config/containers/systemd/ovos-gui-websocket.container | 2 +- ...os-listener-dinkum.container => ovos-listener.container} | 6 +++--- .../Enabled.conf | 0 .../Mycroft.conf | 0 .../{ovos-listener-dinkum.image => ovos-listener.image} | 0 .../.config/containers/systemd/ovos-messagebus.container | 2 +- .../ovos/.config/containers/systemd/ovos-phal.container | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/{ovos-listener-dinkum.container => ovos-listener.container} (89%) rename buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/{ovos-listener-dinkum.container.d => ovos-listener.container.d}/Enabled.conf (100%) rename buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/{ovos-listener-dinkum.container.d => ovos-listener.container.d}/Mycroft.conf (100%) rename buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/{ovos-listener-dinkum.image => ovos-listener.image} (100%) diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.container index ce7a5c24..f08a8442 100644 --- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.container +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.container @@ -26,7 +26,7 @@ UserNS=keep-id:uid=%U,gid=%G EnvironmentFile=%h/.config/containers/env AddDevice=/dev/snd Volume=%h/.config/mycroft:/home/ovos/.config/mycroft -Volume=%h/.local/state/mycroft:/home/ovos/.local/state +Volume=%h/.local/state/mycroft:/home/ovos/.local/state/mycroft Volume=%h/.local/share/mycroft:/home/ovos/.local/share/mycroft Volume=%h/.cache/mycroft:/home/ovos/.cache Volume=%h/ovos/tmp:/tmp:z,U diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-cli.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-cli.container index 274ae720..f00ed683 100644 --- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-cli.container +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-cli.container @@ -20,7 +20,7 @@ Timezone=local UserNS=keep-id:uid=%U,gid=%G EnvironmentFile=%h/.config/containers/env Volume=%h/.config/mycroft:/home/ovos/.config/mycroft -Volume=%h/.local/state/mycroft:/home/ovos/.local/state +Volume=%h/.local/state/mycroft:/home/ovos/.local/state/mycroft Volume=%h/.local/share/mycroft:/home/ovos/.local/share/mycroft Volume=%h/.cache:/home/ovos/.cache Volume=%h/ovos/tmp:/tmp:z,U diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container index 79d8d9d6..a6df55eb 100644 --- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container @@ -25,7 +25,7 @@ Timezone=local UserNS=keep-id:uid=%U,gid=%G EnvironmentFile=%h/.config/containers/env Volume=%h/.config/mycroft:/home/ovos/.config/mycroft -Volume=%h/.local/state/mycroft:/home/ovos/.local/state +Volume=%h/.local/state/mycroft:/home/ovos/.local/state/mycroft Volume=%h/.local/share/mycroft:/home/ovos/.local/share/mycroft Volume=%h/.cache:/home/ovos/.cache Volume=%h/ovos/tmp:/tmp:z,U diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.container index e1918384..8d8cbfe3 100644 --- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.container +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.container @@ -28,7 +28,7 @@ AddDevice=-/dev/snd AddDevice=-/dev/dri AddDevice=-/dev/input Volume=%h/.config/mycroft:/home/ovos/.config/mycroft -Volume=%h/.local/state/mycroft:/home/ovos/.local/state +Volume=%h/.local/state/mycroft:/home/ovos/.local/state/mycroft Volume=%h/.local/share/mycroft:/home/ovos/.local/share/mycroft Volume=%h/.cache:/home/ovos/.cache Volume=%h/ovos/tmp:/tmp:z,U diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.container index 6027190b..07f31e0c 100644 --- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.container +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.container @@ -21,7 +21,7 @@ Timezone=local UserNS=keep-id:uid=%U,gid=%G EnvironmentFile=%h/.config/containers/env Volume=%h/.config/mycroft:/home/ovos/.config/mycroft -Volume=%h/.local/state/mycroft:/home/ovos/.local/state +Volume=%h/.local/state/mycroft:/home/ovos/.local/state/mycroft Volume=%h/.local/share/mycroft:/home/ovos/.local/share/mycroft Volume=%h/.cache:/home/ovos/.cache Volume=%h/ovos/tmp:/tmp:z,U diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener.container similarity index 89% rename from buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.container rename to buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener.container index 170699e7..ba14fbf8 100644 --- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.container +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener.container @@ -13,20 +13,20 @@ After=ovos-phal.service Wants=ovos-phal.service [Container] -ContainerName=ovos-listener-dinkum +ContainerName=ovos-listener Image=docker.io/smartgic/ovos-listener:0.1.0 Pull=never #Notify=healthy AutoUpdate=registry LogDriver=journald -HostName=ovos-listener-dinkum +HostName=ovos-listener Network=host Timezone=local UserNS=keep-id:uid=%U,gid=%G EnvironmentFile=%h/.config/containers/env AddDevice=/dev/snd Volume=%h/.config/mycroft:/home/ovos/.config/mycroft -Volume=%h/.local/state/mycroft:/home/ovos/.local/state +Volume=%h/.local/state/mycroft:/home/ovos/.local/state/mycroft Volume=%h/.local/share/mycroft:/home/ovos/.local/share/mycroft Volume=%h/.local/share/precise-lite:/home/ovos/.local/share/precise-lite Volume=%h/.local/share/vosk:/home/ovos/.local/share/vosk diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.container.d/Enabled.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener.container.d/Enabled.conf similarity index 100% rename from buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.container.d/Enabled.conf rename to buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener.container.d/Enabled.conf diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.container.d/Mycroft.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener.container.d/Mycroft.conf similarity index 100% rename from buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.container.d/Mycroft.conf rename to buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener.container.d/Mycroft.conf diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.image b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener.image similarity index 100% rename from buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.image rename to buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener.image diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-messagebus.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-messagebus.container index 35259abe..723a4597 100644 --- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-messagebus.container +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-messagebus.container @@ -16,7 +16,7 @@ Timezone=local UserNS=keep-id:uid=%U,gid=%G EnvironmentFile=%h/.config/containers/env Volume=%h/.config/mycroft:/home/ovos/.config/mycroft -Volume=%h/.local/state/mycroft:/home/ovos/.local/state +Volume=%h/.local/state/mycroft:/home/ovos/.local/state/mycroft Volume=%h/ovos/tmp:/tmp:z,U Volume=%h/.cache:/home/ovos/.cache Volume=ovos_venv_messagebus:/home/ovos/.venv:z,U diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container index 2fedaf18..454e5949 100644 --- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container @@ -27,7 +27,7 @@ SecurityLabelDisable=true AddCapability=all AddDevice=-/dev/snd Volume=%h/.config/mycroft:/home/ovos/.config/mycroft -Volume=%h/.local/state/mycroft:/home/ovos/.local/state +Volume=%h/.local/state/mycroft:/home/ovos/.local/state/mycroft Volume=%h/ovos/tmp:/tmp:z,U Volume=/run/dbus:/run/dbus Volume=/run/udev:/run/udev:ro