Move composer to its own image

Author: lightswitch05

Makefile

@@ -1,33 +1,33 @@
 .PHONY: tests
 
 setup:
-	@docker-compose pull --ignore-pull-failures
-	@docker-compose run --rm composer install
+	@docker compose pull --ignore-pull-failures
+	@docker compose run --rm composer install
 
 tests:
-	@docker-compose run --rm composer validate --strict
-	@docker-compose run --rm php vendor/bin/codecept run --coverage --coverage-html --phpunit-xml test-results.xml --coverage-xml coverage.xml --steps
+	@docker compose run --rm composer validate --strict
+	@docker compose run --rm php vendor/bin/codecept run --coverage --coverage-html --phpunit-xml test-results.xml --coverage-xml coverage.xml --steps
 
 run:
-	@docker-compose run --rm php-version-audit
+	@docker compose run --rm php-version-audit
 
 lint: phpstan psalm rector-dry ecs-dry
 lint-fix: phpstan psalm rector ecs
 
 phpstan:
-	@docker-compose run --rm phpstan
+	@docker compose run --rm phpstan
 
 psalm:
-	@docker-compose run --rm --entrypoint=./vendor/bin/psalm php
+	@docker compose run --rm --entrypoint=./vendor/bin/psalm php
 
 rector-dry:
-	@docker-compose run --rm --entrypoint vendor/bin/rector php process src --dry-run
+	@docker compose run --rm --entrypoint vendor/bin/rector php process src --dry-run
 
 rector:
-	@docker-compose run --rm --entrypoint vendor/bin/rector php process src
+	@docker compose run --rm --entrypoint vendor/bin/rector php process src
 
 ecs-dry:
-	@docker-compose run --rm --entrypoint vendor/bin/ecs php
+	@docker compose run --rm --entrypoint vendor/bin/ecs php
 
 ecs:
-	@docker-compose run --rm --entrypoint vendor/bin/ecs php --fix
+	@docker compose run --rm --entrypoint vendor/bin/ecs php --fix

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 
 x-common: &common
   volumes:
@@ -8,7 +7,9 @@ x-common: &common
 services:
   composer:
     <<: *common
-    image: composer:2.5
+    build:
+      context: ./
+      dockerfile: ./docker/Dockerfile.composer
     volumes:
     - "${PWD}:/opt/php-version-audit"
     - "${HOME}/.composer:/tmp"

docker/Dockerfile.alpine

@@ -1,5 +1,5 @@
 FROM php:8.2-cli-alpine AS composer-build
-COPY --from=composer/composer /composer /usr/bin/composer
+COPY --from=composer/composer:2.5-bin /composer /usr/bin/composer
 WORKDIR /opt/php-version-audit
 COPY ./docker/docker-entrypoint.sh ./docker/docker-entrypoint.sh
 COPY ./src ./src

docker/Dockerfile.bookworm

@@ -1,5 +1,5 @@
 FROM php:8.2-cli-bookworm AS composer-build
-COPY --from=composer/composer /composer /usr/bin/composer
+COPY --from=composer/composer:2.5-bin /composer /usr/bin/composer
 WORKDIR /opt/php-version-audit
 COPY ./docker/docker-entrypoint.sh ./docker/docker-entrypoint.sh
 COPY ./src ./src

docker/Dockerfile.bullseye

@@ -1,5 +1,5 @@
 FROM php:8.2-cli-bullseye AS composer-build
-COPY --from=composer/composer /composer /usr/bin/composer
+COPY --from=composer/composer:2.5-bin /composer /usr/bin/composer
 WORKDIR /opt/php-version-audit
 COPY ./docker/docker-entrypoint.sh ./docker/docker-entrypoint.sh
 COPY ./src ./src

docker/Dockerfile.buster

@@ -1,5 +1,5 @@
 FROM php:8.2-cli-buster AS composer-build
-COPY --from=composer/composer /composer /usr/bin/composer
+COPY --from=composer/composer:2.5-bin /composer /usr/bin/composer
 WORKDIR /opt/php-version-audit
 COPY ./docker/docker-entrypoint.sh ./docker/docker-entrypoint.sh
 COPY ./src ./src

docker/Dockerfile.composer

@@ -0,0 +1,4 @@
+FROM php:8.2-cli-bookworm
+COPY --from=composer/composer:2.5-bin /composer /usr/bin/composer
+RUN apt-get update && apt-get install -y libzip4 libzip-dev && docker-php-ext-install zip
+ENTRYPOINT ["/usr/bin/composer"]