diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-01 13:41:14 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-09 17:44:26 +0200 |
| commit | 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (patch) | |
| tree | 05427aa46ce6473684cfe2a824798306291546c9 /docker/murano | |
| parent | cabfd0f3eff38e2c10cdc7cf4e9271d72eeca91a (diff) | |
| download | kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.tar.gz kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.zip | |
docker: drop binary parts
Big patch drops all mentions of binary images support. Suggestions are
welcome how to split it into parts or handle better.
Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
Diffstat (limited to 'docker/murano')
| -rw-r--r-- | docker/murano/murano-api/Dockerfile.j2 | 15 | ||||
| -rw-r--r-- | docker/murano/murano-base/Dockerfile.j2 | 14 | ||||
| -rw-r--r-- | docker/murano/murano-engine/Dockerfile.j2 | 11 |
3 files changed, 0 insertions, 40 deletions
diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index 8b7062c31..09fa9ec98 100644 --- a/docker/murano/murano-api/Dockerfile.j2 +++ b/docker/murano/murano-api/Dockerfile.j2 @@ -7,21 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if install_type == 'binary' %} - {% 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_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'] %} - {% endif %} - -{{ macros.install_packages(murano_api_packages | customizable("packages")) }} - -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_murano_extend_start RUN chmod 755 /usr/local/bin/kolla_murano_extend_start diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index 246301621..f09fb2f2b 100644 --- a/docker/murano/murano-base/Dockerfile.j2 +++ b/docker/murano/murano-base/Dockerfile.j2 @@ -9,18 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='murano') }} -{% if install_type == 'binary' %} - - {% if base_package_type == 'rpm' %} - {% set murano_base_packages = ['openstack-murano-common'] %} - {% elif base_package_type == 'deb' %} - {% set murano_base_packages = ['murano-common'] %} - {% endif %} - -{{ macros.install_packages(murano_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - ADD murano-base-archive /murano-base-source {% set murano_base_pip_packages = [ @@ -37,8 +25,6 @@ RUN ln -s murano-base-source/* murano \ && cd /murano/meta/io.murano.applications \ && zip -r /io.murano.applications.zip * -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_murano_extend_start \ diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2 index 73bd95717..bc433a580 100644 --- a/docker/murano/murano-engine/Dockerfile.j2 +++ b/docker/murano/murano-engine/Dockerfile.j2 @@ -7,17 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set murano_engine_packages = ['openstack-murano-engine'] %} - {% elif base_package_type == 'deb' %} - {% set murano_engine_packages = ['murano-engine'] %} - {% endif %} - -{{ macros.install_packages(murano_engine_packages | customizable("packages")) }} - -{% endif %} - {% block murano_engine_footer %}{% endblock %} {% block footer %}{% endblock %} |