diff --git a/CHANGELOG.md b/CHANGELOG.md index d043219..b128153 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ #### Fixed - [169](https://github.com/devilbox/docker-php-fpm/issues/169) Fixes download for drupal console +- Fixes laravel installer for PHP 7.2 ## Release 0.109 diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index b50d4fe..d83cf65 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -233,13 +233,13 @@ RUN set -eux \ # -------------------- laravel -------------------- && git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ && cd /usr/local/src/laravel-installer \ -&& git checkout $(git describe --abbrev=0 --tags) \ +&& git checkout v4.0.0 \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/laravel-installer \ && su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer install --no-interaction --no-progress --no-dev' \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ - && ln -s /usr/local/src/laravel-installer/bin/laravel /usr/local/bin/laravel \ + && ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ \ # -------------------- linkcheck -------------------- && curl -sS -L --fail https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 621a94f..76cb4d5 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -547,6 +547,13 @@ software_available: && git checkout $(git tag | grep '^v2\.3\.' | sort -u | tail -1) \ post: ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel + 7.2: + pre: | + git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ + && cd /usr/local/src/laravel-installer \ + && git checkout v4.0.0 \ + post: + ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel all: pre: | git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \