Bump misp-modules and backport fixes

MISP · Jul 19, 2024 · 130a6ba · 130a6ba
1 parent 0b5dd32
commit 130a6ba
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 3,485 deletions.
diff --git a/core/Dockerfile b/core/Dockerfile
@@ -217,6 +217,7 @@ FROM php-base
 
     # Do an early chown to limit image size
     COPY --from=python-build --chown=www-data:www-data --chmod=0550 /var/www/MISP /var/www/MISP
+    COPY --from=composer-build --chown=www-data:www-data --chmod=0550 /tmp/composer.lock /var/www/MISP/app/composer.lock
     COPY --from=composer-build --chown=www-data:www-data --chmod=0550 /tmp/Vendor /var/www/MISP/app/Vendor
     COPY --from=composer-build --chown=www-data:www-data --chmod=0550 /tmp/Plugin /var/www/MISP/app/Plugin
 

diff --git a/modules/Dockerfile b/modules/Dockerfile
@@ -31,8 +31,6 @@ EOF
 
     WORKDIR /srv/misp-modules
     RUN pip install pipenv
-    COPY files/Pipfile Pipfile
-    COPY files/Pipfile.lock Pipfile.lock
     RUN pipenv requirements > requirements.txt
     RUN pip wheel -r requirements.txt --no-cache-dir -w /wheels/
 

diff --git a/modules/files/Pipfile b/modules/files/Pipfile