Added support for build arguments

* Added `COMPOSER_VERSION` argument in all `Dockerfile` to specify which
composer version to install (default to `latest` in Dockerfile, `1` in
`Makefile`)
* Added `XDEBUG_VERSION` argument in all `Dockerfile` to specify which
version of `xdebug` to install
* Changed the way composer is installed in images by using `COPY
--from=composer:${COMPOSER_VERSION} /usr/bin/composer /usr/bin/composer`
* Changed path of composer executable from `/usr/local/bin/composer` to
`/usr/bin/composer`

Author: jsunier

CHANGELOG.md

@@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.5] - 2020-10-24
+### Added
+- Added `COMPOSER_VERSION` argument in all `Dockerfile` to specify which composer version to install (default to `latest` in Dockerfile, `1` in `Makefile`)
+- Added `XDEBUG_VERSION` argument in all `Dockerfile` to specify which version of `xdebug` to install
+
+### Changes
+- Changed the way composer is installed in images by using `COPY --from=composer:${COMPOSER_VERSION} /usr/bin/composer /usr/bin/composer`
+- Changed path of composer executable from `/usr/local/bin/composer` to `/usr/bin/composer`
+
+### Fixed
+- Fixed unused `PRESTISSIMO_VERSION` argument during build
+- Removed `docker-php-ext-install` instruction for already installed extensions (like `pdo`, `iconv`, `mbstring`)
+
 ## [1.2.4] - 2020-09-14
 ### Fixed
 - Fixed `ImagickException: attempt to perform an operation not allowed by the security policy 'PDF' @ error/constitute.c/IsCoderAuthorized/408` error when trying to read a PDF with Imagick extension.

Makefile

@@ -1,29 +1,37 @@
 REPOSITORY?=jsunier/php-symfony-test
 BUILD_DATE="$(shell date -u +"%Y-%m-%dT%H:%m:%SZ")"
 PRESTISSIMO_VERSION=0.3.10
+COMPOSER_VERSION=1
 VERSIONS=7.4 7.3 7.2 7.1
 LATEST_VERSION=7.4
 
+.PHONY: build
+build: build-mysql build-postgresql
+
 .PHONY: build-mysql
 build-mysql:
 	for VERSION in $(VERSIONS); do \
-		docker build php$$VERSION/mysql --build-arg PRESTISSIMO_VERSION=$$PRESTISSIMO_VERSION --build-arg BUILD_DATE=$$BUILD_DATE -t $(REPOSITORY):php$$VERSION-mysql -t $(REPOSITORY):php$$VERSION-mariadb; \
+		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; \
 	done
-	docker build php${LATEST_VERSION}/mysql --build-arg PRESTISSIMO_VERSION=$$PRESTISSIMO_VERSION --build-arg BUILD_DATE=$$BUILD_DATE -t $(REPOSITORY):latest -t $(REPOSITORY):latest-mysql
+	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
 
 .PHONY: build-postgresql
 build-postgresql:
 	for VERSION in $(VERSIONS); do \
-		docker build php$$VERSION/postgresql --build-arg PRESTISSIMO_VERSION=$$PRESTISSIMO_VERSION --build-arg BUILD_DATE=$$BUILD_DATE -t $(REPOSITORY):php$$VERSION-postgresql; \
+		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; \
 	done
-	docker build php${LATEST_VERSION}/postgresql --build-arg PRESTISSIMO_VERSION=$$PRESTISSIMO_VERSION --build-arg BUILD_DATE=$$BUILD_DATE -t $(REPOSITORY):latest-postgresql
+	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
 
 .PHONY: pull-php
 pull-php:
 	for VERSION in $(VERSIONS); do \
 		docker pull php:$$VERSION-cli; \
 	done
 	docker pull php:latest
+	docker pull composer:${COMPOSER_VERSION}
+
+.PHONY: push
+push: push-mysql push-postgresql
 
 .PHONY: push-mysql
 push-mysql:

README.md

