Skip to content

Commit 130a6ba

Browse files
committed
Bump misp-modules and backport fixes
1 parent 0b5dd32 commit 130a6ba

File tree

5 files changed

+2
-3485
lines changed

5 files changed

+2
-3485
lines changed

core/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ FROM php-base
217217

218218
# Do an early chown to limit image size
219219
COPY --from=python-build --chown=www-data:www-data --chmod=0550 /var/www/MISP /var/www/MISP
220+
COPY --from=composer-build --chown=www-data:www-data --chmod=0550 /tmp/composer.lock /var/www/MISP/app/composer.lock
220221
COPY --from=composer-build --chown=www-data:www-data --chmod=0550 /tmp/Vendor /var/www/MISP/app/Vendor
221222
COPY --from=composer-build --chown=www-data:www-data --chmod=0550 /tmp/Plugin /var/www/MISP/app/Plugin
222223

modules/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ EOF
3131

3232
WORKDIR /srv/misp-modules
3333
RUN pip install pipenv
34-
COPY files/Pipfile Pipfile
35-
COPY files/Pipfile.lock Pipfile.lock
3634
RUN pipenv requirements > requirements.txt
3735
RUN pip wheel -r requirements.txt --no-cache-dir -w /wheels/
3836

modules/files/Pipfile

Lines changed: 0 additions & 86 deletions
This file was deleted.

0 commit comments

Comments
 (0)