zuul/zuul-jobs
Code Issues Proposed changes

Allow overriding the buildset registry image

Browse Source 
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
This commit is contained in:
Tobias Henkel 2022-07-15 13:02:23 +02:00 committed by Mohammed Naser
parent 8e9d9c2f7d
commit 5b3d0c3ee2
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
roles/run-buildset-registry/README.rst
View File

@ -6,6 +6,11 @@ single change can share the registry.
**Role Variables** **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 .. zuul:rolevar:: buildset_registry_root
:default: {{ ansible_user_dir }}/buildset_registry :default: {{ ansible_user_dir }}/buildset_registry

1
roles/run-buildset-registry/defaults/main.yaml
View File

@ -1,3 +1,4 @@
buildset_registry_image: quay.io/zuul-ci/zuul-registry:latest
buildset_registry_root: "{{ ansible_user_dir }}/buildset_registry" buildset_registry_root: "{{ ansible_user_dir }}/buildset_registry"
buildset_registry_port: 5000 buildset_registry_port: 5000
container_command: docker container_command: docker

2
roles/run-buildset-registry/tasks/main.yaml
View File

@ -49,7 +49,7 @@
--publish="1{{ buildset_registry_port }}:5000" --publish="1{{ buildset_registry_port }}:5000"
--volume="{{ buildset_registry_root }}/tls:/tls" --volume="{{ buildset_registry_root }}/tls:/tls"
--volume="{{ buildset_registry_root }}/conf:/conf" --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 # Start a socat tunnel to the buildset registry to work around
# https://github.com/containers/libpod/issues/4311 # https://github.com/containers/libpod/issues/4311