b47e5e88a5
Some projects that use Kolla docker containers (TripleO) run mistral-api under httpd. This patch adds the httpd package so that it exists in the container and can optionally by used via Docker entrypoints. As many of these projects do not require the use of Apache (it is opt-in) at this point not all deployment frameworks support the use of it so the existing configuration defaults have been left as-is for now. Change-Id: I07ffd0b398e20065fff27c30d0842b94090ca0ad Related-Bug: #1724607 Partially-Implements: blueprint apache-packages-for-apis
59 lines
1.9 KiB
Django/Jinja
59 lines
1.9 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
|
|
{% block mistral_api_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
|
{% set mistral_api_packages = [
|
|
'httpd',
|
|
'mod_ssl',
|
|
'mod_wsgi',
|
|
'openstack-mistral-api'
|
|
] %}
|
|
{{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
|
|
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'] %}
|
|
{% set mistral_api_packages = [
|
|
'apache2',
|
|
'libapache2-mod-wsgi',
|
|
'mistral-api'
|
|
] %}
|
|
{{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
|
|
RUN echo > /etc/apache2/ports.conf
|
|
{% endif %}
|
|
|
|
{% elif install_type == 'source' %}
|
|
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
|
{% set mistral_api_packages = [
|
|
'httpd',
|
|
'mod_ssl',
|
|
'mod_wsgi'
|
|
] %}
|
|
{{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
|
|
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'] %}
|
|
{% set mistral_api_packages = [
|
|
'apache2',
|
|
'libapache2-mod-wsgi'
|
|
] %}
|
|
|
|
{{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
|
|
RUN echo > /etc/apache2/ports.conf
|
|
{% endif %}
|
|
{% endif %}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start
|
|
RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start
|
|
|
|
{% block mistral_api_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
|
|
USER mistral
|