Feature/docker #785

dasrecht · 2017-12-29T10:26:27Z

Hi there 👋

As discussed during the chaos communication congress I used docker to deploy an ooni-probe.

I've added a bit of documentation around it, the only thing left would be adding this repository to the docker hub on the openobservatory organisation https://hub.docker.com/u/openobservatory/

The way I currently run will not persist any data on the host so every container start will start from scratch.

/b

…possibility to run the probe container persistant

coveralls · 2017-12-29T10:31:25Z

Coverage decreased (-0.05%) to 71.085% when pulling d560005 on dasrecht:feature/docker into 625268f on TheTorProject:master.

coveralls · 2017-12-29T13:01:59Z

Coverage decreased (-6.6%) to 64.488% when pulling 5cd773b on dasrecht:feature/docker into 625268f on TheTorProject:master.

coveralls · 2017-12-29T13:11:43Z

Coverage decreased (-6.6%) to 64.488% when pulling 5cd773b on dasrecht:feature/docker into 625268f on TheTorProject:master.

hellais · 2017-12-30T17:05:29Z

Re-starting travis to see if now that the klein patch is merged, the CI will succeed.

hellais · 2017-12-30T17:06:24Z

.coveragerc

@@ -1,4 +1,4 @@
 [run]
 source = ooni
 [report]
-omit = ooni/nettests/*, ooni/api/*, ooni/kit/*, ooni/contrib/*
+omit = ooni/nettests/*, ooni/api/*, ooni/kit/*, ooni/contrib/* Dockerfile docker-compose.yml README.rst


I think you don't need to add text files to test .coveragerc. Since those are not source files, it will already be ignored by coverage.py.

makes sense. will add a commit for that

hellais · 2017-12-30T17:06:52Z

README.rst

@@ -91,6 +91,28 @@ that you have the ``universe`` repository enabled. The ``universe`` repository
 is enabled by default in a standard Ubuntu installation but may not be on some
 minimal, or not standard, installations.

+On Docker::


I think you have an extra : in here.

hellais · 2017-12-30T17:07:46Z

README.rst

+  - Docker
+  - docker-compose
+
+You can pull the image from our Docker Hub


I think you need to put at the end of the line :: so that it considers this a code block (as opposed to inline code)

hellais · 2017-12-30T17:07:47Z

README.rst

+        docker run -p 8842:8842 -d openobservatory/ooni-probe:latest
+
+If you prefer to run the ooni-probe in a more persistent manner on your host
+you can add `--restart always` to the execution.


Here it's the same as above.

hellais · 2017-12-30T17:07:57Z

README.rst

+        docker run -p 8842:8842 --restart always -d openobservatory/ooni-probe:latest
+
+On the other hand you can also build the image on your local machine:
+


Here you are missing an extra :

hellais · 2017-12-30T17:08:43Z

docker-compose.yml

@@ -0,0 +1,7 @@
+version: '2'


I think given that it's just a single service we don't really need a docker-compose.yml file. We can just use plain docker or wrap the commands above in a shell script.

hellais · 2017-12-30T17:09:14Z

README.rst

+
+        git clone https://github.com/TheTorProject/ooni-probe.git
+        docker-compose build
+        docker-compose up


Can you replace these two commands with just vanilla docker (without docker-compose) and remove the docker-compose dependency in the above lines?

hellais

I would suggest we drop docker-compose as a dependency and left some other comments for nit-picks to fix before merging.

Thanks for hacking on this!

coveralls · 2017-12-30T17:18:30Z

Coverage decreased (-6.7%) to 64.53% when pulling d456c3f on dasrecht:feature/docker into 18a818b on TheTorProject:master.

…feature/docker

dasrecht · 2017-12-30T20:58:12Z

@hellais thanks for the review, updated as per your comments :)

TIL: writing reStructuredText - I'm way to used to markdown at the moment.

coveralls · 2017-12-30T21:02:21Z

Coverage decreased (-0.05%) to 71.134% when pulling e653d2e on dasrecht:feature/docker into 18a818b on TheTorProject:master.

coveralls · 2018-01-09T14:17:16Z

Coverage decreased (-0.05%) to 71.134% when pulling 0849243 on dasrecht:feature/docker into 2b06bcc on TheTorProject:master.

hellais · 2018-09-13T08:29:22Z

Issue moved to ooni/probe-legacy #16 via ZenHub

dasrecht added 4 commits December 28, 2017 21:21

adding docker-compose.yml and basic documentation to the readme

f4310cd

whitespace fix

1f09903

detach the container after starting

bc56ffd

adding --restart always option to the README.rst to give someone the …

d560005

…possibility to run the probe container persistant

dasrecht added 2 commits December 29, 2017 13:54

exclude Dockerfile and docker-compose.yml from coverage tests

9c14df1

also exclude README.rst from coverage tests

5cd773b

Merge branch 'master' into feature/docker

d456c3f

hellais reviewed Dec 30, 2017

View reviewed changes

hellais requested changes Dec 30, 2017

View reviewed changes

dasrecht added 4 commits December 30, 2017 21:37

remove docker specific files and readme from .coveragerc

d38b404

removing docker-compose.yml

e5e0f57

updataing README.rst as per discussion on github

f3a1505

Merge branch 'feature/docker' of github.com:dasrecht/ooni-probe into …

e653d2e

…feature/docker

Merge branch 'master' into feature/docker

0849243

hellais mentioned this pull request Sep 13, 2018

Feature/docker ooni/probe-legacy#16

Open

hellais closed this Sep 13, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/docker #785

Feature/docker #785

dasrecht commented Dec 29, 2017

coveralls commented Dec 29, 2017 •

edited

Loading

coveralls commented Dec 29, 2017 •

edited

Loading

coveralls commented Dec 29, 2017 •

edited

Loading

hellais commented Dec 30, 2017

hellais Dec 30, 2017

dasrecht Dec 30, 2017

hellais Dec 30, 2017

hellais Dec 30, 2017

hellais Dec 30, 2017

hellais Dec 30, 2017

hellais Dec 30, 2017

hellais Dec 30, 2017

hellais left a comment

coveralls commented Dec 30, 2017 •

edited

Loading

dasrecht commented Dec 30, 2017 •

edited

Loading

coveralls commented Dec 30, 2017 •

edited

Loading

coveralls commented Jan 9, 2018 •

edited

Loading

hellais commented Sep 13, 2018

		docker run -p 8842:8842 --restart always -d openobservatory/ooni-probe:latest

		On the other hand you can also build the image on your local machine:

Feature/docker #785

Feature/docker #785

Conversation

dasrecht commented Dec 29, 2017

coveralls commented Dec 29, 2017 • edited Loading

coveralls commented Dec 29, 2017 • edited Loading

coveralls commented Dec 29, 2017 • edited Loading

hellais commented Dec 30, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hellais left a comment

Choose a reason for hiding this comment

coveralls commented Dec 30, 2017 • edited Loading

dasrecht commented Dec 30, 2017 • edited Loading

coveralls commented Dec 30, 2017 • edited Loading

coveralls commented Jan 9, 2018 • edited Loading

hellais commented Sep 13, 2018

coveralls commented Dec 29, 2017 •

edited

Loading

coveralls commented Dec 29, 2017 •

edited

Loading

coveralls commented Dec 29, 2017 •

edited

Loading

coveralls commented Dec 30, 2017 •

edited

Loading

dasrecht commented Dec 30, 2017 •

edited

Loading

coveralls commented Dec 30, 2017 •

edited

Loading

coveralls commented Jan 9, 2018 •

edited

Loading