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

Fix upstream removal of python3-setuptools

pull/143/head
Stefano Ortolani 2024-09-08 11:05:24 +01:00
parent 043437c83f
commit b033daec4f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/Dockerfile
View File

@ -185,6 +185,7 @@ FROM php-base
gpg-agent \ gpg-agent \
mariadb-client \ mariadb-client \
rsync \ rsync \
python3-setuptools \
# PHP Requirements # PHP Requirements
php7.4 \ php7.4 \
php7.4-apcu \ php7.4-apcu \
@ -229,6 +230,13 @@ FROM php-base
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/Vendor /var/www/MISP/app/Vendor
COPY --from=composer-build --chown=www-data:www-data --chmod=0550 /tmp/Plugin /var/www/MISP/app/Plugin COPY --from=composer-build --chown=www-data:www-data --chmod=0550 /tmp/Plugin /var/www/MISP/app/Plugin
# python3-setuptools has been deprecated upstream (and 'distutils.version' is needed by 'mixbox')
RUN cp /usr/lib/python3/dist-packages/setuptools/_distutils/version.py \
/usr/local/lib/python3.12/site-packages/mixbox/distutils_version.py
RUN sed -i 's/from distutils\.version/from mixbox.distutils_version/' \
/usr/local/lib/python3.12/site-packages/mixbox/parser.py
RUN apt-get remove --purge python3-setuptools -y
# Gather these in one layer, only act on actual directories under /etc/php/ # Gather these in one layer, only act on actual directories under /etc/php/
RUN <<-EOF RUN <<-EOF
set -- "ssdeep" "rdkafka" "brotli" "simdjson" "zstd" set -- "ssdeep" "rdkafka" "brotli" "simdjson" "zstd"