From 51f62cc55a66fb350024d65b284204a4cc33aa58 Mon Sep 17 00:00:00 2001 From: Stanislau Komar Date: Tue, 31 Jan 2023 18:25:01 +0400 Subject: [PATCH] 1.6.1 - fix bug: build failed if the folder tmp is not empty --- Dockerfile | 2 +- docker/php/docker-entrypoint.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 16a8945..539e276 100755 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ARG STABILITY="stable" ENV STABILITY ${STABILITY} # Allow to select Micro version -ARG MICRO_VERSION="^1" +ARG MICRO_VERSION="^1.6" ENV MICRO_VERSION ${MICRO_VERSION} ENV APP_ENV=prod diff --git a/docker/php/docker-entrypoint.sh b/docker/php/docker-entrypoint.sh index 21c82db..5159c40 100755 --- a/docker/php/docker-entrypoint.sh +++ b/docker/php/docker-entrypoint.sh @@ -9,6 +9,7 @@ fi if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then # Install the project the first time PHP is started # After the installation, the following block can be deleted + rm -Rf tmp/ if [ ! -f composer.json ]; then CREATION=1 composer create-project "micro/micro $MICRO_VERSION" tmp --stability="$STABILITY" --prefer-dist --no-progress --no-interaction --no-install