Mercurial > code > home > repos > homeauto

changeset 1570:56188eac38b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docker and build fixes Ignore-this: c96190ad1270cbc133e5c9e3c8218cb8 darcs-hash:3611563f6a7e29fe1a429c544ec687279a567b5b
author drewp <drewp@bigasterisk.com>
date Sat, 02 May 2020 15:08:12 -0700
parents a04ed4b3d5dd
children fd94061db75c
files service/mqtt_to_rdf/.dockerignore service/mqtt_to_rdf/Dockerfile service/mqtt_to_rdf/serv.n3
diffstat 3 files changed, 22 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/service/mqtt_to_rdf/.dockerignore	Sat May 02 15:08:12 2020 -0700
@@ -0,0 +1,5 @@
+.devcontainer
+.mypy_cache
+.pytype
+.vscode
+node_modules
--- a/service/mqtt_to_rdf/Dockerfile	Sat May 02 15:07:03 2020 -0700
+++ b/service/mqtt_to_rdf/Dockerfile	Sat May 02 15:08:12 2020 -0700
@@ -3,6 +3,9 @@
 WORKDIR /opt
 
 COPY requirements.txt ./
+RUN pip3 install -U pip
+RUN pip3 uninstall --yes enum34
+
 RUN pip3 install --index-url https://projects.bigasterisk.com/ --extra-index-url https://pypi.org/simple -r requirements.txt
 RUN pip3 install -U 'https://github.com/drewp/cyclone/archive/python3.zip?v3'
 
--- a/service/mqtt_to_rdf/serv.n3	Sat May 02 15:07:03 2020 -0700
+++ b/service/mqtt_to_rdf/serv.n3	Sat May 02 15:08:12 2020 -0700
@@ -2,23 +2,26 @@
 @prefix auth: <http://bigasterisk.com/ns/serv/auth#> .
 @prefix serv: <http://bigasterisk.com/services/> .
 
-serv:mqtt_to_rdf a :Service;
-      :path "/mqtt_to_rdf/";
-      :openid auth:admin;
-      :serverHost "bang";
+serv:mqtt_to_rdf_image a :DockerImage;
       :internalPort 10018;
       :prodDockerFlags (
-      "-p" "10018:10018"
       "--net=host");
-      :localDockerFlags (
+      :localRunDockerFlags (
         "-v" "`pwd`:/opt"
-        "-v" "/my/proj/homeauto/lib:/lib_src"
+#        "-v" "/my/proj/homeauto/lib:/lib_src"
       );
       :localRunCmdline (
-      
-      "python3" "mqtt_to_rdf.py" "-v"
-#"--cs" "living"
-);
+        "python3" "mqtt_to_rdf.py" "-v"
+        "--cs" "frontdoor"
+      );
       :dockerFile "Dockerfile"
 .
 
+serv:mqtt_to_rdf a :Service;
+      :path "/mqtt_to_rdf/";
+      :port 10018;
+      :openid auth:admin;
+      :serverHost "bang";
+      :image serv:mqtt_to_rdf_image
+.
+