@@ -185,7 +185,6 @@ FROM php-base
185
185
gpg-agent \
186
186
mariadb-client \
187
187
rsync \
188
- python3-setuptools \
189
188
# PHP Requirements
190
189
php7.4 \
191
190
php7.4-apcu \
@@ -219,7 +218,6 @@ FROM php-base
219
218
# Install python modules
220
219
COPY --from=python-build /wheels /wheels
221
220
RUN pip install --no-cache-dir /wheels/*.whl && rm -rf /wheels
222
- RUN pip uninstall -y pip
223
221
224
222
# PHP: install prebuilt libraries, then install the app's PHP deps
225
223
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
230
228
COPY --from=composer-build --chown=www-data:www-data --chmod=0550 /tmp/Vendor /var/www/MISP/app/Vendor
231
229
COPY --from=composer-build --chown=www-data:www-data --chmod=0550 /tmp/Plugin /var/www/MISP/app/Plugin
232
230
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 \
235
234
/usr/local/lib/python3.12/site-packages/mixbox/distutils_version.py
236
235
RUN sed -i 's/from distutils\. version/from mixbox.distutils_version/' \
237
236
/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
239
238
240
239
# Gather these in one layer, only act on actual directories under /etc/php/
241
240
RUN <<-EOF
0 commit comments