Skip to content

Commit efa0d79

Browse files
committed
removed global merge plugin installation
1 parent ef0193a commit efa0d79

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

php-7.1/Dockerfile-fpm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ RUN npm install -g less lesshint google-closure-compiler
5353

5454
ENV PHP_USER_ID=33 \
5555
PHP_ENABLE_XDEBUG=0 \
56-
VERSION_COMPOSER_MERGE_PLUGIN=^1.3.1 \
5756
VERSION_COMPOSER_ASSET_PLUGIN=^1.2.0 \
5857
VERSION_PRESTISSIMO_PLUGIN=^0.3.0 \
5958
VERSION_CODECEPTION=^2.2.6 \
@@ -77,7 +76,6 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
7776
--filename=composer.phar \
7877
--install-dir=/usr/local/bin && \
7978
composer global require --optimize-autoloader \
80-
"wikimedia/composer-merge-plugin:${VERSION_COMPOSER_MERGE_PLUGIN}" \
8179
"fxp/composer-asset-plugin:${VERSION_COMPOSER_ASSET_PLUGIN}" \
8280
"hirak/prestissimo:${VERSION_PRESTISSIMO_PLUGIN}" && \
8381
composer global dumpautoload --optimize

php-7.1/Dockerfile-fpm-alpine

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ RUN npm install -g \
7575
# Configure version constraints
7676
ENV PHP_USER_ID=33 \
7777
PHP_ENABLE_XDEBUG=0 \
78-
VERSION_COMPOSER_MERGE_PLUGIN=^1.3.1 \
7978
VERSION_COMPOSER_ASSET_PLUGIN=^1.2.2 \
8079
VERSION_PRESTISSIMO_PLUGIN=^0.3.0 \
8180
VERSION_CODECEPTION=^2.2.6 \
@@ -98,7 +97,6 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
9897
--filename=composer.phar \
9998
--install-dir=/usr/local/bin && \
10099
composer global require --optimize-autoloader \
101-
"wikimedia/composer-merge-plugin:${VERSION_COMPOSER_MERGE_PLUGIN}" \
102100
"fxp/composer-asset-plugin:${VERSION_COMPOSER_ASSET_PLUGIN}" \
103101
"hirak/prestissimo:${VERSION_PRESTISSIMO_PLUGIN}" && \
104102
composer global dumpautoload --optimize

0 commit comments

Comments
 (0)