Merge pull request #453 from stackhpc/upstream/2024.1-2025-07-21

Synchronise 2024.1 with upstream

Author: priteau

ansible/inventory/group_vars/all/seed

@@ -115,9 +115,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: {}
 

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

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: