Dockerise + move to python3 #14

HugoDelval · 2017-10-02T14:19:54Z

This PR:

Is built on top of Move spamhaus to postgresql #13 (need to merge Move spamhaus to postgresql #13 first)
Makes the deployment of the app easier by using docker
Moves the app from python 2.7 to python 3.6
Adds the first_seen time + the report cause to the spamhaus DB

coveralls · 2017-10-04T14:49:46Z

Coverage increased (+0.1%) to 63.87% when pulling b49b802 on HugoDelval:dockerise into e6e019e on ovh:devel.

coveralls · 2017-10-05T09:48:20Z

Coverage increased (+0.1%) to 63.87% when pulling 0fc1017 on HugoDelval:dockerise into e6e019e on ovh:devel.

coveralls · 2017-10-05T09:50:23Z

Coverage increased (+0.1%) to 63.87% when pulling 2e01af1 on HugoDelval:dockerise into e6e019e on ovh:devel.

coveralls · 2017-10-05T10:06:47Z

Coverage increased (+0.1%) to 63.87% when pulling 5b73ce7 on HugoDelval:dockerise into e6e019e on ovh:devel.

PandiPanda69 · 2017-10-05T14:34:37Z

Dockerfile

@@ -0,0 +1,20 @@
+FROM alpine:latest


Are you running everything as root ?

Yes I was :/

PandiPanda69 · 2017-10-05T14:38:04Z

README.md

-You can now insert theses entries in your favorite scheduler:
+Inside the docker, the following scripts are running:
+
+ * `reputation-rbl.sh` runs every 2 hours.


It is not what is written in the crontab

Thanks, fixed here: 119a079

coveralls · 2017-10-05T15:33:59Z

Coverage increased (+0.1%) to 63.87% when pulling 1e06358 on HugoDelval:dockerise into e6e019e on ovh:devel.

coveralls · 2017-10-05T16:23:55Z

Coverage increased (+0.1%) to 63.87% when pulling e1a758a on HugoDelval:dockerise into e6e019e on ovh:devel.

coveralls · 2017-10-06T07:42:50Z

Coverage increased (+0.1%) to 63.87% when pulling 62790fc on HugoDelval:dockerise into e6e019e on ovh:devel.

coveralls · 2017-10-06T11:02:19Z

Coverage increased (+0.1%) to 63.87% when pulling 119a079 on HugoDelval:dockerise into e6e019e on ovh:devel.

coveralls · 2017-10-06T14:10:01Z

Coverage increased (+0.1%) to 63.87% when pulling 71cdefd on HugoDelval:dockerise into e6e019e on ovh:devel.

PandiPanda69 · 2017-10-06T14:13:08Z

Thanks a lot 👍

HugoDelval and others added 18 commits October 4, 2017 16:30

refactor(all): move project to python3

91aafc2

feat(deploy): add Dockerfile and deploy scripts

ff85be1

docs(README): explain how to build/launch the docker image

01ac749

fix(api): error 500 when empty result

b7fbb1e

fix(docker): add certificates for wget

8e7f25a

fix(fbl-parser): decode bytes before processing

27b629c

refactor(copyright): copyright year++

23f34e2

feat(deploy): activate fbl daemon

a658969

feat(settings): load config from vault if available

4ac8107

refactor(settings): put all env var in a config file

5943925

refactor(settings): move the secret_manager in the config dir

2b88995

fix(deploy): wrong path in docker run

3157bd4

fix(settings): wrong variable names

7e306a4

fix(deploy): adjust crontab parameters

3412ac9

refactor(settings): remove vault

a4e79da

feat(Dockerfile): improve logging

2f0ad08

feat(spamhaus): add first_seen time and cause to DB

db014a8

docs(vault): remove vault from docs

c650ef0

HugoDelval force-pushed the dockerise branch from 9501aab to c650ef0 Compare October 4, 2017 14:37

fix(test): add spam cause to test as well

b49b802

HugoDelval and others added 6 commits October 5, 2017 10:08

feat(deploy): add marathon config file

b794911

fix(deploy): mv marathon.json and Docker to project root

40f771a

fix(crontab): run rbls at 4am

942a05e

refactor(*): remove 'coding utf8' for python3 files

0b389ff

feat(ips): script to fetch IPs owned by a given AS

80be3b1

refactor(deploy): remove marathon file

0fc1017

fix(crontab): add nl at the end of crontab file

2e01af1

docs(deploy): explain the purpose of the exit-event-listener script

5b73ce7

PandiPanda69 suggested changes Oct 5, 2017

View reviewed changes

HugoDelval and others added 4 commits October 6, 2017 09:39

fix(dist): add deploy files to dist

b9fac7e

docs(build): fix documentation build

cf3c5cb

fix(requirements): mongodb library version

df1b06e

fix(deploy): launch scripts as non-root

62790fc

HugoDelval force-pushed the dockerise branch from e1a758a to 62790fc Compare October 6, 2017 07:41

docs(README): fix crontab doc

119a079

fix(Makefile): unexisting file from dist

71cdefd

PandiPanda69 merged commit 31b3d5c into ovh:devel Oct 6, 2017

HugoDelval deleted the dockerise branch October 7, 2017 18:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dockerise + move to python3 #14

Dockerise + move to python3 #14

HugoDelval commented Oct 2, 2017

coveralls commented Oct 4, 2017

coveralls commented Oct 5, 2017

coveralls commented Oct 5, 2017

coveralls commented Oct 5, 2017

PandiPanda69 Oct 5, 2017

HugoDelval Oct 6, 2017

PandiPanda69 Oct 5, 2017

HugoDelval Oct 6, 2017

coveralls commented Oct 5, 2017

coveralls commented Oct 5, 2017

coveralls commented Oct 6, 2017

coveralls commented Oct 6, 2017

coveralls commented Oct 6, 2017

PandiPanda69 commented Oct 6, 2017

Dockerise + move to python3 #14

Dockerise + move to python3 #14

Conversation

HugoDelval commented Oct 2, 2017

coveralls commented Oct 4, 2017

coveralls commented Oct 5, 2017

coveralls commented Oct 5, 2017

coveralls commented Oct 5, 2017

PandiPanda69 Oct 5, 2017

Choose a reason for hiding this comment

HugoDelval Oct 6, 2017

Choose a reason for hiding this comment

PandiPanda69 Oct 5, 2017

Choose a reason for hiding this comment

HugoDelval Oct 6, 2017

Choose a reason for hiding this comment

coveralls commented Oct 5, 2017

coveralls commented Oct 5, 2017

coveralls commented Oct 6, 2017

coveralls commented Oct 6, 2017

coveralls commented Oct 6, 2017

PandiPanda69 commented Oct 6, 2017