# HG changeset patch # User drewp@bigasterisk.com # Date 1581321818 28800 # Node ID 4167101b816f39e3b14bfdcce4212dff8b8a1d43 # Parent 23b972df18567cc56a413bd0277dd5d6d1810637 build update, use logging lib Ignore-this: 4e8ca41fbac2056010d9b6d96d3cdfc7 diff -r 23b972df1856 -r 4167101b816f service/environment/environment.py --- 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): diff -r 23b972df1856 -r 4167101b816f service/environment/serv.n3 --- 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: . @prefix serv: . + +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" +. + diff -r 23b972df1856 -r 4167101b816f service/environment/tasks.py --- 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')