From 9a2e0e84e40588fcd4c3948e85e790aec3849fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Tue, 15 Dec 2015 17:47:36 +0900 Subject: [PATCH] Fast fail unsupported murano-base install types The centos-binary murano image will still fail to build, but at least it will fail with a relevant error message. Change-Id: I9870f3437fbfad5820eb014173d9ec49813e60d0 Closes-Bug: #1526202 --- docker/murano/murano-base/Dockerfile.j2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index 67eb6266ca..58f9c6c6e5 100644 --- a/docker/murano/murano-base/Dockerfile.j2 +++ b/docker/murano/murano-base/Dockerfile.j2 @@ -1,7 +1,12 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} -{% if install_type == 'source' %} +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% elif install_type == 'source' %} ADD murano-base-archive /murano-base-source RUN ln -s murano-base-source/* murano \