Merge "Remove tripleo-ui"

2 files changed, 0 insertions, 74 deletions

diff --git a/docker/tripleo-ui/Dockerfile.j2 b/docker/tripleo-ui/Dockerfile.j2
deleted file mode 100644
index b14e4dcaf..000000000
--- a/docker/tripleo-ui/Dockerfile.j2
+++ /dev/null
@@ -1,59 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block tripleo_ui_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-
-        {% set tripleo_ui_packages = [
-                'httpd',
-                'mod_ssl',
-                'openstack-tripleo-ui'
-
-        ] %}
-
-{{ macros.install_packages(tripleo_ui_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
-
-    {% else %}
-RUN echo 'tripleo-ui not yet available for {{ base_distro }}' && /bin/false
-    {% endif %}
-
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-        {% set tripleo_ui_packages = [
-                'httpd',
-                'mod_ssl',
-                'bzip2',
-                'nodejs'
-
-        ] %}
-
-{{ macros.install_packages(tripleo_ui_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' %}
-RUN echo 'tripleo-ui not yet available for {{ base_distro }}' && /bin/false
-    {% endif %}
-
-ADD tripleo-ui-archive /tripleo-ui-source
-RUN cd tripleo-ui-source/package \
-    && npm install \
-    && npm run build \
-    && mkdir -p /var/www/openstack-tripleo-ui \
-    && cp -rf dist /var/www/openstack-tripleo-ui/
-
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start
-
-{% block tripleo_ui_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/tripleo-ui/extend_start.sh b/docker/tripleo-ui/extend_start.sh
deleted file mode 100644
index 1277bea35..000000000
--- a/docker/tripleo-ui/extend_start.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Assume the service runs on top of Apache when user is root
-if [[ "$(whoami)" == 'root' ]]; then
-    # NOTE(pbourke): httpd will not clean up after itself in some cases which
-    # results in the container not being able to restart. (bug #1489676, 1557036)
-    if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
-        # Loading Apache2 ENV variables
-        . /etc/apache2/envvars
-        install -d /var/run/apache2/
-        rm -rf /var/run/apache2/*
-    else
-        rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
-    fi
-fi