Skip to content

Commit f8fbce2

Browse files
committed
fix setting of audit.block-insecure
1 parent dab752f commit f8fbce2

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
###################################################
88
ARG MEDIAWIKI_VERSION=1.45.1
99
ARG PHP_VERSION=8.3
10-
ARG COMPOSER_VERSION=2.2
10+
ARG COMPOSER_VERSION=2.9.2
1111

1212
FROM composer:${COMPOSER_VERSION} AS composer
1313

@@ -54,8 +54,8 @@ RUN echo "{}" > composer.local.json && \
5454
# (e.g. PHPUnit) even when running with --no-dev.
5555
# This image intentionally excludes all dev dependencies, so disabling
5656
# the audit here is safe. Remove once MediaWiki updates its dev constraints.
57-
RUN COMPOSER=composer.local.json composer config audit.block-insecure false && \
58-
COMPOSER=composer.local.json composer update \
57+
RUN composer config --global audit.block-insecure false && \
58+
composer update \
5959
--no-dev \
6060
--prefer-dist \
6161
--no-interaction \
@@ -67,7 +67,7 @@ RUN COMPOSER=composer.local.json composer config audit.block-insecure false && \
6767
###################################################
6868
FROM mediawiki AS mediawiki-ci
6969

70-
ARG XDEBUG_VERSION
70+
ARG XDEBUG_VERSION=3.3.2
7171

7272
### add build tools and patches folder
7373
RUN curl -LJ https://github.com/gesinn-it-pub/docker-mediawiki-tools/tarball/3.2.1 \
@@ -101,8 +101,8 @@ RUN docker-php-ext-install pgsql
101101
# TEMPORARY: Composer blocks dependency resolution due to dev-only
102102
# security advisories (e.g. PHPUnit). This does not affect runtime
103103
# dependencies. Remove once MediaWiki updates its dev constraints.
104-
RUN COMPOSER=composer.local.json composer config audit.block-insecure false && \
105-
COMPOSER=composer.local.json composer update \
104+
RUN composer config --global audit.block-insecure false && \
105+
composer update \
106106
--prefer-dist \
107107
--no-interaction \
108108
--no-progress

0 commit comments

Comments
 (0)