Create configurations for Docker images name and repository version

steevanb · steevanb · commit 0069ece17884 · 2022-01-09T18:28:33.000+01:00
diff --git a/bin/ci/composer-normalize b/bin/ci/composer-normalize
@@ -1,9 +1,9 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-. "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/ci/dockerise.inc.bash
 
 composer normalize --ansi --no-cache
diff --git a/bin/ci/composer-require-checker b/bin/ci/composer-require-checker
@@ -1,9 +1,9 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-. "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/ci/dockerise.inc.bash
 
 composer-require-checker --ansi "${@}"
diff --git a/bin/ci/composer-validate b/bin/ci/composer-validate
@@ -1,9 +1,9 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-. "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/ci/dockerise.inc.bash
 
 composer validate --ansi --strict
diff --git a/bin/ci/docker b/bin/ci/docker
@@ -3,8 +3,9 @@
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-source "${ROOT_DIR}"/bin/common.inc.bash
+
+source "${ROOT_DIR}"/config/docker/ci-docker-image-name.env
 
 DOCKER_IMAGE_NAME="${CI_DOCKER_IMAGE_NAME}" \
     DOCKER_FILE_PATH="${ROOT_DIR}"/docker/ci/Dockerfile \
-    source "${ROOT_DIR}"/bin/docker-build.inc.bash
+        source "${ROOT_DIR}"/bin/docker-build.inc.bash
diff --git a/bin/ci/dockerise.inc.bash b/bin/ci/dockerise.inc.bash
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -eu
+
+source "${ROOT_DIR}"/config/docker/ci-docker-image-name.env
+
+BIN_DIR=bin/ci \
+    DOCKER_IMAGE_NAME="${CI_DOCKER_IMAGE_NAME}" \
+        source "${ROOT_DIR}"/bin/dockerise.inc.bash
diff --git a/bin/ci/env b/bin/ci/env
@@ -1,9 +1,9 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-. "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/ci/dockerise.inc.bash
 
 "${ROOT_DIR}"/bin/composer install
diff --git a/bin/ci/infection b/bin/ci/infection
@@ -1,11 +1,10 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-. "${ROOT_DIR}"/bin/dockerise.inc.bash
 
+source "${ROOT_DIR}"/bin/ci/dockerise.inc.bash
 
 XDEBUG_MODE=coverage \
     infection \
diff --git a/bin/ci/phpcs b/bin/ci/phpcs
@@ -1,10 +1,10 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-. "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/ci/dockerise.inc.bash
 
 if [ ! -d "${ROOT_DIR}"/var/ci/phpcs ]; then
     mkdir -p "${ROOT_DIR}"/var/ci/phpcs
diff --git a/bin/ci/phpdd b/bin/ci/phpdd
@@ -1,9 +1,9 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-. "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/ci/dockerise.inc.bash
 
 phpdd --ansi --exclude=vendor,var "${@}" .
diff --git a/bin/ci/phpstan b/bin/ci/phpstan
@@ -1,10 +1,10 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-. "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/ci/dockerise.inc.bash
 
 phpstan \
     analyse \
diff --git a/bin/ci/phpunit b/bin/ci/phpunit
@@ -3,8 +3,8 @@
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-. "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/ci/dockerise.inc.bash
 
 phpVersion=
 symfonyVersion=
diff --git a/bin/ci/phpunit-coverage b/bin/ci/phpunit-coverage
@@ -1,10 +1,10 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-. "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/ci/dockerise.inc.bash
 
 echo "PHP 8.0 - Symfony 5.3"
 set +e
diff --git a/bin/ci/shellcheck b/bin/ci/shellcheck
@@ -3,8 +3,8 @@
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-. "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/ci/dockerise.inc.bash
 
 readonly binaries=(
     bin/ci/composer-require-checker
@@ -25,7 +25,6 @@ readonly binaries=(
     bin/release/env
     bin/release/phpunit-coverage
     bin/release/prepare
-    bin/common.inc.bash
     bin/composer
     bin/docker-build.inc.bash
     bin/dockerise.inc.bash
diff --git a/bin/ci/unused-scanner b/bin/ci/unused-scanner
@@ -1,9 +1,9 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-. "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/ci/dockerise.inc.bash
 
 unused-scanner "${ROOT_DIR}"/config/ci/unused-scanner.php
diff --git a/bin/ci/validate b/bin/ci/validate
@@ -1,9 +1,9 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-. "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/ci/dockerise.inc.bash
 
 php8.0 "${ROOT_DIR}"/bin/ci/validate.php "${@}"
diff --git a/bin/common.inc.bash b/bin/common.inc.bash
diff --git a/bin/composer b/bin/composer
@@ -1,11 +1,13 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
+
+source "${ROOT_DIR}"/config/docker/ci-docker-image-name.env
+
 BIN_DIR=bin \
-    COMPOSER_HOME=/app/var/composer \
-        . "${ROOT_DIR}"/bin/dockerise.inc.bash
+    DOCKER_IMAGE_NAME="${CI_DOCKER_IMAGE_NAME}" \
+        source "${ROOT_DIR}"/bin/dockerise.inc.bash
 
 php7.4 /usr/local/bin/composer "${@}"
diff --git a/bin/docker-build.inc.bash b/bin/docker-build.inc.bash
@@ -5,6 +5,7 @@ set -eu
 function buildDockerImage() {
     local dockerImageName="${1}"
     local dockerFilePath="${2}"
+    local dockerBuildParams="${3}"
 
     if [ "${refresh}" == true ]; then
         local refreshArguments="--no-cache --pull"
@@ -20,6 +21,7 @@ function buildDockerImage() {
                 --build-arg DOCKER_UID="$(id -u)" \
                 --build-arg DOCKER_GID="$(id -g)" \
                 ${refreshArguments} \
+                ${dockerBuildParams} \
                 "${ROOT_DIR}"
 }
 
@@ -40,7 +42,7 @@ for param in "${@}"; do
     fi
 done
 
-buildDockerImage "${DOCKER_IMAGE_NAME}" "${DOCKER_FILE_PATH}"
+buildDockerImage "${DOCKER_IMAGE_NAME}" "${DOCKER_FILE_PATH}" "${DOCKER_BUILD_PARAMS:-}"
 
 if [ "${push}" == true ]; then
     pushDockerImage "${DOCKER_IMAGE_NAME}"
diff --git a/bin/dockerise.inc.bash b/bin/dockerise.inc.bash
@@ -8,14 +8,6 @@ else
     readonly isInDocker=true
 fi
 
-if [ -z "${BIN_DIR-}" ]; then
-    BIN_DIR="bin/ci"
-fi
-
-if [ -z "${DOCKER_IMAGE_NAME-}" ]; then
-    DOCKER_IMAGE_NAME="${CI_DOCKER_IMAGE_NAME}"
-fi
-
 if ! ${isInDocker}; then
     set +e
     tty -s && isInteractiveShell=true || isInteractiveShell=false
diff --git a/bin/parallel-processes/docker b/bin/parallel-processes/docker
@@ -3,8 +3,11 @@
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-source "${ROOT_DIR}"/bin/common.inc.bash
+
+source "${ROOT_DIR}"/config/repository/version.env
+source "${ROOT_DIR}"/config/docker/image-name.env
 
 DOCKER_IMAGE_NAME="${PARALLEL_PROCESSES_DOCKER_IMAGE_NAME}" \
     DOCKER_FILE_PATH="${ROOT_DIR}"/docker/parallel-processes/Dockerfile \
-        source "${ROOT_DIR}"/bin/docker-build.inc.bash
+        DOCKER_BUILD_PARAMS="--build-arg REPOSITORY_VERSION=${REPOSITORY_VERSION}" \
+            source "${ROOT_DIR}"/bin/docker-build.inc.bash
diff --git a/bin/release/changelog b/bin/release/changelog
@@ -1,11 +1,9 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-BIN_DIR=bin/release \
-    DOCKER_IMAGE_NAME="${RELEASE_DOCKER_IMAGE_NAME}" \
-    . "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/release/dockerise.inc.bash
 
 php "${ROOT_DIR}"/bin/release/changelog.php "${1}"
diff --git a/bin/release/code-lines b/bin/release/code-lines
@@ -3,10 +3,8 @@
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-BIN_DIR=bin/release \
-    DOCKER_IMAGE_NAME="${RELEASE_DOCKER_IMAGE_NAME}" \
-    . "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/release/dockerise.inc.bash
 
 readonly lines=$(cloc \
     --exclude-dir=.idea,var,vendor \
diff --git a/bin/release/docker b/bin/release/docker
@@ -3,7 +3,8 @@
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-source "${ROOT_DIR}"/bin/common.inc.bash
+
+source "${ROOT_DIR}"/config/docker/release-docker-image-name.env
 
 DOCKER_IMAGE_NAME="${RELEASE_DOCKER_IMAGE_NAME}" \
     DOCKER_FILE_PATH="${ROOT_DIR}"/docker/release/Dockerfile \
diff --git a/bin/release/dockerise.inc.bash b/bin/release/dockerise.inc.bash
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -eu
+
+source "${ROOT_DIR}"/config/docker/release-docker-image-name.env
+
+BIN_DIR=bin/release \
+    DOCKER_IMAGE_NAME="${RELEASE_DOCKER_IMAGE_NAME}" \
+        source "${ROOT_DIR}"/bin/dockerise.inc.bash
diff --git a/bin/release/env b/bin/release/env
@@ -1,11 +1,8 @@
-#!/usr/bin/env sh
-
+#!/usr/bin/env bash
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-BIN_DIR=bin/release \
-    DOCKER_IMAGE_NAME="${RELEASE_DOCKER_IMAGE_NAME}" \
-    . "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/release/dockerise.inc.bash
 
 "${ROOT_DIR}"/bin/composer install
diff --git a/bin/release/infection b/bin/release/infection
@@ -1,13 +1,10 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-BIN_DIR=bin/release \
-    DOCKER_IMAGE_NAME="${RELEASE_DOCKER_IMAGE_NAME}" \
-        . "${ROOT_DIR}"/bin/dockerise.inc.bash
 
+source "${ROOT_DIR}"/bin/release/dockerise.inc.bash
 
 XDEBUG_MODE=coverage \
     infection \
diff --git a/bin/release/phpunit-coverage b/bin/release/phpunit-coverage
@@ -1,12 +1,10 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -eu
 
 readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
-. "${ROOT_DIR}"/bin/common.inc.bash
-BIN_DIR=bin/release \
-    DOCKER_IMAGE_NAME="${RELEASE_DOCKER_IMAGE_NAME}" \
-    . "${ROOT_DIR}"/bin/dockerise.inc.bash
+
+source "${ROOT_DIR}"/bin/release/dockerise.inc.bash
 
 set +e
 XDEBUG_MODE=coverage \
diff --git a/bin/release/prepare b/bin/release/prepare
diff --git a/bin/start b/bin/start
diff --git a/changelog.md b/changelog.md
diff --git a/config/docker/ci-docker-image-name.env b/config/docker/ci-docker-image-name.env
diff --git a/config/docker/parallel-processes-docker-image-name.env b/config/docker/parallel-processes-docker-image-name.env
diff --git a/config/docker/release-docker-image-name.env b/config/docker/release-docker-image-name.env
diff --git a/config/repository/version.env b/config/repository/version.env
diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile
diff --git a/docker/parallel-processes/Dockerfile b/docker/parallel-processes/Dockerfile
