Commit Graph

156 Commits (c0a8a63d99aefde3adcb3bd6981b82b268b4cbce)

Author SHA1 Message Date
stevengoossensB 94c43c62b8
Update run.sh
Initial connection can't be to specific database, since that doesn't exist yet
2020-02-06 12:49:50 +01:00
Alexandre Dulaunoy 431ef652b7
Merge pull request #77 from cybermaggedon/add-http-healthcheck-endpoint
Add a healthcheck endpoint
2020-01-30 07:04:50 +01:00
Mark Adams a4397f7298 Add a healthcheck endpoint: /healthcheck returns status 200, 'ok' payload. 2020-01-28 11:22:06 -08:00
Alexandre Dulaunoy 3a3ed2ee59
Merge pull request #75 from s3curetty/master
Fixed redis exiting
2020-01-23 13:08:53 +01:00
Alexandre Dulaunoy f74960894c
Merge pull request #74 from challs/fix-python-library-install
Fix python library install
2020-01-23 13:08:05 +01:00
Alexandre Dulaunoy b0ee2c638c
Merge pull request #73 from challs/remove-php-repo
PHP packages cleanup
2020-01-23 13:07:33 +01:00
Alexandre Dulaunoy a4fd7c7a25
Merge pull request #71 from cybermaggedon/misp-enable-live
Make misp.live on by default.
2020-01-23 13:06:19 +01:00
Freddy 5ce1450c8e
Fixed redis exiting 2020-01-23 17:28:14 +05:30
Chris Halls 74ada58efa Install additional Python dependencies
As mentioned on the MISP server diagnostic page
2020-01-10 15:11:16 +01:00
Chris Halls 5e390d610a Install latest cybox and stix versions
The versions pinned by the Dockerfile were too old and failed the
diagnostics test.

We switch to using the latest Github revision. This mirrors the
main MISP repository installation script behaviour (INSTALL/INSTALL.sh)
2020-01-10 15:10:10 +01:00
Chris Halls 74934c755c Use python 3 system package versions
We no longer need Python 2 packages
2020-01-10 15:06:10 +01:00
Chris Halls 9a314ca85a Remove Python library overrides
These are not needed for Bionic's more modern Python version
2020-01-10 12:08:50 +01:00
Chris Halls be00d58904 Remove external PHP repository
This is no longer needed for PHP 7.3, which is part of Ubuntu Bionic

Fixes #53
2020-01-10 11:52:11 +01:00
Chris Halls 048e8ba141 Install default PHP packages
These are the default php packages on Bionic, so we can drop the
7.3 suffix from the installed package names.

We also reduce the work apt has to do by merging the apt install
lines together into one.
2020-01-10 11:50:22 +01:00
Mark Adams 1ac95ce5d6 Make misp.live on by default. This isn't ideal, as it means taking an instance
non-live will make it live again if the container restarts.  That seems
better than the default which is that MISP is non-live on container restart.
Ideally live/non-live would be persisted in the database but that's a change
in MISP.
2020-01-09 10:35:55 -08:00
Chris Halls 7766403b82 Refactor multiple sed invocations into one command line
This reduces the number of lines where we have to specify the name
of the php.ini file to modify
2020-01-09 17:59:00 +01:00
Alexandre Dulaunoy 7c10e68017
Merge pull request #70 from cybermaggedon/bionic
Update to Ubuntu Bionic
2020-01-09 15:30:42 +01:00
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