aboutsummaryrefslogtreecommitdiff
path: root/docker/murano
diff options
context:
space:
mode:
Diffstat (limited to 'docker/murano')
-rw-r--r--docker/murano/murano-api/Dockerfile.j24
-rw-r--r--docker/murano/murano-base/Dockerfile.j24
-rw-r--r--docker/murano/murano-engine/Dockerfile.j24
3 files changed, 6 insertions, 6 deletions
diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2
index e3712080f..42323e7c3 100644
--- a/docker/murano/murano-api/Dockerfile.j2
+++ b/docker/murano/murano-api/Dockerfile.j2
@@ -6,11 +6,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% if base_package_type == 'rpm' %}
RUN ln -s /var/cache/murano/meta/io.murano.zip /io.murano.zip \
&& ln -s /var/cache/murano/meta/io.murano.applications.zip /io.murano.applications.zip
{% set murano_api_packages = ['openstack-murano-api'] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
RUN ln -s /usr/share/murano-common/io.murano.zip /io.murano.zip \
&& ln -s /var/cache/murano/meta/io.murano.applications.zip /io.murano.applications.zip
{% set murano_api_packages = ['murano-api'] %}
diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2
index bacc403c9..4be44f9bf 100644
--- a/docker/murano/murano-base/Dockerfile.j2
+++ b/docker/murano/murano-base/Dockerfile.j2
@@ -9,9 +9,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %}
- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% if base_package_type == 'rpm' %}
{% set murano_base_packages = ['openstack-murano-common'] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set murano_base_packages = ['murano-common'] %}
{% endif %}
diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2
index 2761f77d7..67a19d6e7 100644
--- a/docker/murano/murano-engine/Dockerfile.j2
+++ b/docker/murano/murano-engine/Dockerfile.j2
@@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% if base_package_type == 'rpm' %}
{% set murano_engine_packages = ['openstack-murano-engine'] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set murano_engine_packages = ['murano-engine'] %}
{% endif %}