Skip to content

Commit beb62e4

Browse files
committed
Bump core and fix setuptools provenance
1 parent d6bc475 commit beb62e4

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

core/Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ FROM php-base
185185
gpg-agent \
186186
mariadb-client \
187187
rsync \
188-
python3-setuptools \
189188
# PHP Requirements
190189
php7.4 \
191190
php7.4-apcu \
@@ -219,7 +218,6 @@ FROM php-base
219218
# Install python modules
220219
COPY --from=python-build /wheels /wheels
221220
RUN pip install --no-cache-dir /wheels/*.whl && rm -rf /wheels
222-
RUN pip uninstall -y pip
223221

224222
# PHP: install prebuilt libraries, then install the app's PHP deps
225223
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
230228
COPY --from=composer-build --chown=www-data:www-data --chmod=0550 /tmp/Vendor /var/www/MISP/app/Vendor
231229
COPY --from=composer-build --chown=www-data:www-data --chmod=0550 /tmp/Plugin /var/www/MISP/app/Plugin
232230

233-
# python3-setuptools has been deprecated upstream (and 'distutils.version' is needed by 'mixbox')
234-
RUN cp /usr/lib/python3/dist-packages/setuptools/_distutils/version.py \
231+
# 'setuptools' is needed at runtime by 'mixbox'
232+
RUN pip install setuptools
233+
RUN cp /usr/local/lib/python3.12/site-packages/setuptools/_distutils/version.py \
235234
/usr/local/lib/python3.12/site-packages/mixbox/distutils_version.py
236235
RUN sed -i 's/from distutils\.version/from mixbox.distutils_version/' \
237236
/usr/local/lib/python3.12/site-packages/mixbox/parser.py
238-
RUN apt-get remove --purge python3-setuptools -y
237+
RUN pip uninstall -y setuptools pip
239238

240239
# Gather these in one layer, only act on actual directories under /etc/php/
241240
RUN <<-EOF

template.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Build-time variables
33
##
44

5-
CORE_TAG=v2.4.197
5+
CORE_TAG=v2.4.198
66
MODULES_TAG=v2.4.197
77
PHP_VER=20190902
88
LIBFAUP_COMMIT=3a26d0a

0 commit comments

Comments
 (0)