Commit Graph

101 Commits

Author SHA1 Message Date
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
Sebastian Waldbauer 34ee8032a1 Added entrypoint instead of hug
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-03 13:31:12 +01:00
Sebastian Waldbauer 50d5eb4def Combined some build steps
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-03 13:30:57 +01:00
Sebastian Waldbauer d94eee8c8b Changed logging dir from example_configs to intelmq_logs
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-03 13:30:34 +01:00
Sebastian Waldbauer 3af650a67e Added installation guide
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 16:40:53 +01:00
Sebastian Waldbauer 6d5a2aab34 Fixed publish & defaults
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 16:40:40 +01:00
Sebastian Waldbauer baf068b7b2 Added sudo to docker container
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 16:40:26 +01:00
Sebastian Waldbauer e3f2eb9756 Fixed paths
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 16:40:00 +01:00
Sebastian Waldbauer 1db1feb8ce Changed logging path
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 15:56:19 +01:00
Sebastian Waldbauer 4c01db1d9e Fixed relative paths
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 15:52:45 +01:00
Sebastian Waldbauer a32af49d12 Changed intelmq-full version tag
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 15:45:04 +01:00
Sebastian Waldbauer 44ba247057 Added BOTS
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 15:41:07 +01:00
Sebastian Waldbauer c41ae045d9 Added intelmq to example_config
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 15:40:31 +01:00
Sebastian Waldbauer cf9d2c9f88 Added intelmq-manager to example_config
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 15:40:11 +01:00
Sebastian Waldbauer cd02656587 Added redis config as example config
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 15:40:03 +01:00
Sebastian Waldbauer 5368f3424d Changed from absolute to relative paths
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 15:39:38 +01:00
Sebastian Waldbauer 282093dddb Changed compose
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 14:44:56 +01:00
Sebastian Waldbauer 08a44f654b Added docker-compose
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 12:19:01 +01:00
Sebastian Waldbauer 41f5fe9aaa Added build & publish
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 12:16:06 +01:00
Sebastian Waldbauer 1dcbb57be5 Added Dockerfile
Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
2020-11-02 12:12:02 +01:00