diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-20 10:03:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-20 10:03:08 +0000 |
| commit | 252dd734df62146a4dc5e746af3720cade64b1b4 (patch) | |
| tree | 1fa58e197227262096f7d73deb059ef04a392ce1 /docker | |
| parent | e44122c782cade92f43359a9034edf0d0d6cbf1d (diff) | |
| parent | 68826b64e2740e78e8794cdd8547e45d3f7a79ef (diff) | |
| download | kolla-252dd734df62146a4dc5e746af3720cade64b1b4.tar.gz kolla-252dd734df62146a4dc5e746af3720cade64b1b4.zip | |
Merge "implement panko api for ubuntu binary"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/panko/panko-api/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | docker/panko/panko-base/Dockerfile.j2 | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/docker/panko/panko-api/Dockerfile.j2 b/docker/panko/panko-api/Dockerfile.j2 index c5dfcb678..565df5679 100644 --- a/docker/panko/panko-api/Dockerfile.j2 +++ b/docker/panko/panko-api/Dockerfile.j2 @@ -13,9 +13,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% elif base_distro in ['debian', 'ubuntu'] %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% set panko_api_packages = [ + 'panko-api', + 'python-pymongo' + ] %} {% endif %} {{ macros.install_packages(panko_api_packages | customizable("packages")) }} diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2 index d84c02031..1623bf6ff 100644 --- a/docker/panko/panko-base/Dockerfile.j2 +++ b/docker/panko/panko-base/Dockerfile.j2 @@ -22,10 +22,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf {% elif base_distro in ['debian', 'ubuntu'] %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - + {% set panko_base_packages = [ + 'apache2', + 'libapache2-mod-wsgi' + ] %} +{{ macros.install_packages(panko_base_packages | customizable("packages")) }} +RUN echo > /etc/apache2/ports.conf {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} |