Mercurial > code > home > repos > homeauto

changeset 772:2500a3ee9102

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
xidle build Ignore-this: b758e06eb8f95839975c45ab2279d734
author drewp@bigasterisk.com
date Sun, 28 Jun 2020 14:03:10 -0700
parents 3f6055cfccb2
children bc3516d02762
files service/xidle/Dockerfile service/xidle/Dockerfile.x86 service/xidle/serv.n3 service/xidle/tasks.py service/xidle/xidle.py
diffstat 5 files changed, 73 insertions(+), 52 deletions(-) [+]
line wrap: on
line diff
--- a/service/xidle/Dockerfile	Fri Jun 05 17:49:56 2020 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-FROM bang6:5000/base_x86
-
-RUN apt-get install --yes libxss-dev
-
-COPY requirements.txt ./
-RUN pip3 install --index-url https://projects.bigasterisk.com/ --extra-index-url https://pypi.org/simple -r requirements.txt
-# not sure why this doesn't work from inside requirements.txt
-RUN pip3 install -U 'https://github.com/drewp/cyclone/archive/python3.zip?v3'
-
-COPY *.py ./
-
-EXPOSE 9107
-
-CMD [ "python3", "./xidle.py" ]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/service/xidle/Dockerfile.x86	Sun Jun 28 14:03:10 2020 -0700
@@ -0,0 +1,14 @@
+FROM bang6:5000/base_x86
+
+RUN apt-get install --yes libxss-dev
+
+COPY requirements.txt ./
+RUN pip3 install --index-url https://projects.bigasterisk.com/ --extra-index-url https://pypi.org/simple -r requirements.txt
+# not sure why this doesn't work from inside requirements.txt
+RUN pip3 install -U 'https://github.com/drewp/cyclone/archive/python3.zip?v3'
+
+COPY *.py ./
+
+EXPOSE 9107
+
+CMD [ "python3", "./xidle.py" ]
--- a/service/xidle/serv.n3	Fri Jun 05 17:49:56 2020 -0700
+++ b/service/xidle/serv.n3	Sun Jun 28 14:03:10 2020 -0700
@@ -2,15 +2,11 @@
 @prefix auth: <http://bigasterisk.com/ns/serv/auth#> .
 @prefix serv: <http://bigasterisk.com/services/> .
 
