aboutsummaryrefslogtreecommitdiff
path: root/docker/gnocchi
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/gnocchi
parent7f4a32e1a38b7887c165b88d6ea3c31cef29abca (diff)
parent5bdf514645e6ba603f813f299c68ff7fb12daa3c (diff)
downloadkolla-fd60c657101167b056177ae95aa2c695f14a93d4.tar.gz
kolla-fd60c657101167b056177ae95aa2c695f14a93d4.zip
Merge "Refactor httpd install to base image"
Diffstat (limited to 'docker/gnocchi')
-rw-r--r--docker/gnocchi/gnocchi-base/Dockerfile.j222
1 files changed, 3 insertions, 19 deletions
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2
index 217f73073..e20aefddf 100644
--- a/docker/gnocchi/gnocchi-base/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2
@@ -20,23 +20,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set gnocchi_base_packages = [
'gnocchi-common',
- 'httpd',
- 'mod_ssl',
'python3-boto3',
'python3-cradox',
'python3-ldappool',
- 'python3-mod_wsgi'
] %}
{{ macros.install_packages(gnocchi_base_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_package_type == 'deb' %}
{% set gnocchi_base_packages = [
- 'apache2',
'build-essential',
'gnocchi-common',
- 'libapache2-mod-wsgi-py3',
'librados-dev',
'python3-boto3',
'python3-dev',
@@ -51,19 +44,15 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
] %}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
-RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages"), constraints=false, pip_version="pip3") }} \
- && truncate -s 0 /etc/apache2/ports.conf
+RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages"), constraints=false, pip_version="pip3") }}
{% endif %}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set gnocchi_base_packages = [
- 'httpd',
'librados2-devel',
- 'mod_ssl',
- 'python3-ldappool',
- 'python3-mod_wsgi'
+ 'python3-ldappool'
] %}
# on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le
@@ -77,14 +66,10 @@ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages
{% endif %}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/gnocchi \
- && 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
+RUN mkdir -p /var/www/cgi-bin/gnocchi
{% elif base_package_type == 'deb' %}
{% set gnocchi_base_packages = [
- 'apache2',
- 'libapache2-mod-wsgi-py3',
'librados-dev',
'python3-ldappool'
] %}
@@ -100,7 +85,6 @@ RUN mkdir -p /var/www/cgi-bin/gnocchi \
{% endif %}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
-RUN truncate -s 0 /etc/apache2/ports.conf
{% endif %}
ADD gnocchi-base-archive /gnocchi-base-source