From 5b3d0c3ee210c34ec80f066d32d9e91e9c823ba5 Mon Sep 17 00:00:00 2001 From: Tobias Henkel Date: Fri, 15 Jul 2022 13:02:23 +0200 Subject: [PATCH] Allow overriding the buildset registry image There are cases when a downstream user of run-buildset-registry needs to use a different image. This can happen e.g. when this has to be cached in a local registry. To facilitate this use case add the buildset_registry_image variable that lets the user specify a different image. Change-Id: I0cd3bd2f6bcd0ac73609bf37ce99557472e9f3d1 --- roles/run-buildset-registry/README.rst | 5 +++++ roles/run-buildset-registry/defaults/main.yaml | 1 + roles/run-buildset-registry/tasks/main.yaml | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/roles/run-buildset-registry/README.rst b/roles/run-buildset-registry/README.rst index 4f9f91b54..266d98bc2 100644 --- a/roles/run-buildset-registry/README.rst +++ b/roles/run-buildset-registry/README.rst @@ -6,6 +6,11 @@ single change can share the registry. **Role Variables** +.. zuul:rolevar:: buildset_registry_image + :default: quay.io/zuul-ci/zuul-registry:latest + + Container image used to launch the buildset registry. + .. zuul:rolevar:: buildset_registry_root :default: {{ ansible_user_dir }}/buildset_registry diff --git a/roles/run-buildset-registry/defaults/main.yaml b/roles/run-buildset-registry/defaults/main.yaml index 7c24e657c..0b92af72f 100644 --- a/roles/run-buildset-registry/defaults/main.yaml +++ b/roles/run-buildset-registry/defaults/main.yaml @@ -1,3 +1,4 @@ +buildset_registry_image: quay.io/zuul-ci/zuul-registry:latest buildset_registry_root: "{{ ansible_user_dir }}/buildset_registry" buildset_registry_port: 5000 container_command: docker diff --git a/roles/run-buildset-registry/tasks/main.yaml b/roles/run-buildset-registry/tasks/main.yaml index 4a1653943..d409d2e6e 100644 --- a/roles/run-buildset-registry/tasks/main.yaml +++ b/roles/run-buildset-registry/tasks/main.yaml @@ -49,7 +49,7 @@ --publish="1{{ buildset_registry_port }}:5000" --volume="{{ buildset_registry_root }}/tls:/tls" --volume="{{ buildset_registry_root }}/conf:/conf" - docker.io/zuul/zuul-registry:latest zuul-registry -d + {{ buildset_registry_image }} zuul-registry -d # Start a socat tunnel to the buildset registry to work around # https://github.com/containers/libpod/issues/4311