From 4798fa5b64655c3ccb8eb6029d07d3ff26057c13 Mon Sep 17 00:00:00 2001 From: j1nx Date: Fri, 27 Sep 2024 10:38:00 +0000 Subject: [PATCH] Switch back to Debian based OCI images (for now) --- .../package/ovos-containers/fetch-container-image.sh | 2 +- .../ovos/.config/containers/systemd/ovos-audio.container | 2 +- .../home/ovos/.config/containers/systemd/ovos-cli.container | 2 +- .../home/ovos/.config/containers/systemd/ovos-core.container | 2 +- .../ovos/.config/containers/systemd/ovos-gui-shell.container | 2 +- .../.config/containers/systemd/ovos-gui-websocket.container | 2 +- .../containers/systemd/ovos-listener-dinkum.container | 2 +- .../.config/containers/systemd/ovos-messagebus.container | 2 +- .../home/ovos/.config/containers/systemd/ovos-phal.container | 5 ++++- .../containers/systemd/ovos-phal.container.d/AddDevice.conf | 2 ++ 10 files changed, 14 insertions(+), 9 deletions(-) diff --git a/buildroot-external/package/ovos-containers/fetch-container-image.sh b/buildroot-external/package/ovos-containers/fetch-container-image.sh index 129cf4cb..c3b6e065 100755 --- a/buildroot-external/package/ovos-containers/fetch-container-image.sh +++ b/buildroot-external/package/ovos-containers/fetch-container-image.sh @@ -10,7 +10,7 @@ image="$2" dl_dir="$3" dst_dir="$4" image_name="docker.io/smartgic/${image}" -full_image_name="${image_name}:0.1.0" +full_image_name="${image_name}:0.0.8a" # Fetch image digest image_digest=$(skopeo --override-arch "${arch}" inspect --retry-times=5 "docker://${full_image_name}" | jq -r '.Digest') 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 f08a8442..04c0b5ba 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 @@ -14,7 +14,7 @@ Wants=ovos-phal.service [Container] ContainerName=ovos-audio -Image=docker.io/smartgic/ovos-audio:0.1.0 +Image=docker.io/smartgic/ovos-audio:0.0.8a Pull=never #Notify=healthy AutoUpdate=registry 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 f00ed683..d91806f5 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 @@ -10,7 +10,7 @@ Wants=ovos-bus-server.service [Container] ContainerName=ovos-cli -Image=docker.io/smartgic/ovos-cli:0.1.0 +Image=docker.io/smartgic/ovos-cli:0.0.8a #Pull=never AutoUpdate=registry LogDriver=journald 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 a6df55eb..7c3f2c94 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 @@ -14,7 +14,7 @@ Wants=ovos-phal.service [Container] ContainerName=ovos-core -Image=docker.io/smartgic/ovos-core:0.1.0 +Image=docker.io/smartgic/ovos-core:0.0.8a Pull=never #Notify=healthy AutoUpdate=registry 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 8d8cbfe3..53c09d47 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 @@ -15,7 +15,7 @@ Description=OpenVoiceOS GUI Service [Container] ContainerName=ovos-gui-shell -Image=docker.io/smartgic/ovos-gui-shell:0.1.0 +Image=docker.io/smartgic/ovos-gui-shell:0.0.8a Pull=never AutoUpdate=registry LogDriver=journald 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 07f31e0c..ccaed943 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 @@ -10,7 +10,7 @@ Wants=ovos-bus-server.service [Container] ContainerName=ovos-gui-websocket -Image=docker.io/smartgic/ovos-gui-websocket:0.1.0 +Image=docker.io/smartgic/ovos-gui-websocket:0.0.8a Pull=never #Notify=healthy AutoUpdate=registry 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-dinkum.container index 02977e4b..d694bc17 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-dinkum.container @@ -14,7 +14,7 @@ Wants=ovos-phal.service [Container] ContainerName=ovos-listener-dinkum -Image=docker.io/smartgic/ovos-listener-dinkum:0.1.0 +Image=docker.io/smartgic/ovos-listener-dinkum:0.0.8a Pull=never #Notify=healthy AutoUpdate=registry 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 723a4597..09ee0330 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 @@ -6,7 +6,7 @@ Wants=network-online.target [Container] ContainerName=ovos-messagebus -Image=docker.io/smartgic/ovos-messagebus:0.1.0 +Image=docker.io/smartgic/ovos-messagebus:0.0.8a Pull=never AutoUpdate=registry LogDriver=journald 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 dbe983c9..e5c12450 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 @@ -12,7 +12,7 @@ Wants=ovos-bus-server.service [Container] ContainerName=ovos-phal -Image=docker.io/smartgic/ovos-phal:0.1.0 +Image=docker.io/smartgic/ovos-phal:0.0.8a Pull=never #Notify=healthy AutoUpdate=registry @@ -22,6 +22,9 @@ Network=host Timezone=local UserNS=keep-id:uid=%U,gid=%G EnvironmentFile=%h/.config/containers/env +Unmask=all +SecurityLabelDisable=true +AddCapability=all AddDevice=-/dev/snd Volume=%h/.config/mycroft:/home/ovos/.config/mycroft Volume=%h/.local/state/mycroft:/home/ovos/.local/state/mycroft diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container.d/AddDevice.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container.d/AddDevice.conf index 958c44f9..57420b99 100644 --- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container.d/AddDevice.conf +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container.d/AddDevice.conf @@ -3,3 +3,5 @@ AddDevice=-/dev/gpiomem AddDevice=-/dev/ttyAMA0 AddDevice=-/dev/spidev0.0 AddDevice=-/dev/spidev0.1 +AddDevice=-/dev/input +AddDevice=-/dev/uinput