Skip to content

Commit

Permalink
Merge pull request #1909 from tarlepp/chore(env)/composer-update
Browse files Browse the repository at this point in the history
Chore(env) - Composer update
  • Loading branch information
tarlepp committed Jul 12, 2022
2 parents b683567 + c57eabe commit d2b1bba
Show file tree
Hide file tree
Showing 24 changed files with 672 additions and 251 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -23,7 +23,7 @@ RUN install-php-extensions \
zip

# Copy the Composer PHAR from the Composer image into the PHP image
COPY --from=composer:2.3.5 /usr/bin/composer /usr/bin/composer
COPY --from=composer:2.3.9 /usr/bin/composer /usr/bin/composer

WORKDIR /app

Expand Down
7 changes: 1 addition & 6 deletions Dockerfile_dev
Expand Up @@ -34,7 +34,7 @@ RUN install-php-extensions \
zip

# Copy the Composer PHAR from the Composer image into the PHP image
COPY --from=composer:2.3.5 /usr/bin/composer /usr/bin/composer
COPY --from=composer:2.3.9 /usr/bin/composer /usr/bin/composer

# Copy development `php.ini` configuration to container
COPY ./docker/php/php-dev.ini /usr/local/etc/php/php.ini
Expand Down Expand Up @@ -77,11 +77,6 @@ ENV PATH "$PATH:/home/dev/.local/bin"

RUN echo 'eval "$(thefuck --alias)"' >> /home/dev/.bashrc

# Install following common tools;
# - ergebnis/composer-normalize, to "normalize" composer.json contents
RUN composer --no-cache global require \
ergebnis/composer-normalize

# Install Node Version Manager (nvm)
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$NVM_VERSION/install.sh | bash

Expand Down
10 changes: 2 additions & 8 deletions composer.json
Expand Up @@ -85,17 +85,11 @@
"symfony/polyfill-php81": "*"
},
"config": {
"allow-plugins": true,
"platform": {
"php": "8.1.0"
},
"sort-packages": true,
"allow-plugins": {
"composer/package-versions-deprecated": true,
"ergebnis/composer-normalize": true,
"bamarni/composer-bin-plugin": true,
"symfony/flex": true,
"symfony/runtime": true
}
"sort-packages": true
},
"extra": {
"allow-contrib": "true",
Expand Down
69 changes: 36 additions & 33 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions tools/01_phpunit/composer.json
Expand Up @@ -12,6 +12,7 @@
"symfony/phpunit-bridge": "6.1.2"
},
"config": {
"allow-plugins": true,
"platform": {
"php": "8.1.0"
},
Expand Down

0 comments on commit d2b1bba

Please sign in to comment.