aboutsummaryrefslogtreecommitdiff
path: root/docker/qinling
diff options
context:
space:
mode:
authorJames Kirsch <generalfuzz@gmail.com>2020-07-30 12:36:39 -0700
committerMark Goddard <mark@stackhpc.com>2020-08-10 09:51:07 +0000
commit5bdf514645e6ba603f813f299c68ff7fb12daa3c (patch)
tree2bd0ed0e4f532575e59e646657afd33a0affe35d /docker/qinling
parent69092eb574222564fcd3ce752a41db7fe51d61b8 (diff)
downloadkolla-5bdf514645e6ba603f813f299c68ff7fb12daa3c.tar.gz
kolla-5bdf514645e6ba603f813f299c68ff7fb12daa3c.zip
Refactor httpd install to base image
Refactor installing and initial setup of httpd and mod wsgi from individual services to base image. Change-Id: I651a55a9ebe258ef403d33de010a4dfb368a4021
Diffstat (limited to 'docker/qinling')
-rw-r--r--docker/qinling/qinling-base/Dockerfile.j218
1 files changed, 4 insertions, 14 deletions
diff --git a/docker/qinling/qinling-base/Dockerfile.j2 b/docker/qinling/qinling-base/Dockerfile.j2
index 38aa61163..5faa4e914 100644
--- a/docker/qinling/qinling-base/Dockerfile.j2
+++ b/docker/qinling/qinling-base/Dockerfile.j2
@@ -19,30 +19,20 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% if base_package_type == 'rpm' %}
{% set qinling_base_packages = [
- 'httpd',
- 'mod_ssl',
- 'python3-ldappool',
- 'python3-mod_wsgi'
+ 'python3-ldappool'
] %}
-{{ macros.install_packages(qinling_base_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/qinling \
- && 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 qinling_base_packages = [
- 'apache2',
- 'libapache2-mod-wsgi-py3',
'python3-ldappool'
] %}
-{{ macros.install_packages(qinling_base_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/qinling \
- && echo > /etc/apache2/ports.conf
{% endif %}
+{{ macros.install_packages(qinling_base_packages | customizable("packages")) }}
+RUN mkdir -p /var/www/cgi-bin/qinling
+
ADD qinling-base-archive /qinling-base-source
{% set qinling_base_pip_packages = [