@@ -32,7 +32,7 @@ For now, there is only two available database adapters for the available PHP ver
 
 Every images include the latest version of [composer](https://getcomposer.org) installed at `/usr/local/bin/composer`.
 
-Composer is installed with [hirak/prestissimo](https://packagist.org/packages/hirak/prestissimo) to speed up packages installation.
+Composer is installed with [hirak/prestissimo](https://packagist.org/packages/hirak/prestissimo) plugin to speed up packages installation.
 
 List of PHP extensions installed:
 
@@ -54,6 +54,14 @@ List of PHP extensions installed:
 | `oci8`                                                                       | ❌   | ❌   | ❌   | ❌   |
 | `redis`                                                                      | ✅   | ✅   | ✅   | ✅   |
 
+## Examples
+
+### Docker run
+
+```
+$ docker run -it -v $(pwd):/app jsunier/php-symfony-test:php7.4-mysql /bin/bash
+```
+
 # Default configurations
 
 Default value in Dockerfile's directives:
@@ -72,18 +80,30 @@ Images are compiled for these architectures:
 
 # Build
 
-## All at once
-
 There is a `Makefile` available to simplify the creation of theses images.
 
 You can change the values inside this file to set your custom repository, folders, tags, etc.
 
 > You need to have `make` installed (`sudo apt install make`)
 
+## Pull all latest source images
+
+```
+$ make pull-php
+```
+
+## All at once
+
 ```
 $ make all
 ```
 
+### Build all (mysql/postgresql)
+
+```
+$ make build
+```
+
 ### Build images with MySQL/MariaDB support
 
 ```

php7.1/mysql/Dockerfile

@@ -1,24 +1,29 @@
+ARG COMPOSER_VERSION=latest
+
+FROM composer:${COMPOSER_VERSION} as composer_image
+
 FROM php:7.1-cli
 
 ARG BUILD_DATE
-ARG PRESTISSIMO_VERSION
+ARG PRESTISSIMO_VERSION=0.3.10
+ARG XDEBUG_VERSION=2.6.1
 
 LABEL maintainer="Joël Sunier <[email protected]>" \
     php.version="7.1" \
     php.pdo_connector="MySQL" \
+    php.xdebug_version=${XDEBUG_VERSION} \
     org.label-schema.build-date=${BUILD_DATE}
 
 RUN apt-get update && apt-get install -yqq git curl libmcrypt-dev libjpeg-dev libpng-dev libfreetype6-dev libbz2-dev libxml2-dev libmagickwand-dev libpq-dev libwebp-dev unzip && \
-    docker-php-ext-install mbstring pdo pdo_mysql zip iconv opcache bcmath sockets soap && \
+    docker-php-ext-install mbstring pdo_mysql zip opcache bcmath sockets soap && \
     docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ && \
     docker-php-ext-install gd && \
-    pecl install imagick xdebug-2.6.1 redis && \
+    pecl install imagick xdebug-${XDEBUG_VERSION} redis && \
     docker-php-ext-enable imagick xdebug redis && \
     apt-get clean
 
 COPY php.ini $PHP_INI_DIR/php.ini
-
-RUN curl --silent --show-error https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+COPY --from=composer_image /usr/bin/composer /usr/bin/composer
 
 WORKDIR /app
 
@@ -28,14 +33,14 @@ RUN groupadd --gid 1000 symfony \
 
 # Fix permissions issues
 RUN chmod -R a+wrx /app
-RUN chmod  a+wrx /usr/local/bin/composer
+RUN chmod  a+wrx /usr/bin/composer
 
 # Fix Imagick rights for PDF
 RUN rm /etc/ImageMagick-6/policy.xml
 
 VOLUME [ "/app" ]
 
 USER symfony
-RUN composer global require --no-interaction --no-progress hirak/prestissimo:0.3.10
+RUN composer global require --no-interaction --no-progress hirak/prestissimo:$PRESTISSIMO_VERSION
 
 CMD [ "/app/bin/console" ]

php7.1/postgresql/Dockerfile

@@ -1,25 +1,30 @@
+ARG COMPOSER_VERSION=latest
+
+FROM composer:${COMPOSER_VERSION} as composer_image
+
 FROM php:7.1-cli
 
 ARG BUILD_DATE
-ARG PRESTISSIMO_VERSION
+ARG PRESTISSIMO_VERSION=0.3.10
+ARG XDEBUG_VERSION=2.6.1
 
 LABEL maintainer="Joël Sunier <[email protected]>" \
     php.version="7.1" \
     php.pdo_connector="PostgreSQL" \
+    php.xdebug_version=${XDEBUG_VERSION} \
     org.label-schema.build-date=${BUILD_DATE}
 
 RUN apt-get update && apt-get install -yqq git curl libmcrypt-dev libjpeg-dev libpng-dev libfreetype6-dev libbz2-dev libxml2-dev libmagickwand-dev libpq-dev libwebp-dev unzip && \
     docker-php-ext-install mbstring pdo_pgsql zip iconv opcache bcmath sockets soap && \
     docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql && \
     docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ && \
-    docker-php-ext-install pdo pdo_pgsql pgsql gd && \
-    pecl install imagick xdebug-2.6.1 redis && \
+    docker-php-ext-install pdo_pgsql pgsql gd && \
+    pecl install imagick xdebug-${XDEBUG_VERSION} redis && \
     docker-php-ext-enable imagick xdebug redis && \
     apt-get clean
 
 COPY php.ini $PHP_INI_DIR/php.ini
-
-RUN curl --silent --show-error https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+COPY --from=composer_image /usr/bin/composer /usr/bin/composer
 
 WORKDIR /app
 
@@ -29,14 +34,14 @@ RUN groupadd --gid 1000 symfony \
 
 # Fix permissions issues
 RUN chmod -R a+wrx /app
-RUN chmod  a+wrx /usr/local/bin/composer
+RUN chmod  a+wrx /usr/bin/composer
 
 # Fix Imagick rights for PDF
 RUN rm /etc/ImageMagick-6/policy.xml
 
 VOLUME [ "/app" ]
 
 USER symfony
-RUN composer global require --no-interaction --no-progress hirak/prestissimo:0.3.10
+RUN composer global require --no-interaction --no-progress hirak/prestissimo:$PRESTISSIMO_VERSION
 
 CMD [ "/app/bin/console" ]

php7.2/mysql/Dockerfile

@@ -1,24 +1,29 @@
+ARG COMPOSER_VERSION=latest
+
+FROM composer:${COMPOSER_VERSION} as composer_image
+
 FROM php:7.2-cli
 
 ARG BUILD_DATE
-ARG PRESTISSIMO_VERSION
+ARG PRESTISSIMO_VERSION=0.3.10
+ARG XDEBUG_VERSION=2.9.8
 
 LABEL maintainer="Joël Sunier <[email protected]>" \
     php.version="7.2" \
     php.pdo_connector="MySQL" \
+    php.xdebug_version=${XDEBUG_VERSION} \
     org.label-schema.build-date=${BUILD_DATE}
 
 RUN apt-get update && apt-get install -yqq git curl libmcrypt-dev libjpeg-dev libpng-dev libfreetype6-dev libbz2-dev libxml2-dev libmagickwand-dev libpq-dev libwebp-dev unzip && \
-    docker-php-ext-install mbstring pdo pdo_mysql zip iconv opcache bcmath sockets soap && \
+    docker-php-ext-install pdo_mysql zip opcache bcmath sockets soap && \
     docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ && \
     docker-php-ext-install gd && \
-    pecl install imagick xdebug-2.6.1 redis && \
+    pecl install imagick xdebug-${XDEBUG_VERSION} redis && \
     docker-php-ext-enable imagick xdebug redis && \
     apt-get clean
 
 COPY php.ini $PHP_INI_DIR/php.ini
-
-RUN curl --silent --show-error https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+COPY --from=composer_image /usr/bin/composer /usr/bin/composer
 
 WORKDIR /app
 
@@ -28,14 +33,14 @@ RUN groupadd --gid 1000 symfony \
 
 # Fix permissions issues
 RUN chmod -R a+wrx /app
-RUN chmod  a+wrx /usr/local/bin/composer
+RUN chmod  a+wrx /usr/bin/composer
 
 # Fix Imagick rights for PDF
 RUN rm /etc/ImageMagick-6/policy.xml
 
 VOLUME [ "/app" ]
 
 USER symfony
-RUN composer global require --no-interaction --no-progress hirak/prestissimo:0.3.10
+RUN composer global require --no-interaction --no-progress hirak/prestissimo:$PRESTISSIMO_VERSION
 
 CMD [ "/app/bin/console" ]

php7.2/postgresql/Dockerfile

@@ -1,25 +1,30 @@
+ARG COMPOSER_VERSION=latest
+
+FROM composer:${COMPOSER_VERSION} as composer_image
+
 FROM php:7.2-cli
 
 ARG BUILD_DATE
-ARG PRESTISSIMO_VERSION
+ARG PRESTISSIMO_VERSION=0.3.10
+ARG XDEBUG_VERSION=2.9.8
 
 LABEL maintainer="Joël Sunier <[email protected]>" \
     php.version="7.2" \
     php.pdo_connector="PostgreSQL" \
+    php.xdebug_version=${XDEBUG_VERSION} \
     org.label-schema.build-date=${BUILD_DATE}
 
 RUN apt-get update && apt-get install -yqq git curl libmcrypt-dev libjpeg-dev libpng-dev libfreetype6-dev libbz2-dev libxml2-dev libmagickwand-dev libpq-dev libwebp-dev unzip && \
-    docker-php-ext-install mbstring pdo_pgsql zip iconv opcache bcmath sockets soap && \
+    docker-php-ext-install zip opcache bcmath sockets soap && \
     docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql && \
     docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ && \
-    docker-php-ext-install pdo pdo_pgsql pgsql gd && \
-    pecl install imagick xdebug-2.6.1 redis && \
+    docker-php-ext-install pdo_pgsql pgsql gd && \
+    pecl install imagick xdebug-${XDEBUG_VERSION} redis && \
     docker-php-ext-enable imagick xdebug redis && \
     apt-get clean
 
 COPY php.ini $PHP_INI_DIR/php.ini
-
-RUN curl --silent --show-error https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+COPY --from=composer_image /usr/bin/composer /usr/bin/composer
 
 WORKDIR /app
 
@@ -29,14 +34,14 @@ RUN groupadd --gid 1000 symfony \
 
 # Fix permissions issues
 RUN chmod -R a+wrx /app
-RUN chmod  a+wrx /usr/local/bin/composer
+RUN chmod  a+wrx /usr/bin/composer
 
 # Fix Imagick rights for PDF
 RUN rm /etc/ImageMagick-6/policy.xml
 
 VOLUME [ "/app" ]
 
 USER symfony
-RUN composer global require --no-interaction --no-progress hirak/prestissimo:0.3.10
+RUN composer global require --no-interaction --no-progress hirak/prestissimo:$PRESTISSIMO_VERSION
 
 CMD [ "/app/bin/console" ]

php7.3/mysql/Dockerfile

@@ -1,24 +1,29 @@
+ARG COMPOSER_VERSION=latest
+
+FROM composer:${COMPOSER_VERSION} as composer_image
+
 FROM php:7.3-cli
 
 ARG BUILD_DATE
-ARG PRESTISSIMO_VERSION
+ARG PRESTISSIMO_VERSION=0.3.10
+ARG XDEBUG_VERSION=2.9.8
 
 LABEL maintainer="Joël Sunier <[email protected]>" \
     php.version="7.3" \
     php.pdo_connector="MySQL" \
+    php.xdebug_version=${XDEBUG_VERSION} \
     org.label-schema.build-date=${BUILD_DATE}
 
 RUN apt-get update && apt-get install -yqq git curl libmcrypt-dev libjpeg-dev libpng-dev libfreetype6-dev libbz2-dev libxml2-dev libmagickwand-dev libpq-dev libzip-dev libwebp-dev unzip && \
-    docker-php-ext-install mbstring pdo pdo_mysql zip iconv opcache bcmath sockets soap && \
+    docker-php-ext-install pdo_mysql zip opcache bcmath sockets soap && \
     docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ && \
     docker-php-ext-install gd && \
-    pecl install imagick xdebug-2.7.1 redis && \
+    pecl install imagick xdebug-${XDEBUG_VERSION} redis && \
     docker-php-ext-enable imagick xdebug redis && \
     apt-get clean
 
 COPY php.ini $PHP_INI_DIR/php.ini
-
-RUN curl --silent --show-error https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+COPY --from=composer_image /usr/bin/composer /usr/bin/composer
 
 WORKDIR /app
 
@@ -28,14 +33,14 @@ RUN groupadd --gid 1000 symfony \
 
 # Fix permissions issues
 RUN chmod -R a+wrx /app
-RUN chmod  a+wrx /usr/local/bin/composer
+RUN chmod  a+wrx /usr/bin/composer
 
 # Fix Imagick rights for PDF
 RUN rm /etc/ImageMagick-6/policy.xml
 
 VOLUME [ "/app" ]
 
 USER symfony
-RUN composer global require --no-interaction --no-progress hirak/prestissimo:0.3.10
+RUN composer global require --no-interaction --no-progress hirak/prestissimo:$PRESTISSIMO_VERSION
 
 CMD [ "/app/bin/console" ]