# HG changeset patch
# User drewp <drewp@bigasterisk.com>
# Date 1581617962 28800
# Node ID 4c0324fc2192beb15636fec0e698efb7d9a4448a
# Parent  33076ad439d1f67134bf6f71b2b6afcfe9e898c5
build updates

Ignore-this: 778aa92957159f60aa3b1c75d1a51dfd

darcs-hash:ac9133e5a37d5acf8b0777806f4ccb9ee9fd1239

diff -r 33076ad439d1 -r 4c0324fc2192 service/dhcpleases/serv.n3
--- a/service/dhcpleases/serv.n3	Thu Feb 13 10:17:54 2020 -0800
+++ b/service/dhcpleases/serv.n3	Thu Feb 13 10:19:22 2020 -0800
@@ -2,3 +2,23 @@
 @prefix auth: <http://bigasterisk.com/ns/serv/auth#> .
 @prefix serv: <http://bigasterisk.com/services/> .
 
+
+serv:dhcpLeases a :Service;
+      :path "/dhcpLeases/";
+      :openid auth:admin;
+      :serverHost "bang";
+      :internalPort 9073;
+      :prodDockerFlags (
+        "-p" "9073:9073"
+        "--net=host"
+        "-v" "/opt/dnsmasq:/opt/dnsmasq"
+      );
+      :localDockerFlags (
+        "-v" "`pwd`:/opt"
+      );
+      :localRunCmdline (
+        "python3" "dhcpLeases.py" "-v"
+      );
+      :dockerFile "Dockerfile"
+.
+
diff -r 33076ad439d1 -r 4c0324fc2192 service/dhcpleases/tasks.py
--- a/service/dhcpleases/tasks.py	Thu Feb 13 10:17:54 2020 -0800
+++ b/service/dhcpleases/tasks.py	Thu Feb 13 10:19:22 2020 -0800
@@ -1,27 +1,7 @@
-from invoke import task
-
-JOB = 'dhcpleases'
-PORT = 9073
-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(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} --net=host -v /opt/dnsmasq:/opt/dnsmasq {TAG} python3 dhcpleases.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', 'dhcpLeases')