diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 6126ba9..683f827 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -215,9 +215,9 @@ RUN set -eux \ \ && 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 install --no-interaction --no-progress --no-dev' \ -&& ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ + && ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ \ # -------------------- linkcheck -------------------- && curl https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 17c7f3b..8153a2a 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -219,9 +219,9 @@ RUN set -eux \ \ && 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 install --no-interaction --no-progress --no-dev' \ -&& ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ + && ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ \ # -------------------- linkcheck -------------------- && curl https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 90484cd..70719e8 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -232,9 +232,9 @@ RUN set -eux \ \ && 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 install --no-interaction --no-progress --no-dev' \ -&& ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ + && ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ \ # -------------------- linkcheck -------------------- && curl https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index b1484e4..fb047e8 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -232,9 +232,9 @@ RUN set -eux \ \ && 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 install --no-interaction --no-progress --no-dev' \ -&& ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ + && ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ \ # -------------------- linkcheck -------------------- && curl https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 76ec40f..f8fe4a6 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -228,13 +228,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 $(git tag | grep '^v2\.3\.' | sort -u | tail -1) \ \ && 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 install --no-interaction --no-progress --no-dev' \ -&& ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ + && ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ \ # -------------------- linkcheck -------------------- && curl https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 772a39c..907c291 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -232,9 +232,9 @@ RUN set -eux \ \ && 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 install --no-interaction --no-progress --no-dev' \ -&& ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ + && ln -s /usr/local/src/laravel-installer/bin/laravel /usr/local/bin/laravel \ \ # -------------------- linkcheck -------------------- && curl https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 826f6bb..ed88b47 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -232,9 +232,9 @@ RUN set -eux \ \ && 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 install --no-interaction --no-progress --no-dev' \ -&& ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ + && ln -s /usr/local/src/laravel-installer/bin/laravel /usr/local/bin/laravel \ \ # -------------------- linkcheck -------------------- && curl https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 98c9cdd..31b2035 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -232,9 +232,9 @@ RUN set -eux \ \ && 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 install --no-interaction --no-progress --no-dev' \ -&& ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ + && ln -s /usr/local/src/laravel-installer/bin/laravel /usr/local/bin/laravel \ \ # -------------------- linkcheck -------------------- && curl 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 e7cbac2..e574fe1 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -365,7 +365,7 @@ pip_available: # all, 7.2, 7.1, 7.0, 5.6, 5.5, 5.4: # pre: [optional] Run command before 'command:' statement # command: Command to execute -# pre: [optional] Run command after 'command:' statement +# post: [optional] Run command after 'command:' statement # software_available: # Composer is a dependency for others @@ -502,21 +502,36 @@ software_available: git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ && cd /usr/local/src/laravel-installer \ && git checkout v1.3.7 \ + post: + ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel 5.5: pre: | git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ && cd /usr/local/src/laravel-installer \ && git checkout v2.0.0 \ + post: + ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel 5.6: pre: | git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ && cd /usr/local/src/laravel-installer \ && git checkout v2.0.0 \ + post: + ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel 7.0: pre: | git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ && cd /usr/local/src/laravel-installer \ && git checkout v2.0.0 \ + post: + ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel + 7.1: + pre: | + git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ + && cd /usr/local/src/laravel-installer \ + && git checkout $(git tag | grep '^v2\.3\.' | sort -u | tail -1) \ + 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 \ @@ -525,8 +540,9 @@ software_available: command: | 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 install --no-interaction --no-progress --no-dev' \ - && ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ + post: + ln -s /usr/local/src/laravel-installer/bin/laravel /usr/local/bin/laravel linkcheck: check: linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' all: