From 7aea4f0c5faf0724ac9130dfb2166427a8193204 Mon Sep 17 00:00:00 2001 From: j1nx Date: Sun, 4 Feb 2024 11:02:07 +0000 Subject: [PATCH] [All] Switch over to / make use of podman .image files. Also fix a filename error for tts-server and do not pull in new containers automatically when newer are available --- .../ovos/.config/containers/systemd/hivemind-cli.container | 3 ++- .../home/ovos/.config/containers/systemd/hivemind-cli.image | 4 ++++ .../.config/containers/systemd/hivemind-listener.container | 3 ++- .../ovos/.config/containers/systemd/hivemind-listener.image | 4 ++++ .../home/ovos/.config/containers/systemd/ovos-audio.container | 3 ++- .../home/ovos/.config/containers/systemd/ovos-audio.image | 4 ++++ .../home/ovos/.config/containers/systemd/ovos-cli.container | 3 ++- .../home/ovos/.config/containers/systemd/ovos-cli.image | 4 ++++ .../home/ovos/.config/containers/systemd/ovos-core.container | 3 ++- .../home/ovos/.config/containers/systemd/ovos-core.image | 4 ++++ .../ovos/.config/containers/systemd/ovos-gui-shell.container | 3 ++- .../home/ovos/.config/containers/systemd/ovos-gui-shell.image | 4 ++++ .../.config/containers/systemd/ovos-gui-websocket.container | 3 ++- .../ovos/.config/containers/systemd/ovos-gui-websocket.image | 4 ++++ .../.config/containers/systemd/ovos-listener-dinkum.container | 3 ++- .../.config/containers/systemd/ovos-listener-dinkum.image | 4 ++++ .../ovos/.config/containers/systemd/ovos-messagebus.container | 3 ++- .../ovos/.config/containers/systemd/ovos-messagebus.image | 4 ++++ .../home/ovos/.config/containers/systemd/ovos-phal.container | 3 ++- .../home/ovos/.config/containers/systemd/ovos-phal.image | 4 ++++ ...-sever-piper.container => ovos-tts-server-piper.container} | 3 ++- .../.config/containers/systemd/ovos-tts-server-piper.image | 4 ++++ 22 files changed, 66 insertions(+), 11 deletions(-) create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-cli.image create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-listener.image create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.image create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-cli.image create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.image create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.image create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.image create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.image create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-messagebus.image create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.image rename buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/{ovos-tts-sever-piper.container => ovos-tts-server-piper.container} (91%) create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-tts-server-piper.image diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-cli.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-cli.container index 00841d9f..9e73fe1f 100644 --- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-cli.container +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-cli.container @@ -8,7 +8,8 @@ Wants=hivemind-listener.service [Container] ContainerName=hivemind-cli -Image=docker.io/smartgic/hivemind-cli:alpha +Image=hivemind-cli.image +Pull=never AutoUpdate=registry LogDriver=journald HostName=hivemind-cli diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-cli.image b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-cli.image new file mode 100644 index 00000000..a2baca45 --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-cli.image @@ -0,0 +1,4 @@ +[Image] +Image=docker.io/smartgic/hivemind-cli:alpha +ImageTag=docker.io/smartgic/hivemind-cli:alpha +TLSVerify=false diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-listener.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-listener.container index 906b8776..4188ea33 100644 --- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-listener.container +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-listener.container @@ -8,7 +8,8 @@ Wants=ovos-core.service [Container] ContainerName=hivemind-listener -Image=docker.io/smartgic/hivemind-listener:alpha +Image=hivemind-listener.image +Pull=never AutoUpdate=registry LogDriver=journald HostName=hivemind-listener diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-listener.image b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-listener.image new file mode 100644 index 00000000..240968ec --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-listener.image @@ -0,0 +1,4 @@ +[Image] +Image=docker.io/smartgic/hivemind-listener:alpha +ImageTag=docker.io/smartgic/hivemind-listener:alpha +TLSVerify=false 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 910c42a0..99dc8268 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 @@ -12,7 +12,8 @@ After=ovos-phal.service [Container] ContainerName=ovos-audio -Image=docker.io/smartgic/ovos-audio:alpha +Image=ovos-audio.image +Pull=never Notify=healthy AutoUpdate=registry LogDriver=journald diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.image b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.image new file mode 100644 index 00000000..89b1ba96 --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.image @@ -0,0 +1,4 @@ +[Image] +Image=docker.io/smartgic/ovos-audio:alpha +ImageTag=docker.io/smartgic/ovos-audio:alpha +TLSVerify=false 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 cb6e44fd..10fa8c94 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 @@ -6,7 +6,8 @@ Wants=network-online.target [Container] ContainerName=ovos-cli -Image=docker.io/smartgic/ovos-cli:alpha +Image=ovos-cli.image +Pull=never AutoUpdate=registry LogDriver=journald HostName=ovos-cli diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-cli.image b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-cli.image new file mode 100644 index 00000000..766182a9 --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-cli.image @@ -0,0 +1,4 @@ +[Image] +Image=docker.io/smartgic/ovos-cli:alpha +ImageTag=docker.io/smartgic/ovos-cli:alpha +TLSVerify=false 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 95c4c54f..8a278a72 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 @@ -12,7 +12,8 @@ After=ovos-phal.service [Container] ContainerName=ovos-core -Image=docker.io/smartgic/ovos-core:alpha +Image=ovos-core.image +Pull=never Notify=healthy AutoUpdate=registry LogDriver=journald diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.image b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.image new file mode 100644 index 00000000..98b09bbd --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.image @@ -0,0 +1,4 @@ +[Image] +Image=docker.io/smartgic/ovos-core:alpha +ImageTag=docker.io/smartgic/ovos-core:alpha +TLSVerify=false 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 c1f4be0c..1251e9f7 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 @@ -14,7 +14,8 @@ After=pipewire.service [Container] ContainerName=ovos-gui-shell -Image=docker.io/smartgic/ovos-gui-shell:alpha +Image=ovos-gui-shell.image +Pull=never AutoUpdate=registry LogDriver=journald HostName=ovos-gui-shell diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.image b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.image new file mode 100644 index 00000000..00e657cd --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.image @@ -0,0 +1,4 @@ +[Image] +Image=docker.io/smartgic/ovos-gui-shell:alpha +ImageTag=docker.io/smartgic/ovos-gui-shell:alpha +TLSVerify=false 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 8840f915..ed4ee818 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 @@ -8,7 +8,8 @@ After=ovos-messagebus.service [Container] ContainerName=ovos-gui-websocket -Image=docker.io/smartgic/ovos-gui-websocket:alpha +Image=ovos-gui-websocket.image +Pull=never Notify=healthy AutoUpdate=registry LogDriver=journald diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.image b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.image new file mode 100644 index 00000000..8f4383d2 --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.image @@ -0,0 +1,4 @@ +[Image] +Image=docker.io/smartgic/ovos-gui-websocket:alpha +ImageTag=docker.io/smartgic/ovos-gui-websocket:alpha +TLSVerify=false 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 10b03204..d3ba8566 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 @@ -12,7 +12,8 @@ After=ovos-phal.service [Container] ContainerName=ovos-listener-dinkum -Image=docker.io/smartgic/ovos-listener-dinkum:alpha +Image=ovos-listener-dinkum.image +Pull=never Notify=healthy AutoUpdate=registry LogDriver=journald 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-dinkum.image new file mode 100644 index 00000000..8df9d588 --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.image @@ -0,0 +1,4 @@ +[Image] +Image=docker.io/smartgic/ovos-listener-dinkum:alpha +ImageTag=docker.io/smartgic/ovos-listener-dinkum:alpha +TLSVerify=false 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 b3a3450d..8491210c 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,8 @@ Wants=network-online.target [Container] ContainerName=ovos-messagebus -Image=docker.io/smartgic/ovos-messagebus:alpha +Image=ovos-messagebus.image +Pull=never AutoUpdate=registry LogDriver=journald HostName=ovos-messagebus diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-messagebus.image b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-messagebus.image new file mode 100644 index 00000000..29748b6f --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-messagebus.image @@ -0,0 +1,4 @@ +[Image] +Image=docker.io/smartgic/ovos-messagebus:alpha +ImageTag=docker.io/smartgic/ovos-messagebus:alpha +TLSVerify=false 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 38798e18..2850a03e 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 @@ -10,7 +10,8 @@ After=ovos-messagebus.service [Container] ContainerName=ovos-phal -Image=docker.io/smartgic/ovos-phal:alpha +Image=ovos-phal.image +Pull=never Notify=healthy AutoUpdate=registry LogDriver=journald diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.image b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.image new file mode 100644 index 00000000..3a2c74d8 --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.image @@ -0,0 +1,4 @@ +[Image] +Image=docker.io/smartgic/ovos-phal:alpha +ImageTag=docker.io/smartgic/ovos-phal:alpha +TLSVerify=false diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-tts-sever-piper.container b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-tts-server-piper.container similarity index 91% rename from buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-tts-sever-piper.container rename to buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-tts-server-piper.container index ad820b79..5797cebd 100644 --- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-tts-sever-piper.container +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-tts-server-piper.container @@ -6,7 +6,8 @@ Wants=network-online.target [Container] ContainerName=ovos-tts-server-piper -Image=docker.io/smartgic/ovos-tts-server-piper:alpha +Image=ovos-tts-server-piper.image +Pull=never AutoUpdate=registry LogDriver=journald HostName=ovos-tts-server-piper diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-tts-server-piper.image b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-tts-server-piper.image new file mode 100644 index 00000000..9236b018 --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-tts-server-piper.image @@ -0,0 +1,4 @@ +[Image] +Image=docker.io/smartgic/ovos-tts-server-piper:alpha +ImageTag=docker.io/smartgic/ovos-tts-server-piper:alpha +TLSVerify=false