openstack
/
kolla
Code Issues Proposed changes

Vitrage: build images for Debian 

Change-Id: I73b1964b7b22f1a2d5637209b86559b79602131b
This commit is contained in:
Viktor Michalek 2019-11-06 23:22:01 +01:00
parent 59c881d85c
commit 140ee6c839
6 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/vitrage/vitrage-api/Dockerfile.j2
View File

@ -32,11 +32,27 @@ 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_package_type == 'deb' %}
{% if base_distro == 'debian' %}
{% set vitrage_api_packages = [
'apache2',
'libapache2-mod-wsgi-py3',
'python3-ldappool',
'vitrage-api'
] %}
{{ macros.install_packages(vitrage_api_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/vitrage \
&& cp -a /usr/lib/python3/dist-packages/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage/ \
&& echo > /etc/apache2/ports.conf
{% else %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% endif %}
{% endif %}

11
docker/vitrage/vitrage-base/Dockerfile.j2
View File

@ -21,11 +21,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
&& chown -R vitrage: /var/www/cgi-bin/vitrage
{% elif base_package_type == 'deb' %}
{% if base_distro == 'debian' %}
{% set vitrage_base_packages = [
'python3-vitrage',
'vitrage-common'
] %}
{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
{% else %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% endif %}
{% elif install_type == 'source' %}

10
docker/vitrage/vitrage-graph/Dockerfile.j2
View File

@ -16,11 +16,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(vitrage_graph_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}
{% if base_distro == 'debian' %}
{% set vitrage_graph_packages = [
'vitrage-graph'
] %}
{{ macros.install_packages(vitrage_graph_packages | customizable("packages")) }}
{% else %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% endif %}
{% endif %}

10
docker/vitrage/vitrage-ml/Dockerfile.j2
View File

@ -16,11 +16,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(vitrage_ml_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}
{% if base_distro == 'debian' %}
{% set vitrage_ml_packages = [
'vitrage-ml'
] %}
{{ macros.install_packages(vitrage_ml_packages | customizable("packages")) }}
{% else %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% endif %}
{% endif %}

10
docker/vitrage/vitrage-notifier/Dockerfile.j2
View File

@ -16,11 +16,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(vitrage_notifier_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}
{% if base_distro == 'debian' %}
{% set vitrage_notifier_packages = [
'vitrage-notifier'
] %}
{{ macros.install_packages(vitrage_notifier_packages | customizable("packages")) }}
{% else %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% endif %}
{% endif %}

1
kolla/image/build.py
View File

@ -201,7 +201,6 @@ UNBUILDABLE_IMAGES = {
"tacker-base",
"tripleoclient",
"trove-base",
"vitrage-base",
"neutron-mlnx-agent",
},