From 329c0f92cc2bcc9069dec938c9d866e098d4764f Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Fri, 28 Oct 2016 16:50:05 +0100
Subject: [PATCH] ui: Implementing deploy

---
 docker-compose.yml | 13 +++++++++++++
 local-compose.yml  | 10 ++++++++++
 ui/Makefile        |  3 ++-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 141140c1..a895adff 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,3 +44,16 @@ frontend:
     - PORT=8000
   ports:
     - 8000:8000
+#############################################################################
+#  Frontend
+#############################################################################
+ui:
+  image: quay.io/yldio/joyent-dashboard-ui:latest
+  mem_limit: 128m
+  labels:
+    - triton.cns.services=ui
+  env_file: .env
+  environment:
+    - PORT=8080
+  ports:
+    - 8080:8080
diff --git a/local-compose.yml b/local-compose.yml
index 7c2fb1f6..3877dc4f 100644
--- a/local-compose.yml
+++ b/local-compose.yml
@@ -26,3 +26,13 @@ frontend:
     - PORT=8000
     - ROOT_URL=http://localhost:8000
     - CONSUL=consul
+ui:
+  extends:
+    file: docker-compose.yml
+    service: ui
+  build: ./ui
+  links:
+    - consul:consul
+  environment:
+    - PORT=8080
+    - CONSUL=consul
diff --git a/ui/Makefile b/ui/Makefile
index d655f296..fba1928d 100644
--- a/ui/Makefile
+++ b/ui/Makefile
@@ -1,3 +1,4 @@
+PORT=8080
 bindir := $(shell yarn bin)
 AVA := $(bindir)/ava
 NYC := $(bindir)/nyc
@@ -18,7 +19,7 @@ install: install-embed-markdown-loader
 
 .PHONY: start
 start:
-	$(ST) -p 8080 -d src/ --no-dot -a 7200000
+	$(ST) -p $(PORT) -d src/ --no-dot -a 7200000
 	
 .PHONY: install-production
 install-production: install-embed-markdown-loader