On Tue, 2020-06-02 at 11:37 +0100, Daniel P. Berrangé wrote:
On Fri, May 29, 2020 at 03:00:44PM +0200, Andrea Bolognani wrote:
-# The default tag is ':latest' but if the container +# The default tag is 'latest' but if the container # repo above uses different conventions this can override it -CI_IMAGE_TAG = :latest +CI_IMAGE_TAG = latest
# We delete the virtual root after completion, set # to 0 if you need to keep it around for debugging @@ -220,7 +220,10 @@ ci-run-command@%: ci-prepare-tree if test "$(CI_IMAGE_REGISTRY)"; then \ image="$${image}$(CI_IMAGE_REGISTRY)/"; \ fi; \ - image="$${image}$(CI_IMAGE_PREFIX)$*$(CI_IMAGE_TAG)"; \ + image="$${image}$(CI_IMAGE_PREFIX)$*"; \ + if test "$(CI_IMAGE_TAG)"; then \ + image="$${image}:$(CI_IMAGE_TAG)"; \ + fi; \
Again, I'm not seeing what this test is for
It was intended to account for the possibility of the user passing an empty CI_IMAGE_TAG, but now that I think about it a bit more that would be quite a silly thing to do and erroring out in that case is perfectly fine. I'll drop this commit. -- Andrea Bolognani / Red Hat / Virtualization