Add tripleo-ui image

Change-Id: Iaf3ecdce44d2bd88fb0132966ba9c786873dbd6a
Implements: blueprint tripleo-ui-undercloud-container
This commit is contained in:
Honza Pokorny 2017-10-02 09:50:21 -03:00
parent 2ef0bd51a9
commit 9b950f1a9b
5 changed files with 84 additions and 0 deletions

View File

@ -0,0 +1,59 @@
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_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% 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_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% 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_distro in ['debian', 'ubuntu'] %}
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 %}

View File

@ -0,0 +1,14 @@
#!/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
rm -rf /var/run/apache2/*
else
rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
fi
fi

View File

@ -625,6 +625,10 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/tempest/'
'tempest-master.tar.gz')},
'tripleo-ui': {
'type': 'url',
'location': ('$tarballs_base/tripleo-ui/'
'tripleo-ui-latest.tar.gz')},
'trove-base': {
'type': 'url',
'location': ('$tarballs_base/trove/'

View File

@ -137,6 +137,7 @@ SKIPPED_IMAGES = {
"senlin-base",
"solum-base",
"tacker-base",
"tripleo-ui",
"vitrage-base",
"vmtp",
"zaqar",
@ -144,6 +145,7 @@ SKIPPED_IMAGES = {
],
'ubuntu+source': [
"bifrost-base",
"tripleo-ui"
],
'debian+binary': [
"bifrost-base",
@ -165,6 +167,7 @@ SKIPPED_IMAGES = {
"sensu-base",
"solum-base",
"tacker-base",
"tripleo-ui",
"vitrage-base",
"vmtp",
"zaqar",
@ -173,6 +176,7 @@ SKIPPED_IMAGES = {
'debian+source': [
"bifrost-base",
"sensu-base",
"tripleo-ui"
],
'oraclelinux+binary': [
"bifrost-base",

View File

@ -0,0 +1,3 @@
---
features:
- Add tripleo-ui image