# HG changeset patch
# User drewp <drewp@bigasterisk.com>
# Date 1537682986 25200
# Node ID d9c2b59e760d4dc8a84b37388183eb33d3e4dc3a
# Parent  808503d8c5ccf61ccf384c44d15192e4dfccf48c
include UI files in docker image

Ignore-this: eb7ab2dd03796403d442f31c3fb35baa

darcs-hash:2878e42247cc0dbb1ed4474f5acd7a1e6c527d02

diff -r 808503d8c5cc -r d9c2b59e760d service/tradfri/Dockerfile
--- a/service/tradfri/Dockerfile	Sun Sep 09 04:06:59 2018 -0700
+++ b/service/tradfri/Dockerfile	Sat Sep 22 23:09:46 2018 -0700
@@ -7,6 +7,7 @@
 
 COPY pytradfri pytradfri
 COPY libcoap libcoap
+COPY static static
 COPY *.py req* ./
 
 EXPOSE 10009
diff -r 808503d8c5cc -r d9c2b59e760d service/tradfri/makefile
--- a/service/tradfri/makefile	Sun Sep 09 04:06:59 2018 -0700
+++ b/service/tradfri/makefile	Sat Sep 22 23:09:46 2018 -0700
@@ -6,7 +6,7 @@
 build_image:
 	rm -rf tmp_ctx
 	mkdir -p tmp_ctx
-	cp -a Dockerfile ../../lib/*.py *.py req* pytradfri libcoap tmp_ctx
+	cp -a Dockerfile ../../lib/*.py *.py req* pytradfri libcoap ../arduinoNode/static tmp_ctx
 	docker build --network=host -t ${TAG} tmp_ctx
 	docker push ${TAG}
 	rm -rf tmp_ctx
diff -r 808503d8c5cc -r d9c2b59e760d service/tradfri/tradfri.py
--- a/service/tradfri/tradfri.py	Sun Sep 09 04:06:59 2018 -0700
+++ b/service/tradfri/tradfri.py	Sat Sep 22 23:09:46 2018 -0700
@@ -177,8 +177,8 @@
     
     reactor.listenTCP(10009, cyclone.web.Application([
         (r"/()", cyclone.web.StaticFileHandler, {
-            "path": "../arduinoNode/static", "default_filename": "index.html"}),
-        (r'/static/(.*)', cyclone.web.StaticFileHandler, {"path": "../arduinoNode/static"}),
+            "path": "/opt/static", "default_filename": "index.html"}),
+        (r'/static/(.*)', cyclone.web.StaticFileHandler, {"path": "/opt/static"}),
         (r'/boards', Boards),
         (r"/graph", CycloneGraphHandler, {'masterGraph': masterGraph}),
         (r"/graph/events", CycloneGraphEventsHandler, {'masterGraph': masterGraph}),