aboutsummaryrefslogtreecommitdiff
path: root/docker/aodh
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-08-10 17:52:00 +0000
committerGerrit Code Review <review@openstack.org>2020-08-10 17:52:00 +0000
commitfd60c657101167b056177ae95aa2c695f14a93d4 (patch)
treedf61e63de4539721bbafca2e6eb224b019c99a73 /docker/aodh
parent7f4a32e1a38b7887c165b88d6ea3c31cef29abca (diff)
parent5bdf514645e6ba603f813f299c68ff7fb12daa3c (diff)
downloadkolla-fd60c657101167b056177ae95aa2c695f14a93d4.tar.gz
kolla-fd60c657101167b056177ae95aa2c695f14a93d4.zip
Merge "Refactor httpd install to base image"
Diffstat (limited to 'docker/aodh')
-rw-r--r--docker/aodh/aodh-base/Dockerfile.j240
1 files changed, 7 insertions, 33 deletions
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2
index ec55885fb..238c39fd8 100644
--- a/docker/aodh/aodh-base/Dockerfile.j2
+++ b/docker/aodh/aodh-base/Dockerfile.j2
@@ -14,61 +14,35 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{# NOTE(aschultz): added api because the common package doesn't include the wsgi file. I think this needs fixing #}
{% set aodh_base_packages = [
- 'httpd',
- 'mod_ssl',
'openstack-aodh-api',
'openstack-aodh-common',
- 'python3-ldappool',
- 'python3-mod_wsgi'
+ 'python3-ldappool'
] %}
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/aodh \
- && cp -a /usr/bin/aodh-api /var/www/cgi-bin/aodh/ \
- && 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
+ && cp -a /usr/bin/aodh-api /var/www/cgi-bin/aodh/
{% elif base_package_type == 'deb' %}
{% set aodh_base_packages = [
'aodh-common',
- 'apache2',
- 'libapache2-mod-wsgi-py3',
'python3-aodh',
'python3-ldappool'
] %}
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/aodh \
- && cp -a /usr/lib/python3/dist-packages/aodh/api/app.wsgi /var/www/cgi-bin/aodh/ \
- && echo > /etc/apache2/ports.conf
+ && cp -a /usr/lib/python3/dist-packages/aodh/api/app.wsgi /var/www/cgi-bin/aodh/
{% endif %}
{% elif install_type == 'source' %}
- {% if base_package_type == 'rpm' %}
-
- {% set aodh_base_packages = [
- 'httpd',
- 'mod_ssl',
- 'python3-ldappool',
- 'python3-mod_wsgi'
- ] %}
-
-{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/aodh \
- && 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' %}
- {% set aodh_base_packages = [
- 'apache2',
- 'libapache2-mod-wsgi-py3',
- 'python3-ldappool'
- ] %}
+ {% set aodh_base_packages = [
+ 'python3-ldappool'
+ ] %}
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/aodh \
- && echo > /etc/apache2/ports.conf
- {% endif %}
+RUN mkdir -p /var/www/cgi-bin/aodh
ADD aodh-base-archive /aodh-base-source