Skip to content

Commit d044603

Browse files
jsunierjsunier
committed
Upgraded to composer 2.x
1 parent 2cef599 commit d044603

File tree

11 files changed

+8
-24
lines changed

11 files changed

+8
-24
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
### Changes
9+
- Upgraded composer executable to **v2.x**
10+
- Removed `hirak/prestissimo` composer plugin
811

912
## [1.2.6] - 2020-10-24
1013
### Added

‎Makefile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
REPOSITORY?=jsunier/php-symfony-test
22
BUILD_DATE="$(shell date -u +"%Y-%m-%dT%H:%m:%SZ")"
3-
PRESTISSIMO_VERSION=0.3.10
4-
COMPOSER_VERSION=1
3+
COMPOSER_VERSION=2
54
VERSIONS=7.4 7.3 7.2 7.1
65
LATEST_VERSION=7.4
76

@@ -11,16 +10,16 @@ build: build-mysql build-postgresql
1110
.PHONY: build-mysql
1211
build-mysql:
1312
for VERSION in $(VERSIONS); do \
14-
docker build php$$VERSION/mysql --build-arg PRESTISSIMO_VERSION=$(PRESTISSIMO_VERSION) --build-arg BUILD_DATE=$(BUILD_DATE) --build-arg COMPOSER_VERSION=$(COMPOSER_VERSION) -t $(REPOSITORY):php$$VERSION-mysql -t $(REPOSITORY):php$$VERSION-mariadb; \
13+
docker build php$$VERSION/mysql --build-arg BUILD_DATE=$(BUILD_DATE) --build-arg COMPOSER_VERSION=$(COMPOSER_VERSION) -t $(REPOSITORY):php$$VERSION-mysql -t $(REPOSITORY):php$$VERSION-mariadb; \
1514
done
16-
docker build php${LATEST_VERSION}/mysql --build-arg PRESTISSIMO_VERSION=$(PRESTISSIMO_VERSION) --build-arg BUILD_DATE=$(BUILD_DATE) --build-arg COMPOSER_VERSION=$(COMPOSER_VERSION) -t $(REPOSITORY):latest -t $(REPOSITORY):latest-mysql
15+
docker build php${LATEST_VERSION}/mysql --build-arg BUILD_DATE=$(BUILD_DATE) --build-arg COMPOSER_VERSION=$(COMPOSER_VERSION) -t $(REPOSITORY):latest -t $(REPOSITORY):latest-mysql
1716

1817
.PHONY: build-postgresql
1918
build-postgresql:
2019
for VERSION in $(VERSIONS); do \
21-
docker build php$$VERSION/postgresql --build-arg PRESTISSIMO_VERSION=$(PRESTISSIMO_VERSION) --build-arg BUILD_DATE=$(BUILD_DATE) --build-arg COMPOSER_VERSION=$(COMPOSER_VERSION) -t $(REPOSITORY):php$$VERSION-postgresql; \
20+
docker build php$$VERSION/postgresql --build-arg BUILD_DATE=$(BUILD_DATE) --build-arg COMPOSER_VERSION=$(COMPOSER_VERSION) -t $(REPOSITORY):php$$VERSION-postgresql; \
2221
done
23-
docker build php${LATEST_VERSION}/postgresql --build-arg PRESTISSIMO_VERSION=$(PRESTISSIMO_VERSION) --build-arg BUILD_DATE=$(BUILD_DATE) --build-arg COMPOSER_VERSION=$(COMPOSER_VERSION) -t $(REPOSITORY):latest-postgresql
22+
docker build php${LATEST_VERSION}/postgresql --build-arg BUILD_DATE=$(BUILD_DATE) --build-arg COMPOSER_VERSION=$(COMPOSER_VERSION) -t $(REPOSITORY):latest-postgresql
2423

2524
.PHONY: pull-php
2625
pull-php:

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ For now, there is only two available database adapters for the available PHP ver
3232

