diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-31 13:27:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-31 13:27:56 +0000 |
| commit | 624d300dc4e736bfcaa33ba8b339770a98552e8c (patch) | |
| tree | d65778fee97e137240c93d3b4a34e92834e67d5b /docker | |
| parent | 1a380935f72d1905e0699929624ae302e89196ba (diff) | |
| parent | 9f5efc5ea6736001160b49a81ec6274ba6353169 (diff) | |
| download | kolla-624d300dc4e736bfcaa33ba8b339770a98552e8c.tar.gz kolla-624d300dc4e736bfcaa33ba8b339770a98552e8c.zip | |
Merge "Import the Murano core libary as part of setup"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/murano/murano-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/murano/murano-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index 611d3131c..76dc174f4 100644 --- a/docker/murano/murano-api/Dockerfile.j2 +++ b/docker/murano/murano-api/Dockerfile.j2 @@ -4,8 +4,10 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} +RUN ln -s /var/cache/murano/meta/io.murano.zip /io.murano.zip {% set murano_api_packages = ['openstack-murano-api'] %} {% elif base_distro in ['ubuntu'] %} +RUN ln -s /usr/share/murano-common/io.murano.zip /io.murano.zip {% set murano_api_packages = ['murano-api'] %} {% endif %} diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index 5649cc56b..295f327a4 100644 --- a/docker/murano/murano-base/Dockerfile.j2 +++ b/docker/murano/murano-base/Dockerfile.j2 @@ -21,7 +21,9 @@ RUN ln -s murano-base-source/* murano \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /murano \ && mkdir -p /etc/murano /home/murano \ && cp -r /murano/etc/murano/* /etc/murano/ \ - && chown -R murano: /etc/murano /home/murano + && chown -R murano: /etc/murano /home/murano \ + && cd murano/meta/io.murano \ + && zip -r /io.murano.zip * {% endif %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index c3d6dc2a9..99544749a 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -202,7 +202,8 @@ ENV DEBIAN_FRONTEND noninteractive 'postgresql', 'postgresql-devel', 'python-devel', - 'sqlite-devel' + 'sqlite-devel', + 'zip' ] %} {% elif base_distro in ['ubuntu', 'debian'] %} {% set openstack_base_packages = [ @@ -217,11 +218,13 @@ ENV DEBIAN_FRONTEND noninteractive 'libyaml-dev', 'libz-dev', 'pkg-config', - 'git' + 'git', + 'zip' ] %} {% endif %} {{ macros.install_packages(openstack_base_packages | customizable("packages")) }} + ADD openstack-base-archive /openstack-base-source RUN ln -s openstack-base-source/* /requirements \ && mkdir -p /var/lib/kolla \ |