# HG changeset patch # User drewp@bigasterisk.com # Date 1581321738 28800 # Node ID f7ec2463ff7903135f3d6ec0e2646c540bd75a15 # Parent e9366f73e612578f52747b39ecc46d27dae111d5 build update Ignore-this: 4c77cd130fa6eacfa60a99cb120e9c51 diff -r e9366f73e612 -r f7ec2463ff79 service/powerEagle/serv.n3 --- a/service/powerEagle/serv.n3 Mon Feb 10 00:01:39 2020 -0800 +++ b/service/powerEagle/serv.n3 Mon Feb 10 00:02:18 2020 -0800 @@ -14,6 +14,7 @@ ); :localDockerFlags ( "-v" "`pwd`:/opt" + #"-v" "/etc/resolv.conf:/etc/resolv.conf" # was in there before, but maybe the new dns settings are enough ); :localRunCmdline ( "python3" "reader.py" "-v" diff -r e9366f73e612 -r f7ec2463ff79 service/powerEagle/tasks.py --- a/service/powerEagle/tasks.py Mon Feb 10 00:01:39 2020 -0800 +++ b/service/powerEagle/tasks.py Mon Feb 10 00:02:18 2020 -0800 @@ -1,27 +1,7 @@ -from invoke import task - -JOB = 'powerEagle' -PORT = 10016 -TAG = f'bang6:5000/{JOB.lower()}_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(pre=[build_image]) -def shell(ctx): - ctx.run(f'docker run --rm -it --cap-add SYS_PTRACE --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 /etc/resolv.conf:/etc/resolv.conf --net=host {TAG} python3 reader.py -v', pty=True) - -@task(pre=[push_image]) -def redeploy(ctx): - ctx.run(f'sudo /my/proj/ansible/playbook -l bang -t {JOB}') - ctx.run(f'supervisorctl -s http://bang:9001/ restart {JOB}_{PORT}') +ns = Collection() +serv_tasks(ns, 'serv.n3', 'powerEagle')