]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
ci: Makefile: Expose CI_IMAGE_PREFIX and CI_IMAGE_TAG in 'ci-help'
authorErik Skultety <eskultet@redhat.com>
Mon, 15 Feb 2021 12:07:08 +0000 (13:07 +0100)
committerErik Skultety <eskultet@redhat.com>
Wed, 17 Feb 2021 10:05:42 +0000 (11:05 +0100)
Using locally built images is a useful feature; our commentaries even
mention overriding them may be useful in some scenarios. Expose the
variables in the help to let users know they can use the feature.

Formatting would definitely break, so this patch adds more spacing for
proper alignment.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
ci/Makefile

index 94a4bf62c7d5698065cf1843d78fe3f1ffbc7c32..c4585ae95d1fa77b0176455930514899fa1f34e9 100644 (file)
@@ -235,10 +235,12 @@ ci-help:
        @echo
        @echo "Available make variables:"
        @echo
-       @echo "    CI_CLEAN=0          - do not delete '$(CI_SCRATCHDIR)' after completion"
-       @echo "    CI_REUSE=1          - re-use existing '$(CI_SCRATCHDIR)' content"
-       @echo "    CI_ENGINE=auto      - container engine to use (podman, docker)"
-       @echo "    CI_USER_LOGIN=      - which user should run in the container (default is $$USER)"
-       @echo "    CI_MESON_ARGS=      - extra arguments passed to meson"
-       @echo "    CI_NINJA_ARGS=      - extra arguments passed to ninja"
+       @echo "    CI_CLEAN=0              - do not delete '$(CI_SCRATCHDIR)' after completion"
+       @echo "    CI_REUSE=1              - re-use existing '$(CI_SCRATCHDIR)' content"
+       @echo "    CI_ENGINE=auto          - container engine to use (podman, docker)"
+       @echo "    CI_USER_LOGIN=          - which user should run in the container (default is $$USER)"
+       @echo "    CI_IMAGE_PREFIX=        - override to prefer a locally built image, (default is $(CI_IMAGE_PREFIX))"
+       @echo "    CI_IMAGE_TAG=:latest    - optionally use in conjunction with 'CI_IMAGE_PREFIX'"
+       @echo "    CI_MESON_ARGS=          - extra arguments passed to meson"
+       @echo "    CI_NINJA_ARGS=          - extra arguments passed to ninja"
        @echo