Skip to content

Commit 1d27649

Browse files
committed
composer v2 latest
1 parent c5ccefd commit 1d27649

File tree

4 files changed

+5
-12
lines changed

4 files changed

+5
-12
lines changed

.env.dist

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ NGINX_SSL=no
4848
NGINX_FASTCGI_BUFFERS="8 8k"
4949
NGINX_FASTCGI_BUFFER_SIZE=8k
5050

51-
# Composer available versions: 1.10.24, 1.10.25, 1.10.26, 2.5.6, 2.5.7, 2.5.8
52-
COMPOSER_PATH=./.composer
53-
COMPOSER_VERSION=2.5.8
54-
5551
# MySQL available versions: 5.6, 5.7, 8.0
5652
MYSQL_VERSION=8.0
5753
# MariaDB available versions: 10.1, 10.2, 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, 10.11, 11.0
@@ -174,7 +170,7 @@ IONCUBE=no
174170

175171
EXTERNAL_NETWORK=no
176172

177-
RABBITMQ_VERSION=3.12.2
173+
RABBITMQ_VERSION=3.12.8
178174
ELASTICSEARCH_VERSION=6.8.23
179175
ELK_VERSION=7.16.0
180176
# MongoDB available versions: 4.2.24, 4.4.21, 5.0.17, 6.0.5

commands/start.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ func doChecks() {
101101
os.Getenv("SF_COMMUNITY_PATH") + "/symfony",
102102
os.Getenv("SF_COMMUNITY_PATH") + "/recipes",
103103
os.Getenv("SF_COMMUNITY_PATH") + "/symfony-docs",
104-
os.Getenv("COMPOSER_PATH"),
105-
os.Getenv("COMPOSER_PATH") + "/cache",
104+
"./.composer",
105+
"./.composer/cache",
106106
sshKeyPath,
107107
os.Getenv("MYSQL_DUMP_PATH"),
108108
}

config/php/Dockerfile.build

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ ARG XDEBUG_REMOTE_CONNECT_BACK
1919
ARG XDEBUG_FILE_LINK_FORMAT
2020
ARG XDEBUG_IDE_KEY
2121

22-
ARG COMPOSER_VERSION
23-
2422
ARG WKHTMLTOPDF_VERSION
2523

2624
MAINTAINER Vasilij Dusko <support@d4d.lt>
@@ -48,7 +46,7 @@ RUN docker-php-ext-configure zip --with-libzip __PHP_GD__ && docker-php-ext-conf
4846
__MONGODB__ \
4947
# Install composer
5048
&& php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
51-
&& php composer-setup.php --version=${COMPOSER_VERSION} \
49+
&& php composer-setup.php \
5250
&& php -r "unlink('composer-setup.php');" \
5351
&& mv composer.phar /usr/local/bin/composer \
5452
&& mkdir -p /var/www/.composer \

docker/php.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
XDEBUG_REMOTE_CONNECT_BACK: ${XDEBUG_REMOTE_CONNECT_BACK}
1818
XDEBUG_FILE_LINK_FORMAT: ${XDEBUG_FILE_LINK_FORMAT}
1919
XDEBUG_IDE_KEY: ${XDEBUG_IDE_KEY}
20-
COMPOSER_VERSION: ${COMPOSER_VERSION}
2120
ports:
2221
- ${PORT_PHP}:9000
2322
- 8888:8888
2423
volumes:
2524
- ${PROJECT_PATH}:/var/www/project:cached
2625
- ${SF_COMMUNITY_PATH}:/var/www/symfony:cached
27-
- ${COMPOSER_PATH}/cache:/var/www/.composer/cache:cached
26+
- ./.composer/cache:/var/www/.composer/cache:cached
2827
- ${SSH_KEY_PATH}/id_rsa:/var/www/.ssh/id_rsa
2928
- ${SSH_KEY_PATH}/id_rsa.pub:/var/www/.ssh/id_rsa.pub
3029
- ${SSH_KEY_PATH}/known_hosts:/var/www/.ssh/known_hosts

0 commit comments

Comments
 (0)