MISP
/
misp-docker
mirror of https://github.com/MISP/misp-docker
2
0
Fork 0
Code Issues Releases Wiki Activity

Prepare post https://github.com/MISP/MISP/pull/9304 merge

pull/1/head
Stefano Ortolani 2023-10-08 13:52:51 +01:00
parent 65a4e20b6c
commit abbc73f655
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@ -12,11 +12,11 @@ services:
- "SMARTHOST_ALIASES=${SMARTHOST_ALIASES}" - "SMARTHOST_ALIASES=${SMARTHOST_ALIASES}"
redis: redis:
image: redis:5.0.6 image: redis:7.2
db: db:
# We use MariaDB because it supports ARM and has the expected collations # We use MariaDB because it supports ARM and has the expected collations
image: mariadb:10.8.2 image: mariadb:10.11
restart: always restart: always
environment: environment:
- "MYSQL_USER=${MYSQL_USER:-misp}" - "MYSQL_USER=${MYSQL_USER:-misp}"

6
server/Dockerfile
View File

@ -95,12 +95,6 @@ EOF
RUN <<-EOF RUN <<-EOF
mkdir /wheels mkdir /wheels
# Remove modules only used during MISP build
set -- 'coveralls' 'codecov' 'requests-mock' 'nose' 'pip'
for mod in "$@"; do
sed "/${mod}/d" -i /var/www/MISP/requirements.txt
done;
# Add additional dependencies (container specific) # Add additional dependencies (container specific)
# The "set" line contains the list of modules we want to ensure are present. # The "set" line contains the list of modules we want to ensure are present.
# PYPI_MODULE_NAME_VERSION env vars can be set to specify the version desired, # PYPI_MODULE_NAME_VERSION env vars can be set to specify the version desired,

19
template.env
View File

@ -7,15 +7,16 @@ MODULES_TAG=v2.4.176
PHP_VER=20190902 PHP_VER=20190902
LIBFAUP_COMMIT=3a26d0a LIBFAUP_COMMIT=3a26d0a
PYPI_REDIS_VERSION="==5.0.*" # PYPY_* vars take precedence over MISP's
PYPI_LIEF_VERSION=">=0.13.1" # PYPI_REDIS_VERSION="==5.0.*"
PYPI_PYDEEP2_VERSION="==0.5.*" # PYPI_LIEF_VERSION=">=0.13.1"
PYPI_PYTHON_MAGIC_VERSION="==0.4.*" # PYPI_PYDEEP2_VERSION="==0.5.*"
PYPI_MISP_LIB_STIX2_VERSION="==3.0.*" # PYPI_PYTHON_MAGIC_VERSION="==0.4.*"
PYPI_MAEC_VERSION="==4.1.*" # PYPI_MISP_LIB_STIX2_VERSION="==3.0.*"
PYPI_MIXBOX_VERSION="==1.0.*" # PYPI_MAEC_VERSION="==4.1.*"
PYPI_CYBOX_VERSION="==2.1.*" # PYPI_MIXBOX_VERSION="==1.0.*"
PYPI_PYMISP_VERSION="==2.4.176" # PYPI_CYBOX_VERSION="==2.1.*"
# PYPI_PYMISP_VERSION="==2.4.176"
# MISP_COMMIT takes precedence over MISP_TAG # MISP_COMMIT takes precedence over MISP_TAG
# MISP_COMMIT=c56d537 # MISP_COMMIT=c56d537