diff service/tinyScreen/makefile @ 459:a471688fb7b7

build updates. turn off output speed override for now Ignore-this: 81c155e3c11cbad6ec28d22df255d6d5
author drewp@bigasterisk.com
date Sat, 20 Apr 2019 23:31:16 -0700
parents 5fc79536885a
children
line wrap: on
line diff
--- a/service/tinyScreen/makefile	Sat Apr 20 23:30:31 2019 -0700
+++ b/service/tinyScreen/makefile	Sat Apr 20 23:31:16 2019 -0700
@@ -1,12 +1,13 @@
 JOB=tiny_screen
 PORT=10013
+RUNHOST=frontdoor
 
 TAG=bang6:5000/${JOB}_x86:latest
 TAG_PI=bang6:5000/${JOB}_pi:latest
 
-push_x86:
+push_x86: build_x86
 	docker push ${TAG}
-push_pi:
+push_pi: build_pi
 	docker push ${TAG_PI}
 
 build_x86:
@@ -14,23 +15,24 @@
 	mkdir -p tmp_ctx
 	cp -a Dockerfile ../../lib/*.py *.py *.txt *.html anim font tmp_ctx
 	docker build --network=host -t ${TAG} tmp_ctx
-	rm -rf tmp_ctx
-
-build_image: build_x86 push_x86
 
 build_pi:
 	rm -rf tmp_ctx
 	mkdir -p tmp_ctx
 	cp -a Dockerfile.pi ../../lib/*.py *.py *.txt *.html anim font tmp_ctx
 	docker build -f Dockerfile.pi --network=host -t ${TAG_PI} tmp_ctx
-	rm -rf tmp_ctx
 
 build_image_pi: build_pi push_pi
 
-shell:
-	docker run --rm -it --cap-add SYS_PTRACE --net=host $(TAG) /bin/sh
+shell: build_x86
+	docker run --rm -it --name=$(JOB)_shell --cap-add SYS_PTRACE --net=host $(TAG) /bin/sh
 
 local_run: build_x86
-	docker run --rm -it --net=host -e DISPLAY=$(DISPLAY) -e HOME=$(HOME) -v $(HOME):$(HOME) -v /tmp/.X11-unix:/tmp/.X11-unix -v `pwd`/index.html:/opt/index.html bang6:5000/tiny_screen_x86:latest python ./tiny_screen.py -v -x
+	docker run --rm -it --net=host --name=$(JOB)_local -e DISPLAY=$(DISPLAY) -e HOME=$(HOME) -v $(HOME):$(HOME) -v /tmp/.X11-unix:/tmp/.X11-unix -v `pwd`/index.html:/opt/index.html bang6:5000/tiny_screen_x86:latest python ./tiny_screen.py -v -x
 
 # try pi kernel 20181112-1
+fresh_sudo:
+	sudo -v
+redeploy: fresh_sudo push_pi
+	sudo /my/proj/ansible/playbook -l $(RUNHOST) -t tiny_screen
+	supervisorctl -s http://$(RUNHOST):9001/ restart $(JOB)_$(PORT)