From b63678adebc378e727d30ce3d8e102f863029142 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 19 Jun 2025 19:25:47 +0200 Subject: [PATCH] Fix documentation of seed_containers usage Pulling a specific image version requires using the tag parameter. Include docker.io in container image name for compatibility with Podman. Change-Id: Ic2fef4c6925d2d799f096de6b6fa519d77130c3e Signed-off-by: Pierre Riteau (cherry picked from commit 65c129143623995d16ec4701afcc5c23717323b8) --- ansible/inventory/group_vars/all/seed | 3 ++- doc/source/configuration/reference/seed-custom-containers.rst | 3 ++- etc/kayobe/seed.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ansible/inventory/group_vars/all/seed b/ansible/inventory/group_vars/all/seed index eddee7426..f5b1bd38d 100644 --- a/ansible/inventory/group_vars/all/seed +++ b/ansible/inventory/group_vars/all/seed @@ -136,9 +136,10 @@ seed_users: "{{ users_default }}" # Example: # seed_containers: # squid: -# image: "stackhpc/squid:3.5.20-1" +# image: "docker.io/stackhpc/squid" # pre: "{{ kayobe_env_config_path }}/containers/squid/pre.yml" # post: "{{ kayobe_env_config_path }}/containers/squid/post.yml" +# tag: "3.5.20-1" # seed_containers: {} diff --git a/doc/source/configuration/reference/seed-custom-containers.rst b/doc/source/configuration/reference/seed-custom-containers.rst index a6f094c51..70cc748ca 100644 --- a/doc/source/configuration/reference/seed-custom-containers.rst +++ b/doc/source/configuration/reference/seed-custom-containers.rst @@ -17,11 +17,12 @@ For example, to deploy a squid container image: seed_containers: squid: - image: "stackhpc/squid:3.5.20-1" + image: "docker.io/stackhpc/squid" pre: "{{ kayobe_env_config_path }}/containers/squid/pre.yml" post: "{{ kayobe_env_config_path }}/containers/squid/post.yml" pre_destroy: "{{ kayobe_env_config_path }}/containers/squid/pre_destroy.yml" post_destroy: "{{ kayobe_env_config_path }}/containers/squid/post_destroy.yml" + tag: "3.5.20-1" Please notice the *optional* pre, post, pre_destroy, and post_destroy Ansible task files - those need to be created in ``kayobe-config`` path. The table below describes diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml index 541c07808..48bcfb878 100644 --- a/etc/kayobe/seed.yml +++ b/etc/kayobe/seed.yml @@ -98,9 +98,10 @@ # Example: # seed_containers: # squid: -# image: "stackhpc/squid:3.5.20-1" +# image: "docker.io/stackhpc/squid" # pre: "{{ kayobe_env_config_path }}/containers/squid/pre.yml" # post: "{{ kayobe_env_config_path }}/containers/squid/post.yml" +# tag: "3.5.20-1" # #seed_containers: