Create configuration for Composer version

steevanb · steevanb · commit 0c2c900852a3 · 2022-01-09T21:57:28.000+01:00
diff --git a/bin/ci/docker b/bin/ci/docker
@@ -4,6 +4,7 @@ set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
 
+source "${ROOT_DIR}"/config/version/composer-version.env
 source "${ROOT_DIR}"/config/docker/ci-docker-image-name.env
 
 DOCKER_IMAGE_NAME="${CI_DOCKER_IMAGE_NAME}" \
diff --git a/bin/ci/env b/bin/ci/env
@@ -4,6 +4,4 @@ set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
 
-source "${ROOT_DIR}"/bin/ci/dockerise.inc.bash
-
 "${ROOT_DIR}"/bin/composer install
diff --git a/bin/composer b/bin/composer
@@ -4,10 +4,16 @@ set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/..")"
 
-source "${ROOT_DIR}"/config/docker/ci-docker-image-name.env
+source "${ROOT_DIR}"/config/version/composer-version.env
+source "${ROOT_DIR}"/bin/docker-interactive-parameter.inc.bash
 
-BIN_DIR=bin \
-    DOCKER_IMAGE_NAME="${CI_DOCKER_IMAGE_NAME}" \
-        source "${ROOT_DIR}"/bin/dockerise.inc.bash
-
-php7.4 /usr/local/bin/composer "${@}"
+docker \
+    run \
+        --rm \
+        --tty \
+        ${DOCKER_INTERACTIVE_PARAMETER} \
+        --volume "${ROOT_DIR}":/app \
+        --user "$(id -u)":"$(id -g)" \
+        --env COMPOSER_CACHE_DIR=/app/var/composer \
+        composer:"${COMPOSER_VERSION}" \
+        "${@}"
diff --git a/bin/docker-build.inc.bash b/bin/docker-build.inc.bash
@@ -20,6 +20,7 @@ function buildDockerImage() {
                 --tag "${dockerImageName}" \
                 --build-arg DOCKER_UID="$(id -u)" \
                 --build-arg DOCKER_GID="$(id -g)" \
+                --build-arg COMPOSER_VERSION="${COMPOSER_VERSION}" \
                 ${refreshArguments} \
                 ${dockerBuildParams} \
                 "${ROOT_DIR}"
diff --git a/bin/docker-interactive-parameter.inc.bash b/bin/docker-interactive-parameter.inc.bash
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+# Some terminals are not interactives, like GitLab CI for example
+
+set -eu
+
+set +e
+tty -s > /dev/null 2>&1 && isInteractiveShell=true || isInteractiveShell=false
+set -e
+if ${isInteractiveShell}; then
+    readonly DOCKER_INTERACTIVE_PARAMETER="--interactive"
+else
+    readonly DOCKER_INTERACTIVE_PARAMETER=
+fi
diff --git a/bin/dockerise.inc.bash b/bin/dockerise.inc.bash
@@ -9,21 +9,13 @@ else
 fi
 
 if ! ${isInDocker}; then
-    set +e
-    tty -s && isInteractiveShell=true || isInteractiveShell=false
-    set -e
-
-    if ${isInteractiveShell}; then
-        interactiveParameter="--interactive"
-    else
-        interactiveParameter=
-    fi
+    source "${ROOT_DIR}"/bin/docker-interactive-parameter.inc.bash
 
     docker \
         run \
             --rm \
             --tty \
-            ${interactiveParameter} \
+            ${DOCKER_INTERACTIVE_PARAMETER} \
             --volume "${ROOT_DIR}":/app \
             --user "$(id -u)":"$(id -g)" \
             --entrypoint "${BIN_DIR}"/"$(basename "${0}")" \
diff --git a/bin/parallel-processes/docker b/bin/parallel-processes/docker
@@ -4,7 +4,8 @@ set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
 
-source "${ROOT_DIR}"/config/repository/version.env
+source "${ROOT_DIR}"/config/version/composer-version.env
+source "${ROOT_DIR}"/config/version/repository-version.env
 source "${ROOT_DIR}"/config/docker/parallel-processes-docker-image-name.env
 
 DOCKER_IMAGE_NAME="${PARALLEL_PROCESSES_DOCKER_IMAGE_NAME}" \
diff --git a/bin/release/docker b/bin/release/docker
@@ -4,6 +4,7 @@ set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
 
+source "${ROOT_DIR}"/config/version/composer-version.env
 source "${ROOT_DIR}"/config/docker/release-docker-image-name.env
 
 DOCKER_IMAGE_NAME="${RELEASE_DOCKER_IMAGE_NAME}" \
diff --git a/bin/release/env b/bin/release/env
@@ -5,4 +5,4 @@ readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
 
 source "${ROOT_DIR}"/bin/release/dockerise.inc.bash
 
-"${ROOT_DIR}"/bin/composer install
+composer install
diff --git a/bin/release/prepare b/bin/release/prepare
@@ -110,7 +110,7 @@ function updateRepositoryVersion() {
     trap onError ERR
 
     echo "Edit REPOSITORY_VERSION"
-    echo "REPOSITORY_VERSION=${NEW_REPOSITORY_VERSION}" > "${ROOT_DIR}"/config/repository/version.env
+    echo "REPOSITORY_VERSION=${NEW_REPOSITORY_VERSION}" > "${ROOT_DIR}"/config/version/repository-version.env
 }
 
 initLog
diff --git a/changelog.md b/changelog.md
@@ -5,6 +5,7 @@
 - Create GitHub Actions to build and push Docker image `steevanb/php-parallel-processes:release`
 - Create configurations for Docker images name
 - Create configuration for repository version
+- Create configuration for Composer version
 
 ### [0.2.1](../../compare/0.2.0...0.2.1) - 2022-01-08
 
diff --git a/composer.json b/composer.json
@@ -32,6 +32,9 @@
         }
     },
     "config": {
+        "platform": {
+            "php": "7.4.0"
+        },
         "sort-packages": true
     },
     "scripts": {
diff --git a/config/version/composer-version.env b/config/version/composer-version.env
@@ -0,0 +1 @@
+COMPOSER_VERSION=2.2.3
diff --git a/config/version/repository-version.env b/config/version/repository-version.env
diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile
@@ -1,13 +1,19 @@
+ARG COMPOSER_VERSION
+
+FROM composer:${COMPOSER_VERSION} as composer
+
 FROM ubuntu:20.04
 
-COPY --from=composer:2.1.6 /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 
 ENV COMPOSER_HOME=/composer/common
 ENV COMPOSER_HOME_SYMFONY_5_0=/composer/symfony-5-0
 ENV COMPOSER_HOME_SYMFONY_5_1=/composer/symfony-5-1
 ENV COMPOSER_HOME_SYMFONY_5_2=/composer/symfony-5-2
 ENV COMPOSER_HOME_SYMFONY_5_3=/composer/symfony-5-3
 
+COPY docker/ci/global.composer.json ${COMPOSER_HOME}/composer.json
+
 RUN \
     apt-get update \
     # To add add-apt-repository
@@ -24,7 +30,7 @@ RUN \
         php8.0-mbstring \
         # For Composer
         curl zip php7.4-curl php7.4-zip \
-        # For coverage \
+        # For coverage
         php8.0-xdebug \
 
     # Install CI tools
diff --git a/docker/ci/global.composer.json b/docker/ci/global.composer.json
@@ -0,0 +1,8 @@
+{
+    "config": {
+        "allow-plugins": {
+            "ergebnis/composer-normalize": true,
+            "infection/extension-installer": true
+        }
+    }
+}
diff --git a/docker/parallel-processes/Dockerfile b/docker/parallel-processes/Dockerfile
@@ -1,7 +1,11 @@
+ARG COMPOSER_VERSION
+
+FROM composer:${COMPOSER_VERSION} as composer
+
 # Do not use Alpine because docker-compose will not works
 FROM php:8.1.1-cli-buster
 
-COPY --from=composer:2.2.3 /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 
 ENV COMPOSER_HOME=/composer
 ENV COMPOSER_GLOBAL_AUTOLOAD_FILE_NAME=/composer/vendor/autoload.php
@@ -12,5 +16,10 @@ RUN \
     apt-get update \
     && apt-get install -y bash unzip \
     && composer global require steevanb/php-parallel-processes:${REPOSITORY_VERSION} \
-    && apt-get autoremove \
-    && apt-get clean
+
+    # Purge \
+    && rm /usr/local/bin/composer \
+    && apt-get autoremove -y \
+    && apt-get clean \
+    && apt-get autoclean \
+    && rm -rf /tmp/*
diff --git a/docker/release/Dockerfile b/docker/release/Dockerfile
@@ -1,18 +1,24 @@
+ARG COMPOSER_VERSION
+
+FROM composer:${COMPOSER_VERSION} as composer
+
 FROM php:8.0.10-cli-alpine3.14
 
-COPY --from=composer:2.1.6 /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 
 ENV COMPOSER_HOME=/composer/common
 ENV COMPOSER_HOME_SYMFONY_5_3=/composer/symfony-5-3
 
+COPY docker/release/global.composer.json ${COMPOSER_HOME}/composer.json
+
 RUN \
     apk add --no-cache \
         bash \
         cloc \
         jq \
         git \
 
-    # Install xdebug \
+    # Install xdebug
     && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
     && pecl install xdebug-3.0.4 \
     && docker-php-ext-enable xdebug \
@@ -21,14 +27,14 @@ RUN \
     # Install infection
     && composer global require infection/infection:0.24.* \
     && ln -s ${COMPOSER_HOME}/vendor/bin/infection /usr/local/bin/infection \
+    # This file is generated by infection/extension-installer
+    # https://github.com/infection/extension-installer/issues/4
+    && chmod 777 ${COMPOSER_HOME}/vendor/infection/extension-installer/src/GeneratedExtensionsConfig.php \
 
     # Install symfony components for coverage
     && COMPOSER_HOME=${COMPOSER_HOME_SYMFONY_5_3} \
         composer global require symfony/console:5.3.* symfony/process:5.3.* \
 
-    # Add symlink to make bin/composer works, do it better one day ;) \
-    && ln -s /usr/local/bin/php /usr/bin/php7.4 \
-
     # Purge
     && rm -rf /tmp/*
 
diff --git a/docker/release/global.composer.json b/docker/release/global.composer.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "allow-plugins": {
+            "infection/extension-installer": true
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,4 @@ readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"`
`5`	`5`
`6`	`6`	`source "${ROOT_DIR}"/bin/release/dockerise.inc.bash`
`7`	`7`
`8`		`-"${ROOT_DIR}"/bin/composer install`
	`8`	`+composer install`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ function updateRepositoryVersion() {`
`110`	`110`	`trap onError ERR`
`111`	`111`
`112`	`112`	`echo "Edit REPOSITORY_VERSION"`
`113`		`- echo "REPOSITORY_VERSION=${NEW_REPOSITORY_VERSION}" > "${ROOT_DIR}"/config/repository/version.env`
	`113`	`+ echo "REPOSITORY_VERSION=${NEW_REPOSITORY_VERSION}" > "${ROOT_DIR}"/config/version/repository-version.env`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`initLog`