MISP
/
misp-docker
mirror of https://github.com/MISP/misp-docker
2
0
Fork 0
Code Issues Releases Wiki Activity
203 Commits
3 Branches
0 Tags
3 MiB
Commit Graph

203 Commits (d2abf3d27bc3aa4cde19ed3e40076683adf144a4)

Author SHA1 Message Date
Steve Clement 6392f82ec8
Fix broken web/Dockerfile && web/run.sh (#25) 
Fix broken web/Dockerfile && web/run.sh
 2019-05-10 19:34:41 +09:00
Steve Clement 8da1596e93
Merge branch 'master' into master 2019-05-10 19:34:16 +09:00
Steve Clement 0775ae7a05
Typo in Dockerfile (#27) 
Typo in Dockerfile
 2019-05-10 19:33:00 +09:00
Oxeeql 558ad89ffa
Typo in Dockerfile 2019-05-08 13:03:09 +02:00
Sherif Eldeeb 19e37da633
Fix broken web/run.sh 
An unmatched double quote in `run.sh` causes (unexpected EOF while looking for matching `"')
removing the double quote fixes this
 2019-05-03 12:54:44 +03:00
Sherif Eldeeb 64226c37e0
Fix broken web/Dockerfile - (FIX COMPOSER) 
"# FIX COMPOSER" entries have (probably) been copied-pasted twice from a terminal, with one truncated line at (hash_file('sha384', 'composer-setup.php')) that breaks the script
 2019-05-03 12:17:37 +03:00
Xavier Mertens ac4734d077
Merge pull request #18 from moshemal/master 
Using submodules instead of pear install
 2019-05-02 22:11:57 +02:00
Xavier Mertens 9eccd741f9
Merge pull request #14 from focheur91300/patch-1 
Update run.sh
 2019-05-02 22:11:03 +02:00
Xavier Mertens fdabe8c7cb
Merge pull request #21 from yaleman/master 
Fixes to make it build as at 2019-03-10
 2019-05-02 22:09:47 +02:00
Xavier Mertens f638488e93
Merge branch 'master' into master 2019-05-02 22:09:26 +02:00
Xavier Mertens ce0a7683fb
Merge pull request #24 from gl4ssiest/patch-1 
Tested Ubuntu xenial LTS DockerFile
 2019-05-02 22:04:20 +02:00
Gl4ssiest 9d267a2d9e
Tested Ubuntu xenial LTS DockerFile 2019-05-02 12:38:26 +02:00
yaleman b352a44800 updated README 2019-05-02 14:15:22 +10:00
yaleman 24537f8e2f updated README 2019-05-02 14:14:48 +10:00
yaleman 89e267ac0c added nginx build check and travis CI build status icon 2019-05-02 11:57:38 +10:00
yaleman ec03dd3243 updated to add poppler requirements for build 2019-05-02 11:17:05 +10:00
yaleman b53d03c569 updated web dockerfile, sigmatools has version bumped 2019-05-01 22:33:25 +10:00
yaleman 140eab96a8 let us see if it will build this time 2019-05-01 22:03:48 +10:00
yaleman dce575560e updated travis build script 2019-05-01 21:57:06 +10:00
yaleman 6d165f9717 adding travis basic build testing 2019-05-01 21:46:35 +10:00
yaleman 84964ad715
Fixes to make it build as at 2019-03-10 
- update from php7.2 to php7.3
- includes fix for #20 https://github.com/MISP/misp-docker/issues/20
- rewrites the REQUIREMENTS file to remove explicit versioning as they are for python2 packages, not python3
 2019-03-10 18:45:38 +10:00
Moshe Malka 10843c38cd using submodules instead of pear install 2019-02-07 09:02:58 +00:00
Philippe b59287e9f6
Update run.sh 
Modification of the file database.php to be able to give the possibility to a MISP to connect to a database with another user.
Addition to download the GPG key on the MISP homepage.
 2019-01-10 13:22:23 +01:00
Xavier Mertens 252e1eb7af
Merge pull request #8 from Miroka96/patch-1 
Update README.md
 2018-12-30 17:19:33 +01:00
Xavier Mertens 09b54aafdd
Merge pull request #10 from dafal/master 
db service rework + simplification of the docker-compose
 2018-12-30 17:19:05 +01:00
Eric Daras 0a452d4d24 Adapt the proxy part to fit with the new naming et simplified db part 2018-10-17 19:20:26 +02:00
Eric Daras 05689c3b0e DB part reworked to use std mysql database creation way, docker-compose simplified 2018-10-17 19:13:22 +02:00
Mirko Krause 2ae0c447a2
Update README.md 
removed the docker build instructions (because the root Dockerfile no longer exists)
 2018-10-09 13:59:56 +02:00
Xavier Mertens a5ebabfbbc
Merge pull request #3 from dlee35/master 
Additional arg for misp-module and changed user in supervisord.conf
 2018-07-07 07:20:39 +02:00
dlee35 b471221acd Fixed command and user for misp-modules in supervisord.conf 2018-07-06 08:58:06 -04:00
dlee35 9076f30e2a Specified 127 address in misp-module due to failure when running localhost (default) 2018-07-06 08:40:27 -04:00
Alexandre Dulaunoy 3283cba3f6
Merge pull request #2 from arnydo/patch-1 
Include libfuzzy-dev in Dockerfile
 2018-06-28 23:20:28 +02:00
arnydo c943cd664e
Include libfuzzy-dev in Dockerfile 
libfuzzy-dev is a dependency for PyDeep.
Adding to Dockerfile would eliminate an additional step post install.
 2018-06-28 09:22:04 -04:00
Steve Clement 8491df05d8
Merge pull request #1 from arnydo/misp-proxy 
Add NGINX Reverse Proxy option
 2018-06-25 09:56:57 +08:00
arnydo f998683c8d
Add optional compose commands in README.md 2018-06-22 14:04:24 -04:00
arnydo 7858038311
Update README.md 2018-06-22 13:52:20 -04:00
arnydo 8901600fe8
Update Readme to include NGINX option 2018-06-22 13:51:36 -04:00
root eecf7d47f6 Add SSL placeholder 2018-06-22 15:31:18 +00:00
root fbc34de9c4 Add misp-network to compose file. 
Uncomment NGINX http>https redirect
 2018-06-22 15:24:00 +00:00
arnydo e44719ea6f
Add NGINX files 2018-06-22 09:51:16 -04:00
Xavier Mertens e06d77a1bc
Fixed git repo 2018-06-21 16:10:17 +02:00
Xavier Mertens 3255a74f06 Code cleanup 2018-06-20 13:37:39 +02:00
Xavier Mertens 46729bb4fd Fixed HTTP port 2018-06-20 13:34:20 +02:00
Xavier Mertens 7d97286914 Updated 2018-06-20 13:05:21 +02:00
Xavier Mertens dd1458707e Quick fix 2018-06-20 13:05:08 +02:00
Xavier Mertens 82042f605f Updated to use new directories 2018-06-20 12:58:30 +02:00
Xavier Mertens 0bc6592ccc Moved to new misp-web/ 2018-06-20 12:56:37 +02:00
Xavier Mertens d1a307e3e1 Created 2018-06-20 12:55:34 +02:00
Xavier Mertens b2884201fc New MySQL container 2018-06-20 12:53:48 +02:00
Xavier Mertens 0368bde11f Fixed installation of files 2018-06-20 12:53:23 +02:00