From 0b5dd32b6528aa12be84b9b143b22a18bf0b4446 Mon Sep 17 00:00:00 2001
From: Stefano Ortolani <ortolanis@vmware.com>
Date: Fri, 19 Jul 2024 11:30:36 +0100
Subject: [PATCH] Remove pip after installation

---
 core/Dockerfile            | 3 ++-
 modules/Dockerfile         | 1 +
 modules/files/Pipfile      | 2 +-
 modules/files/Pipfile.lock | 8 ++++----
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/Dockerfile b/core/Dockerfile
index e86b94f..37818f7 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -149,7 +149,7 @@ EOF
         done;
 
         pip wheel --no-cache-dir -w /wheels/ -r /var/www/MISP/requirements.txt
-        
+
         # Remove files we do not care for
         rm -r /var/www/MISP/PyMISP
         find /var/www/MISP/INSTALL/* ! -name 'MYSQL.sql' -type f -exec rm {} +
@@ -210,6 +210,7 @@ FROM php-base
     # Install python modules
     COPY --from=python-build /wheels /wheels
     RUN pip install --no-cache-dir /wheels/*.whl && rm -rf /wheels
+    RUN pip uninstall -y pip
 
     # PHP: install prebuilt libraries, then install the app's PHP deps
     COPY --from=php-build ["/usr/lib/php/${PHP_VER}/ssdeep.so", "/usr/lib/php/${PHP_VER}/rdkafka.so", "/usr/lib/php/${PHP_VER}/brotli.so", "/usr/lib/php/${PHP_VER}/simdjson.so", "/usr/lib/php/${PHP_VER}/zstd.so", "/usr/lib/php/${PHP_VER}/"]
diff --git a/modules/Dockerfile b/modules/Dockerfile
index 1ef48ad..e9d46aa 100644
--- a/modules/Dockerfile
+++ b/modules/Dockerfile
@@ -77,6 +77,7 @@ FROM "${DOCKER_HUB_PROXY}python:3.12-slim-bookworm"
     COPY --from=python-build /usr/local/lib/libfaupl* /usr/local/lib/
     RUN ldconfig
     RUN pip install --no-cache-dir --use-deprecated=legacy-resolver /wheels/*.whl && rm -rf /wheels
+    RUN pip uninstall -y pip
 
     # Since we compile faup ourselves and lua is not required anymore, we can load our own library 
     #   and skip the pre-compiled blob to improve compatibility with other architectures like ARM
diff --git a/modules/files/Pipfile b/modules/files/Pipfile
index 47de5a5..2521783 100644
--- a/modules/files/Pipfile
+++ b/modules/files/Pipfile
@@ -77,7 +77,7 @@ crowdstrike-falconpy = "0.9.0"
 censys = "2.0.9"
 mwdblib = "3.4.1"
 ndjson = "0.3.1"
-Jinja2 = "3.1.2"
+Jinja2 = ">=3.1.2"
 mattermostdriver = "7.3.2"
 openpyxl = "*"
 slack-sdk = "3.27.1"
diff --git a/modules/files/Pipfile.lock b/modules/files/Pipfile.lock
index 3cf1d7c..0d46b5a 100644
--- a/modules/files/Pipfile.lock
+++ b/modules/files/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "fcdd3cc6061f631b719ebbf80e5f7fa1e7d6d1155a750d70ed163e06dd4ef7ce"
+            "sha256": "984b67b921f554bdb98d0d7470dd5888c8e951bb414030712996ffa26fcea10d"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -832,12 +832,12 @@
         },
         "jinja2": {
             "hashes": [
-                "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852",
-                "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"
+                "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369",
+                "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==3.1.2"
+            "version": "==3.1.4"
         },
         "json-log-formatter": {
             "hashes": [