-
-serv:xidle a :Service;
-      :path "/xidle/";
-      :openid auth:admin;
-      :serverHost "bang";
+serv:xidle_x86 a :DockerImage;
       :internalPort 9107;
       :prodDockerFlags (
-      "-p" "9107:9107"
-      "--net=host"
+        "-p" "9107:9107"
+        "--net=host"
       );
       :localDockerFlags (
         "-v" "`pwd`:/opt"
@@ -18,6 +14,24 @@
       :localRunCmdline (
         "python3" "xidle.py" "-v"
       );
-      :dockerFile "Dockerfile"
-.
+      :dockerFile "Dockerfile.x86" .
+  
+serv:xidle_pi a :DockerImage;
+      :internalPort 9107;
+      :prodDockerFlags (
+        "-p" "9107:9107"
+        "--net=host"
+      );
+      :localDockerFlags (
+        "-v" "`pwd`:/opt"
+      );
+      :localRunCmdline (
+        "python3" "xidle.py" "-v"
+      );
+      :dockerFile "Dockerfile.pi" .
 
+serv:xidle_dash       a :Service; :path "/xidle/dash/";     :openid auth:admin; :serverHost "dash";      :image serv:xidle_x86 .
+serv:xidle_slash      a :Service; :path "/xidle/slash/";    :openid auth:admin; :serverHost "slash";     :image serv:xidle_x86 .
+serv:xidle_plus       a :Service; :path "/xidle/plus/";     :openid auth:admin; :serverHost "plus";      :image serv:xidle_x86 .
+serv:xidle_frontdoor  a :Service; :path "/xidle/frontdoor"; :openid auth:admin; :serverHost "frontdoor"; :image serv:xidle_pi .
+
--- a/service/xidle/tasks.py	Fri Jun 05 17:49:56 2020 -0700
+++ b/service/xidle/tasks.py	Sun Jun 28 14:03:10 2020 -0700
@@ -1,33 +1,40 @@
-from invoke import task
-JOB = 'xidle'
-PORT = 9107
-TAG_x86 = f'bang6:5000/{JOB.lower()}_x86:latest'
-TAG_pi = f'bang6:5000/{JOB.lower()}_pi:latest'
-ANSIBLE_TAG = 'homeauto_xidle'
+from invoke import task, Collection
+import sys
+sys.path.append('/my/proj/release')
+from serv_tasks import serv_tasks
 
-@task
-def build_image_x86(ctx):
-    ctx.run(f'docker build --network=host -t {TAG_x86} .')
-@task
-def build_image_pi(ctx):
-    ctx.run(f'docker build --file Dockerfile.pi --network=host -t {TAG_pi} .')
+ns = Collection()
+serv_tasks(ns, 'serv.n3', 'xidle_dash')
+
+if 0:
+
+    TAG_x86 = f'bang6:5000/{JOB.lower()}_x86:latest'
+    TAG_pi = f'bang6:5000/{JOB.lower()}_pi:latest'
+    ANSIBLE_TAG = 'homeauto_xidle'
 
-@task(pre=[build_image_x86])
-def push_image_x86(ctx):
-    ctx.run(f'docker push {TAG_x86}')
-@task(pre=[build_image_pi])
-def push_image_pi(ctx):
-    ctx.run(f'docker push {TAG_pi}')
+    @task
+    def build_image_x86(ctx):
+        ctx.run(f'docker build --network=host -t {TAG_x86} .')
+    @task
+    def build_image_pi(ctx):
+        ctx.run(f'docker build --file Dockerfile.pi --network=host -t {TAG_pi} .')
 
-@task(pre=[build_image_x86])
-def shell(ctx):
-    ctx.run(f'docker run --rm -it --cap-add SYS_PTRACE -v /tmp/.X11-unix/:/tmp/.X11-unix/ -v /home/drewp/.Xauthority:/root/.Xauthority --net=host {TAG_x86} /bin/bash', pty=True)
+    @task(pre=[build_image_x86])
+    def push_image_x86(ctx):
+        ctx.run(f'docker push {TAG_x86}')
+    @task(pre=[build_image_pi])
+    def push_image_pi(ctx):
+        ctx.run(f'docker push {TAG_pi}')
 
-@task(pre=[build_image_x86])
-def local_run(ctx):
-    ctx.run(f'docker run --rm -it -v /tmp/.X11-unix/:/tmp/.X11-unix/ -v /home/drewp/.Xauthority:/root/.Xauthority -p {PORT}:{PORT} -v /etc/resolv.conf:/etc/resolv.conf --net=host {TAG_x86} python3 xidle.py -v', pty=True)
+    @task(pre=[build_image_x86])
+    def shell(ctx):
+        ctx.run(f'docker run --rm -it --cap-add SYS_PTRACE -v /tmp/.X11-unix/:/tmp/.X11-unix/ -v /home/drewp/.Xauthority:/root/.Xauthority --net=host {TAG_x86} /bin/bash', pty=True)
 
-@task(pre=[push_image_x86, push_image_pi])
-def redeploy(ctx):
-    ctx.run(f'sudo /my/proj/ansible/playbook -t {ANSIBLE_TAG}')
-    #ctx.run(f'supervisorctl -s http://bang:9001/ restart {JOB}_{PORT}')
+    @task(pre=[build_image_x86])
+    def local_run(ctx):
+        ctx.run(f'docker run --rm -it -v /tmp/.X11-unix/:/tmp/.X11-unix/ -v /home/drewp/.Xauthority:/root/.Xauthority -p {PORT}:{PORT} -v /etc/resolv.conf:/etc/resolv.conf --net=host {TAG_x86} python3 xidle.py -v', pty=True)
+
+    @task(pre=[push_image_x86, push_image_pi])
+    def redeploy(ctx):
+        ctx.run(f'sudo /my/proj/ansible/playbook -t {ANSIBLE_TAG}')
+        #ctx.run(f'supervisorctl -s http://bang:9001/ restart {JOB}_{PORT}')
--- a/service/xidle/xidle.py	Fri Jun 05 17:49:56 2020 -0700
+++ b/service/xidle/xidle.py	Sun Jun 28 14:03:10 2020 -0700
@@ -20,7 +20,7 @@
 ROOM = Namespace("http://projects.bigasterisk.com/room/")
 
 host = socket.gethostname()
-client = InfluxDBClient('bang6', 9060, 'root', 'root', 'main')
+client = InfluxDBClient('bang5', 9060, 'root', 'root', 'main')
 
 os.environ['DISPLAY'] = ':0.0'