Commit Graph

70 Commits

Author SHA1 Message Date
Einar Lanfranco
9ff46cb1e6 Wagner suggestions 2021-03-25 15:41:24 -03:00
Jeremias Pretto
b1c3677f90 2.3 compatibility 2021-03-23 15:44:44 -03:00
Jeremias Pretto
5fba132f9c hotfix 2021-03-23 15:19:03 -03:00
Einar Lanfranco
5f1e2c8f1c Develop guide md update 2021-03-23 13:05:21 -03:00
Einar Lanfranco
612bbb53e6 Develop guide md 2021-03-23 12:30:16 -03:00
Jeremias Pretto
77d05fbc1f Features:
- Support for bot development in intelmq 2.3.1 version
 - Add mail handler
 - Add start botnet at boot option
2021-03-23 11:57:27 -03:00
Einar Lanfranco
171a89a1a3 Adding Dockerfile to dev version 2021-03-23 10:08:27 -03:00
Sebastian Waldbauer
13fbc401a7 [FIX] Fixed path issues & added inspect-container
inspect-container.sh opens a new /bin/bash inside the container
to check files or other stuff like on normal linux maschines

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-03-05 13:44:11 +01:00
Sebastian Waldbauer
b23c60dda5 Updated submodules
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-03-05 13:43:37 +01:00
Sebastian Waldbauer
d06cd0de94 Updated submodules to intelmq 2.3.0 release
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-03-04 11:54:11 +01:00
Sebastian Waldbauer
54b490a846 Updated dependencies
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-02-19 09:07:56 +01:00
Sebastian Waldbauer
d9c0171aa2 Merge branch 'main' of https://github.com/certat/intelmq-docker into main 2021-02-04 11:40:31 +01:00
Sebastian Waldbauer
0959379801 Changed readme
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-02-04 11:40:15 +01:00
Sebastian Waldbauer
665d707cd2 [FIX] Path should now be correct
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-02-04 11:38:41 +01:00
Sebastian Waldbauer
1b5cd8f4b2 Merge pull request #2 from schacht-certat/schacht/fix-typos
DOC: fix typos
2021-02-04 11:04:36 +01:00
Sebastian Waldbauer
ac8808de5f [FIX] Added executeable bit to .sh
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-02-04 10:59:46 +01:00
Sebastian Waldbauer
3fc8106949 [FIX] Using networks instead of links
Docker links are deprecated, so we're using a recommended way.
Docker Networks!

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-02-04 09:41:09 +01:00
Sebastian Waldbauer
370b9f1798 Updated gitignore
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-02-04 09:40:58 +01:00
Sebastian Waldbauer
4cb88b3c58 Changed readme
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-01-29 10:16:01 +01:00
Sebastian Waldbauer
e50605fd26 Added manager gitrev to intelmq-full
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-01-29 10:14:46 +01:00
Sebastian Waldbauer
70744fba44 Fixed all related issues with bots
Every library should now be included!

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-01-29 10:03:33 +01:00
Sebastian Waldbauer
ffdb9002c0 Fixed to latest config changes
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-01-29 10:03:07 +01:00
Sebastian Waldbauer
efe1a423cc We dont have to copy html files
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-01-29 10:02:34 +01:00
Sebastian Waldbauer
9e90069aad Fixed docker-compose, no networks are used anymore
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-01-29 10:01:00 +01:00
Sebastian Waldbauer
23fa348319 [FIX] Exporting variables now
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-01-27 17:59:43 +01:00
Sebastian Waldbauer
35484688e7 Using git submodules instead of copying files
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-01-27 11:25:36 +01:00
Sebastian Waldbauer
263bd3cdaa Moved static ENV_VAR to entrypoint
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-01-27 10:30:24 +01:00
Birger Schacht
44f3eff9e2 DOC: fix typos 2021-01-25 09:19:03 +01:00
Sebastian Waldbauer
0082f38a2f [ENH] Updated IntelMQ-Full
Now we're using the api instead of the manager.
This is future proof & will be updated constantly.

Removed manager config & added api config

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>

[NGINX] Added default webserver (nginx)

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>

Updated intelmq-full docker image

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>

Changed build process

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>

Updated utils

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>

Fixed entrypoint

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>

Updated docker-compose

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>

Misc

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2021-01-24 15:19:04 +01:00
Sebastian Waldbauer
3a105d97bc Container build optimization
Better docker cache usage

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-12-17 13:11:47 +01:00
Sebastian Waldbauer
0d80353c3d Changed default docker-compose image
Now official image is used by default.

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-12-17 13:11:06 +01:00
Sebastian Waldbauer
438a1f34a9 Readable versions in docker image data
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-12-17 13:01:07 +01:00
Sebastian Waldbauer
8f72d5b36e keep intelmq_logs
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-12-17 13:00:47 +01:00
Sebastian Waldbauer
95159e685a Merge branch 'main' of https://github.com/certat/intelmq-docker into main 2020-11-12 17:21:19 +01:00
Sebastian Waldbauer
2be11ed488 Updated readme
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-12 17:20:57 +01:00
Sebastian Waldbauer
cf171e1dbe Update SECURITY.md 2020-11-12 17:20:38 +01:00
Sebastian Waldbauer
338af7f789 Update SECURITY.md 2020-11-12 17:19:25 +01:00
Sebastian Waldbauer
03bef7bb80 Create SECURITY.md 2020-11-12 17:18:14 +01:00
Sebastian Waldbauer
eb1473b069 Fixes move ticket from sebastian wagner
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-12 17:11:36 +01:00
Sebastian Waldbauer
3a3c9769b3 Fixes #5
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-12 15:06:24 +01:00
Sebastian Waldbauer
23d2310dcc Update readme
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-12 12:48:46 +01:00
Sebastian Waldbauer
c6ec8e39be Only available on 127.0.0.1
Fixes #1

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-12 12:47:50 +01:00
Sebastian Waldbauer
bb8eed7964 Position.conf fix
Fixes #2

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-12 12:47:15 +01:00
Sebastian Waldbauer
267264e6b4 More dockerish temporary container handle
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-06 15:17:28 +01:00
Sebastian Waldbauer
a8d249f7aa Changed readme
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-03 23:29:37 +01:00
Sebastian Waldbauer
69c6f4cdf4 Automated testing instances with /tests.sh
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-03 15:29:37 +01:00
Sebastian Waldbauer
8bedb5f891 Changed container builds, using entrypoint instead of direct hug
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-03 15:29:14 +01:00
Sebastian Waldbauer
32c29da927 Use nosetests3
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-03 15:28:52 +01:00
Sebastian Waldbauer
de9012c694 Fixed start param
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-03 13:50:29 +01:00
Sebastian Waldbauer
da87110651 Added test
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-03 13:31:27 +01:00