aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-15 16:41:05 +0000
committerGerrit Code Review <review@openstack.org>2015-12-15 16:41:05 +0000
commit8cf1563a760687798d769bc23e3312d394ee1ad0 (patch)
tree96b7053302b627298e950c4677b8d75c8a262b0d /docker
parent7f22109d06aaa6e0d6105c6416eeff1f0ae38362 (diff)
parent9a2e0e84e40588fcd4c3948e85e790aec3849fc9 (diff)
downloadkolla-8cf1563a760687798d769bc23e3312d394ee1ad0.tar.gz
kolla-8cf1563a760687798d769bc23e3312d394ee1ad0.zip
Merge "Fast fail unsupported murano-base install types"
Diffstat (limited to 'docker')
-rw-r--r--docker/murano/murano-base/Dockerfile.j27
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2
index 67eb6266c..58f9c6c6e 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 \