# HG changeset patch # User drewp # Date 1554634731 25200 # Node ID d8aa414f21d98b44179ac244b0a2efc92f599d8b # Parent c02ac623e59318dfff5608d1d50a63673107b6e6 py3, rfid-console rename Ignore-this: 1b28d912e8847685a87c0c9ccb703608 darcs-hash:1812ff3e65cffea158d10f03e565942a684b4bd4 diff -r c02ac623e593 -r d8aa414f21d9 service/rfid_pn532_py/Dockerfile.pi --- a/service/rfid_pn532_py/Dockerfile.pi Sun Apr 07 03:58:05 2019 -0700 +++ b/service/rfid_pn532_py/Dockerfile.pi Sun Apr 07 03:58:51 2019 -0700 @@ -1,13 +1,13 @@ FROM bang6:5000/base_pi WORKDIR /opt -RUN apt-get install -y libnfc5 libfreefare0 libnfc-dev libfreefare-dev -RUN apt-get install -y python3-nose2 +RUN apt-get install -y libnfc5 libfreefare0 libnfc-dev libfreefare-dev python3-nose2 libffi-dev COPY pyfreefare-build-pi ./pyfreefare-build COPY requirements.txt . -RUN pip3 install -r requirements.txt -RUN pip3 install -v -U 'https://github.com/drewp/cyclone/archive/python3.zip' +RUN pip3 install -Ur 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' COPY *.py *.html ./ diff -r c02ac623e593 -r d8aa414f21d9 service/rfid_pn532_py/Dockerfile.x86 --- a/service/rfid_pn532_py/Dockerfile.x86 Sun Apr 07 03:58:05 2019 -0700 +++ b/service/rfid_pn532_py/Dockerfile.x86 Sun Apr 07 03:58:51 2019 -0700 @@ -7,6 +7,7 @@ COPY requirements.txt . RUN pip3 install -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' COPY *.py *.html ./ diff -r c02ac623e593 -r d8aa414f21d9 service/rfid_pn532_py/index.html --- a/service/rfid_pn532_py/index.html Sun Apr 07 03:58:05 2019 -0700 +++ b/service/rfid_pn532_py/index.html Sun Apr 07 03:58:51 2019 -0700 @@ -31,8 +31,26 @@ }; + - + + +

+ /stats/ + /graph + /graph/events + (post) /output + (post) /rewrite +

diff -r c02ac623e593 -r d8aa414f21d9 service/rfid_pn532_py/makefile --- a/service/rfid_pn532_py/makefile Sun Apr 07 03:58:05 2019 -0700 +++ b/service/rfid_pn532_py/makefile Sun Apr 07 03:58:51 2019 -0700 @@ -37,12 +37,14 @@ docker push bang6:5000/$(SERVICE)_pi:latest run_local_x86: build_image_x86 - docker run -it --rm --privileged --net=host --cap-add=SYS_PTRACE --name $(JOB)_run bang6:5000/$(SERVICE)_x86:latest python3 rfid.py -v + docker run -it --rm --privileged --net=host --hostname=testhost --cap-add=SYS_PTRACE --name $(JOB)_run bang6:5000/$(SERVICE)_x86:latest python3 rfid.py -v # test on pi: # docker pull bang6:5000/rfid_pn532_py_pi:latest && docker run -it --rm --privileged --name rfid_shell bang6:5000/rfid_pn532_py_pi:latest nose2-3 tags_test -redeploy: build_image_pi +fresh_sudo: + sudo -v +redeploy: fresh_sudo build_image_pi sudo /my/proj/ansible/playbook -l $(RUNHOST) -t rfid supervisorctl -s http://$(RUNHOST):9001/ restart $(JOB)_$(PORT) diff -r c02ac623e593 -r d8aa414f21d9 service/rfid_pn532_py/requirements.txt --- a/service/rfid_pn532_py/requirements.txt Sun Apr 07 03:58:05 2019 -0700 +++ b/service/rfid_pn532_py/requirements.txt Sun Apr 07 03:58:51 2019 -0700 @@ -1,7 +1,7 @@ -cyclone docopt rdflib-jsonld==0.4.0 rdflib==4.2.2 https://projects.bigasterisk.com/rdfdb/rdfdb-0.7.0.tar.gz git+http://github.com/drewp/scales.git@448d59fb491b7631877528e7695a93553bfaaa93#egg=scales - +influxdb==3.0.0 +https://github.com/drewp/cyclone/archive/python3.zip diff -r c02ac623e593 -r d8aa414f21d9 service/rfid_pn532_py/rfid-console.html --- a/service/rfid_pn532_py/rfid-console.html Sun Apr 07 03:58:05 2019 -0700 +++ b/service/rfid_pn532_py/rfid-console.html Sun Apr 07 03:58:51 2019 -0700 @@ -4,7 +4,7 @@ - +