Merge "Add build from source for Horizon"

7 files changed, 46 insertions, 0 deletions

diff --git a/docker/centos/source/horizon/.buildinfo b/docker/centos/source/horizon/.buildinfo
new file mode 100644
index 000000000..79952ecc3
--- /dev/null
+++ b/docker/centos/source/horizon/.buildinfo
@@ -0,0 +1,10 @@
+# Build info specific to this image. All values can be overridden in .buildconf
+
+COMPONENT=horizon
+SOURCE_INSTALL_AVAILABLE=1
+
+# Used for git install method
+: ${CLONE_FROM:=https://github.com/openstack/horizon}
+
+# Used for curl install method
+: ${TARBALL_URI:=http://tarballs.openstack.org/horizon/horizon-master.tar.gz}
diff --git a/docker/centos/source/horizon/Dockerfile b/docker/centos/source/horizon/Dockerfile
new file mode 100644
index 000000000..96889c916
--- /dev/null
+++ b/docker/centos/source/horizon/Dockerfile
@@ -0,0 +1,31 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./horizon.tar /
+RUN ln -s /horizon-* /horizon
+
+RUN yum install -y \
+    httpd \
+    mod_wsgi \
+  && yum clean all
+
+# The chown is required because of this packaging bug:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1219006
+
+RUN cd /horizon \
+    && useradd --user-group horizon \
+    && pip install -r requirements.txt \
+    && pip install /horizon \
+    && mkdir -p /etc/openstack-dashboard /var/log/horizon /usr/share/openstack-dashboard/static \
+    && chown -R apache:apache /usr/share/openstack-dashboard/static \
+    && rm -rf /root/.cache
+
+# The chown is required because of this packaging bug:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1219006
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+COPY ./start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/horizon/build b/docker/centos/source/horizon/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/source/horizon/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/horizon/config-external.sh b/docker/centos/source/horizon/config-external.sh
new file mode 120000
index 000000000..19b799f7b
--- /dev/null
+++ b/docker/centos/source/horizon/config-external.sh
@@ -0,0 +1 @@
+../../../common/horizon/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/horizon/config-internal.sh b/docker/centos/source/horizon/config-internal.sh
new file mode 120000
index 000000000..82e83c796
--- /dev/null
+++ b/docker/centos/source/horizon/config-internal.sh
@@ -0,0 +1 @@
+../../../common/horizon/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/horizon/horizon-bug-1469284.patch b/docker/centos/source/horizon/horizon-bug-1469284.patch
new file mode 120000
index 000000000..32a745509
--- /dev/null
+++ b/docker/centos/source/horizon/horizon-bug-1469284.patch
@@ -0,0 +1 @@
+../../../common/horizon/horizon-bug-1469284.patch
\ No newline at end of file
diff --git a/docker/centos/source/horizon/start.sh b/docker/centos/source/horizon/start.sh
new file mode 120000
index 000000000..3c793e4f9
--- /dev/null
+++ b/docker/centos/source/horizon/start.sh
@@ -0,0 +1 @@
+../../../common/horizon/start.sh
\ No newline at end of file