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

Bump core and fix setuptools provenance

pull/153/head
Stefano Ortolani 2024-09-16 09:58:10 +01:00
parent d6bc475e91
commit beb62e4dcc
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/Dockerfile
View File

@ -185,7 +185,6 @@ 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 \
@ -219,7 +218,6 @@ FROM php-base
# Install python modules # Install python modules
COPY --from=python-build /wheels /wheels COPY --from=python-build /wheels /wheels
RUN pip install --no-cache-dir /wheels/*.whl && rm -rf /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 # 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}/"] 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}/"]
@ -230,12 +228,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') # 'setuptools' is needed at runtime by 'mixbox'
RUN cp /usr/lib/python3/dist-packages/setuptools/_distutils/version.py \ RUN pip install setuptools
RUN cp /usr/local/lib/python3.12/site-packages/setuptools/_distutils/version.py \
/usr/local/lib/python3.12/site-packages/mixbox/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/' \ RUN sed -i 's/from distutils\.version/from mixbox.distutils_version/' \
/usr/local/lib/python3.12/site-packages/mixbox/parser.py /usr/local/lib/python3.12/site-packages/mixbox/parser.py
RUN apt-get remove --purge python3-setuptools -y RUN pip uninstall -y setuptools pip
# 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

2
template.env
View File

@ -2,7 +2,7 @@
# Build-time variables # Build-time variables
## ##
CORE_TAG=v2.4.197 CORE_TAG=v2.4.198
MODULES_TAG=v2.4.197 MODULES_TAG=v2.4.197
PHP_VER=20190902 PHP_VER=20190902
LIBFAUP_COMMIT=3a26d0a LIBFAUP_COMMIT=3a26d0a