Skip to content

Commit

Permalink
Merge pull request #4 from Micro-PHP/1.6.1
Browse files Browse the repository at this point in the history
1.6.1 - fix bug: build failed if the folder tmp is not empty
  • Loading branch information
Asisyas committed Jan 31, 2023
2 parents e53bdbe + 51f62cc commit 33f5341
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docker/php/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 33f5341

Please sign in to comment.