Mercurial > code > home > repos > homeauto
changeset 1538:4857e22137c0
build update, use logging lib
Ignore-this: 4e8ca41fbac2056010d9b6d96d3cdfc7
darcs-hash:1540a8505acd2a2afda68f313bd0b434e284b795
| author | drewp <drewp@bigasterisk.com> |
|---|---|
| date | Mon, 10 Feb 2020 00:03:38 -0800 |
| parents | f119ed48194b |
| children | 8c410b493da4 |
| files | service/environment/environment.py service/environment/serv.n3 service/environment/tasks.py |
| diffstat | 3 files changed, 27 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/service/environment/environment.py Mon Feb 10 00:03:11 2020 -0800 +++ b/service/environment/environment.py Mon Feb 10 00:03:38 2020 -0800 @@ -66,12 +66,8 @@ -v Verbose """) - log.setLevel(logging.INFO) - if arg['-v']: - enableTwistedLog() - log.setLevel(logging.DEBUG) - defer.setDebugging(True) - + verboseLogging(arg['-v']) + masterGraph = PatchableGraph() class Application(cyclone.web.Application):
--- a/service/environment/serv.n3 Mon Feb 10 00:03:11 2020 -0800 +++ b/service/environment/serv.n3 Mon Feb 10 00:03:38 2020 -0800 @@ -2,3 +2,22 @@ @prefix auth: <http://bigasterisk.com/ns/serv/auth#> . @prefix serv: <http://bigasterisk.com/services/> . + +serv:environment a :Service; + :path "/environment/"; + :openid auth:admin; + :serverHost "bang"; + :internalPort 9075; + :prodDockerFlags ( + "-p" "9075:9075" + "--net=host" + ); + :localDockerFlags ( + "-v" "`pwd`:/opt" + ); + :localRunCmdline ( + "python3" "environment.py" "-v" + ); + :dockerFile "Dockerfile" +. +
--- a/service/environment/tasks.py Mon Feb 10 00:03:11 2020 -0800 +++ b/service/environment/tasks.py Mon Feb 10 00:03:38 2020 -0800 @@ -1,28 +1,7 @@ -from invoke import task - -JOB='environment' -PORT=9075 - -TAG=f'bang6:5000/{JOB}_x86:latest' - - - -@task -def build_image(ctx): - ctx.run(f'docker build --network=host -t {TAG} .') +from invoke import Collection +import sys +sys.path.append('/my/proj/release') +from serv_tasks import serv_tasks -@task(pre=[build_image]) -def push_image(ctx): - ctx.run(f'docker push {TAG}') - -@task -def shell(ctx): - ctx.run(f'docker run --rm -it --cap-add SYS_PTRACE -v `pwd`:/opt/homeauto_store --dns 10.2.0.1 --dns-search bigasterisk.com --net=host {TAG} /bin/bash', pty=True) - -@task(pre=[build_image]) -def local_run(ctx): - ctx.run(f'docker run --rm -it -p {PORT}:{PORT} -v `pwd`:/opt/homeauto_store --dns 10.2.0.1 --dns-search bigasterisk.com --net=host {TAG} python3 {JOB}.py -v', pty=True) - -@task(pre=[push_image]) -def redeploy(ctx): - ctx.run(f'supervisorctl -s http://bang:9001/ restart envgraph_{PORT}') +ns = Collection() +serv_tasks(ns, 'serv.n3', 'environment')