From abbc73f655e8f69ee5ac8092f1e1bf9a4c96a751 Mon Sep 17 00:00:00 2001
From: Stefano Ortolani <ortolanis@vmware.com>
Date: Sun, 8 Oct 2023 13:52:51 +0100
Subject: [PATCH] Prepare post https://github.com/MISP/MISP/pull/9304 merge

---
 docker-compose.yml |  4 ++--
 server/Dockerfile  |  6 ------
 template.env       | 19 ++++++++++---------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 28f5101..e77b013 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,11 +12,11 @@ services:
       - "SMARTHOST_ALIASES=${SMARTHOST_ALIASES}"
 
   redis:
-    image: redis:5.0.6
+    image: redis:7.2
 
   db:
     # We use MariaDB because it supports ARM and has the expected collations
-    image: mariadb:10.8.2
+    image: mariadb:10.11
     restart: always
     environment:
       - "MYSQL_USER=${MYSQL_USER:-misp}"
diff --git a/server/Dockerfile b/server/Dockerfile
index 52d2864..25a4c5c 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -95,12 +95,6 @@ EOF
     RUN <<-EOF
         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)
         # 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,
diff --git a/template.env b/template.env
index 0aa7586..e87ee66 100644
--- a/template.env
+++ b/template.env
@@ -7,15 +7,16 @@ MODULES_TAG=v2.4.176
 PHP_VER=20190902
 LIBFAUP_COMMIT=3a26d0a
 
-PYPI_REDIS_VERSION="==5.0.*"
-PYPI_LIEF_VERSION=">=0.13.1"
-PYPI_PYDEEP2_VERSION="==0.5.*"
-PYPI_PYTHON_MAGIC_VERSION="==0.4.*"
-PYPI_MISP_LIB_STIX2_VERSION="==3.0.*"
-PYPI_MAEC_VERSION="==4.1.*"
-PYPI_MIXBOX_VERSION="==1.0.*"
-PYPI_CYBOX_VERSION="==2.1.*"
-PYPI_PYMISP_VERSION="==2.4.176"
+# PYPY_* vars take precedence over MISP's
+# PYPI_REDIS_VERSION="==5.0.*"
+# PYPI_LIEF_VERSION=">=0.13.1"
+# PYPI_PYDEEP2_VERSION="==0.5.*"
+# PYPI_PYTHON_MAGIC_VERSION="==0.4.*"
+# PYPI_MISP_LIB_STIX2_VERSION="==3.0.*"
+# PYPI_MAEC_VERSION="==4.1.*"
+# PYPI_MIXBOX_VERSION="==1.0.*"
+# PYPI_CYBOX_VERSION="==2.1.*"
+# PYPI_PYMISP_VERSION="==2.4.176"
 
 # MISP_COMMIT takes precedence over MISP_TAG
 # MISP_COMMIT=c56d537