Mercurial > code > home > repos > homeauto
changeset 364:8bd4e310d6b0
include UI files in docker image
Ignore-this: eb7ab2dd03796403d442f31c3fb35baa
| author | drewp@bigasterisk.com |
|---|---|
| date | Sat, 22 Sep 2018 23:09:46 -0700 |
| parents | f1177213fe22 |
| children | cb3738b1a15a |
| files | service/tradfri/Dockerfile service/tradfri/makefile service/tradfri/tradfri.py |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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}),