3333
Every images include the latest version of [composer](https://getcomposer.org) installed at `/usr/bin/composer` and the latest version of the [Symfony CLI](https://symfony.com/download) installed at `/usr/local/bin/symfony`.
3434

35-
Composer is installed with [hirak/prestissimo](https://packagist.org/packages/hirak/prestissimo) plugin to speed up packages installation.
36-
3735
List of PHP extensions installed:
3836

3937
| Extension / PHP version | 7.1 | 7.2 | 7.3 | 7.4 |

‎php7.1/mysql/Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ FROM composer:${COMPOSER_VERSION} as composer_image
55
FROM php:7.1-cli
66

77
ARG BUILD_DATE
8-
ARG PRESTISSIMO_VERSION=0.3.10
98
ARG XDEBUG_VERSION=2.6.1
109

1110
LABEL maintainer="Joël Sunier <jsunier@stogon.io>" \
@@ -45,6 +44,5 @@ RUN rm /etc/ImageMagick-6/policy.xml
4544
VOLUME [ "/app" ]
4645

4746
USER symfony
48-
RUN composer global require --no-interaction --no-progress hirak/prestissimo:$PRESTISSIMO_VERSION
4947

5048
CMD [ "/app/bin/console" ]

‎php7.1/postgresql/Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ FROM composer:${COMPOSER_VERSION} as composer_image
55
FROM php:7.1-cli
66

77
ARG BUILD_DATE
8-
ARG PRESTISSIMO_VERSION=0.3.10
98
ARG XDEBUG_VERSION=2.6.1
109

1110
LABEL maintainer="Joël Sunier <jsunier@stogon.io>" \
@@ -46,6 +45,5 @@ RUN rm /etc/ImageMagick-6/policy.xml
4645
VOLUME [ "/app" ]
4746

4847
USER symfony
49-
RUN composer global require --no-interaction --no-progress hirak/prestissimo:$PRESTISSIMO_VERSION
5048

5149
CMD [ "/app/bin/console" ]

‎php7.2/mysql/Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ FROM composer:${COMPOSER_VERSION} as composer_image
55
FROM php:7.2-cli
66

77
ARG BUILD_DATE
8-
ARG PRESTISSIMO_VERSION=0.3.10
98
ARG XDEBUG_VERSION=2.9.8
109

1110
LABEL maintainer="Joël Sunier <jsunier@stogon.io>" \
@@ -45,6 +44,5 @@ RUN rm /etc/ImageMagick-6/policy.xml
4544
VOLUME [ "/app" ]
4645

4746
USER symfony
48-
RUN composer global require --no-interaction --no-progress hirak/prestissimo:$PRESTISSIMO_VERSION
4947

5048
CMD [ "/app/bin/console" ]

‎php7.2/postgresql/Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ FROM composer:${COMPOSER_VERSION} as composer_image
55
FROM php:7.2-cli
66

77
ARG BUILD_DATE
8-
ARG PRESTISSIMO_VERSION=0.3.10
98
ARG XDEBUG_VERSION=2.9.8
109

1110
LABEL maintainer="Joël Sunier <jsunier@stogon.io>" \
@@ -46,6 +45,5 @@ RUN rm /etc/ImageMagick-6/policy.xml
4645
VOLUME [ "/app" ]
4746

4847
USER symfony
49-
RUN composer global require --no-interaction --no-progress hirak/prestissimo:$PRESTISSIMO_VERSION
5048

5149
CMD [ "/app/bin/console" ]

‎php7.3/mysql/Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ FROM composer:${COMPOSER_VERSION} as composer_image
55
FROM php:7.3-cli
66

77
ARG BUILD_DATE
8-
ARG PRESTISSIMO_VERSION=0.3.10
98
ARG XDEBUG_VERSION=2.9.8
109

1110
LABEL maintainer="Joël Sunier <jsunier@stogon.io>" \
@@ -45,6 +44,5 @@ RUN rm /etc/ImageMagick-6/policy.xml
4544
VOLUME [ "/app" ]
4645

4746
USER symfony
48-
RUN composer global require --no-interaction --no-progress hirak/prestissimo:$PRESTISSIMO_VERSION
4947

5048
CMD [ "/app/bin/console" ]

‎php7.3/postgresql/Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ FROM composer:${COMPOSER_VERSION} as composer_image
55
FROM php:7.3-cli
66

77
ARG BUILD_DATE
8-
ARG PRESTISSIMO_VERSION=0.3.10
98
ARG XDEBUG_VERSION=2.9.8
109

1110
LABEL maintainer="Joël Sunier <jsunier@stogon.io>" \
@@ -46,6 +45,5 @@ RUN rm /etc/ImageMagick-6/policy.xml
4645
VOLUME [ "/app" ]
4746

4847
USER symfony
49-
RUN composer global require --no-interaction --no-progress hirak/prestissimo:$PRESTISSIMO_VERSION
5048

5149
CMD [ "/app/bin/console" ]

‎php7.4/mysql/Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ FROM composer:${COMPOSER_VERSION} as composer_image
55
FROM php:7.4-cli
66

77
ARG BUILD_DATE
8-
ARG PRESTISSIMO_VERSION=0.3.10
98
ARG XDEBUG_VERSION=2.9.8
109

1110
LABEL maintainer="Joël Sunier <jsunier@stogon.io>" \
@@ -45,6 +44,5 @@ RUN rm /etc/ImageMagick-6/policy.xml
4544
VOLUME [ "/app" ]
4645

4746
USER symfony
48-
RUN composer global require --no-interaction --no-progress hirak/prestissimo:$PRESTISSIMO_VERSION
4947

5048
CMD [ "/app/bin/console" ]

0 commit comments

Comments
 (0)