From 5bdf514645e6ba603f813f299c68ff7fb12daa3c Mon Sep 17 00:00:00 2001
From: James Kirsch <generalfuzz@gmail.com>
Date: Thu, 30 Jul 2020 12:36:39 -0700
Subject: 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
---
 docker/cyborg/cyborg-api/Dockerfile.j2 | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

(limited to 'docker/cyborg')

diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2
index 611ed73cf..e071f7a73 100644
--- a/docker/cyborg/cyborg-api/Dockerfile.j2
+++ b/docker/cyborg/cyborg-api/Dockerfile.j2
@@ -12,29 +12,10 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}'  \
     && /bin/false
 
 {% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-        {% set cyborg_api_packages = [
-            'mod_ssl',
-            'python3-mod_wsgi'
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set cyborg_api_packages = [
-            'apache2',
-            'libapache2-mod-wsgi-py3'
-        ] %}
-    {% endif %}
-
-{% endif %}
 
+    {% set cyborg_api_packages = [
+    ] %}
 {{ macros.install_packages(cyborg_api_packages | customizable("packages")) }}
-
-{% if base_package_type == 'rpm' %}
-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' %}
-RUN echo > /etc/apache2/ports.conf
-
 {% endif %}
 
 COPY extend_start.sh /usr/local/bin/kolla_cyborg_extend_start
-- 
cgit v1.2.3