changeset 1535:44bf18ee9555

build update Ignore-this: 4c77cd130fa6eacfa60a99cb120e9c51 darcs-hash:8b6f0860bf3bf110fc35fc71d95c762a60ba7884
author drewp <drewp@bigasterisk.com>
date Mon, 10 Feb 2020 00:02:18 -0800
parents df80deeef113
children 2e61abb70323
files service/powerEagle/serv.n3 service/powerEagle/tasks.py
diffstat 2 files changed, 7 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- 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"
--- 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')