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

139 Commits (d48d0b8c476b0236d6f15f11567e04e34b8e2bfe)

Author SHA1 Message Date
Mark Adams 2d5cd09738 Use fewer image layers 2020-01-09 05:44:20 -08:00
Mark Adams 67b9174562 Update container to Ubuntu Bionic 2020-01-09 05:41:31 -08:00
Alexandre Dulaunoy eec17f682a
Merge pull request #67 from Xyrodileas/FixComposer 
Fix Hash check for composer_setup
 2020-01-09 08:45:21 +01:00
Alexis Vuillaume 531d63492e Fix integrity check for composer_setup 2020-01-03 10:45:27 -05:00
Alexandre Dulaunoy 3e62c9d20b
Merge pull request #61 from Kortho/patch-1 
PHP-memory limit recommendation changed to 2048
 2019-11-15 15:24:56 +01:00
Kortho 8152933351
PHP-memory limit recommendation changed to 2048 
Recommended memory limit for MISP was changed from 512M to 2048M in version 2.4.114
 2019-11-15 14:08:20 +01:00
Alexandre Dulaunoy e5352c0df5
Merge pull request #60 from The-Alchemist/patch-2 
upgrade setup_tools to avoid Python errors
 2019-11-13 20:47:55 +01:00
Alexandre Dulaunoy b0b7043c91
Merge pull request #49 from coolacid/master 
MYSQL Host from Env
 2019-11-12 06:13:22 +01:00
Alexandre Dulaunoy 48bbc38105
Merge pull request #58 from marcredhat/patch-1 
Update Dockerfile
 2019-11-12 06:12:53 +01:00
Alexandre Dulaunoy bb44b32d09
Merge pull request #50 from far-light/patch-1 
make 'cake' executable
 2019-11-12 06:12:17 +01:00
Alexandre Dulaunoy cace90b0d9
Merge pull request #48 from equ1n0x93/master 
fix lxml build failure in web/Dockerfile
 2019-11-12 06:11:46 +01:00
The Alchemist ddd8d329ba
upgrade setup_tools to avoid Python errors 
Without this fix, you'll get:

```
Running python-dateutil-2.8.1/setup.py -q bdist_egg --dist-dir /tmp/easy_install-plD_ft/python-dateutil-2.8.1/egg-dist-tmp-4ws_IO
/tmp/easy_install-plD_ft/python-dateutil-2.8.1/setup.py:20: UserWarning: python_requires requires setuptools version > 24.3
  UserWarning)
/usr/lib/python2.7/distutils/dist.py:267: UserWarning: Unknown distribution option: 'use_scm_version'
  warnings.warn(msg)
warning: no previously-included files matching '__pycache__' found anywhere in distribution
warning: no previously-included files matching '*.py[co]' found anywhere in distribution
warning: install_lib: 'build/lib.linux-x86_64-2.7' does not exist -- no Python modules to install
```
 2019-11-11 15:59:35 -05:00
Marc Chisinevski 4963108c07
Update Dockerfile 
Fix [Composer\Downloader\TransportException] by adding "RUN php composer.phar update"
 2019-10-27 11:24:24 -07:00
far-light c26f41f2a6
make 'cake' executable 2019-09-04 17:42:47 +07:00
Jason Kendall ebb9d1d3a1 MYSQL Host from Env 2019-09-03 09:31:44 -04:00
Jason Kendall 972bdf5a40 MYSQL Host from Env 2019-09-03 09:29:47 -04:00
AsafD fb4513dce6 fix lxml build in web/Dockerfile 2019-09-01 13:51:10 +03:00
Steve Clement 6cdefed757
chg: [doc] .env update 2019-08-21 17:39:53 +02:00
Steve Clement 5d7bc41a28
Use .env file instead of hard coded environment variables (#41) 
Use .env file instead of hard coded environment variables
 2019-08-21 17:38:14 +02:00
Steve Clement f5e2852a6a
Merge pull request #38 from TrickByte/master 
Fixing issues when building behind a proxy
 2019-08-21 17:35:54 +02:00
Steve Clement 7d7aecc44b
Merge pull request #43 from moshemal/add-depends-on 
add depends_on db
 2019-08-21 17:35:10 +02:00
Steve Clement 6f896d16d2
Merge branch 'master' into master 2019-08-21 17:33:25 +02:00
Steve Clement 01b893996e
Chg: [doc] updated Travis to use MISP repo 2019-08-21 09:02:48 +02:00
Steve Clement f0098edd05
Merge pull request #42 from pe3zx/master 
Update SHA384 of composer-setup.php
 2019-08-21 08:53:35 +02:00
Moshe Malka 186eda7814 add depends_on db 2019-08-06 18:17:19 +03:00
pe3zx 683083bfb6 Update SHA384 of composer-setup.php 2019-08-05 23:23:32 +07:00
Moshe Malka 7c9164ad69 no need for db host in env file 2019-07-28 10:05:04 +03:00
Moshe Malka f785ecac4b use .env file instead of hardcoded environment variables in the yml file 2019-07-28 09:40:54 +03:00
Moshe Malka a7153fd1d9 add .env file for environment variables 2019-07-25 18:01:02 +03:00
TrickByte 83d29f91ae
Using -E on sudo apt-get install 
Using -E on "sudo apt-get install" to preserve proxy environment variables, as lacking them makes apt-get fail.
 2019-07-12 22:51:38 +02:00
TrickByte 85ebc8455b
Downloading PHP Composer with curl instead of PHP 2019-07-12 22:49:59 +02:00
Xavier Mertens b1cb41557d Added php-gd 2019-07-10 13:06:40 +02:00
Xavier Mertens a24da40215
Merge pull request #36 from dvas0004/patch-1 
update dockerfile to contain mysql PDO extension
 2019-07-10 12:03:13 +02:00
David Vassallo 7eac28601d
update dockerfile to contain mysql PDO extension 
Adding

`apt-get install -u php-mysql`

otherwise on startup you'll get an internal 500 error, with /tmp/logs showing:

```
2019-07-08 11:21:02 Error: [MissingConnectionException] Database connection "Mysql" is missing, or could not be created.
Exception Attributes: array (
  'class' => 'Mysql',
  'message' => 'Selected driver is not enabled',
  'enabled' => false,
)
```
 2019-07-08 14:35:38 +03:00
Steve Clement 4ed5e89792
Merge pull request #29 from swedishmike/proxydirtypo 
Change README.md to properly reflect directory names.
 2019-05-17 05:32:31 +02:00
Mike Eriksson 3b75af6cc4 Change README.md to properly reflect directory names. 2019-05-14 10:48:50 +01:00
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