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/openstack-base/Dockerfile.j2 | |
| 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/openstack-base/Dockerfile.j2')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 7 |
1 files changed, 5 insertions, 2 deletions
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 \ |