aboutsummaryrefslogtreecommitdiff
path: root/docker/panko
diff options
context:
space:
mode:
Diffstat (limited to 'docker/panko')
-rw-r--r--docker/panko/panko-base/Dockerfile.j225
1 files changed, 4 insertions, 21 deletions
diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2
index 1504b2a54..72023fcc1 100644
--- a/docker/panko/panko-base/Dockerfile.j2
+++ b/docker/panko/panko-base/Dockerfile.j2
@@ -13,46 +13,29 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{% set panko_base_packages = [
- 'httpd',
- 'mod_ssl',
'openstack-panko-common',
- 'python3-ldappool',
- 'python3-mod_wsgi'
+ 'python3-ldappool'
] %}
-{{ macros.install_packages(panko_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 panko_base_packages = [
- 'apache2',
- 'libapache2-mod-wsgi-py3'
] %}
-{{ macros.install_packages(panko_base_packages | customizable("packages")) }}
-RUN echo > /etc/apache2/ports.conf
{% endif %}
+
+{{ macros.install_packages(panko_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set panko_base_packages = [
- 'httpd',
- 'mod_ssl',
- 'python3-ldappool',
- 'python3-mod_wsgi'
+ 'python3-ldappool'
] %}
{{ macros.install_packages(panko_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 panko_base_packages = [
- 'apache2',
- 'libapache2-mod-wsgi-py3',
'python3-ldappool'
] %}
{{ macros.install_packages(panko_base_packages | customizable("packages")) }}
-RUN truncate -s 0 /etc/apache2/ports.conf
{% endif %}
ADD panko-base-archive /panko-base-source