diff --git a/CHANGELOG.md b/CHANGELOG.md index ee6db66..de647e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ #### Added - Added AVIF support in GD for PHP 8.1 (#834)[https://github.com/cytopia/devilbox/issues/834] - Added `sqlite3` binary to all PHP images (#856)[https://github.com/cytopia/devilbox/issues/856] +- Added `laravel` binary to PHP 8.0 and PHP 8.1 (#823)[https://github.com/cytopia/devilbox/issues/823] - Added `amqp` extension for PHP 8.0 and PHP 8.1 (#826)[https://github.com/cytopia/devilbox/issues/826] diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 21198ef..3e3ea09 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -219,6 +219,17 @@ RUN set -eux \ && su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ \ \ +# -------------------- 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) \ + \ + && 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 \ + \ # -------------------- linkcheck -------------------- && curl -sS -L --fail https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \ && chmod +x /usr/local/bin/linkcheck \ @@ -497,6 +508,7 @@ RUN set -eux \ && regex-grep --version | grep -E '[0-9][.0-9]+' \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && git-flow version | grep -E '[0-9][.0-9]+' \ + && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ && mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \ && phpcs --version | grep -E 'version [0-9][.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 929d78c..cbf5174 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -219,6 +219,17 @@ RUN set -eux \ && su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ \ \ +# -------------------- 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) \ + \ + && 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 \ + \ # -------------------- linkcheck -------------------- && curl -sS -L --fail https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \ && chmod +x /usr/local/bin/linkcheck \ @@ -497,6 +508,7 @@ RUN set -eux \ && regex-grep --version | grep -E '[0-9][.0-9]+' \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && git-flow version | grep -E '[0-9][.0-9]+' \ + && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ && mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \ && phpcs --version | grep -E 'version [0-9][.0-9]+' \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 92bbbbe..be46d33 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -643,7 +643,7 @@ software_available: && su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ laravel: check: laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' - disabled: [5.2, 5.3, 8.0, 8.1] + disabled: [5.2, 5.3] 5.4: pre: | git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \