diff --git a/composer.json b/composer.json index 8546a8a..5e9a9aa 100644 --- a/composer.json +++ b/composer.json @@ -3,9 +3,9 @@ "license": "MIT", "require": { "php": "7.4.*", - "ext-apcu": "^5.1", - "ext-ctype": "*", - "ext-iconv": "*", + "ext-apcu": "5.1.*", + "ext-ctype": "7.4.*", + "ext-iconv": "7.4.*", "symfony/console": "5.2.*", "symfony/dotenv": "5.2.*", "symfony/flex": "^1.3.1", diff --git a/devops/scripts/init.sh b/devops/scripts/init.sh index 6f25a15..1cde9b1 100755 --- a/devops/scripts/init.sh +++ b/devops/scripts/init.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh # shellcheck disable=SC2046 -SCRIPTS_DIRECTORY=$(dirname $(realpath $0)) +SCRIPTS_DIRECTORY=$(dirname $(realpath "$0")) set -e diff --git a/devops/scripts/install.sh b/devops/scripts/install.sh index a41a6eb..d6cbab0 100755 --- a/devops/scripts/install.sh +++ b/devops/scripts/install.sh @@ -11,20 +11,16 @@ set -a [ -f devops/docker/.env ] && . devops/docker/.env set +a -color="\e[34m" -defaultColor="\e[0m" - # shellcheck disable=SC2028 -echo "$color\n### Building containers ... $defaultColor" +echo "### Building containers ..." docker-compose build \ --build-arg HOME=$HOME \ --build-arg USER=$USER \ --build-arg UID=$(id -u) \ - --build-arg GID=$(id -g) \ - --build-arg COMPOSER_VERSION=$COMPOSER_VERSION + --build-arg GID=$(id -g) # shellcheck disable=SC2028 -echo "$color\n### Creating .env ... $defaultColor" +echo "### Creating .env ..." ENV_FILE=.env if [ ! -f "$ENV_FILE" ]; then cp devops/dist/.env-dist "$ENV_FILE"