From eb6799ad29a0c6ba4ecb9ff52b15716d1441f596 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 12 Sep 2020 11:47:05 +0200 Subject: [PATCH 1/3] Fix download for drupal console --- CHANGELOG.md | 6 ++++++ Dockerfiles/work/Dockerfile-5.5 | 3 ++- Dockerfiles/work/Dockerfile-5.6 | 3 ++- Dockerfiles/work/Dockerfile-7.0 | 3 ++- Dockerfiles/work/Dockerfile-7.1 | 3 ++- Dockerfiles/work/Dockerfile-7.2 | 3 ++- Dockerfiles/work/Dockerfile-7.3 | 3 ++- Dockerfiles/work/Dockerfile-7.4 | 3 ++- build/ansible/group_vars/all/work.yml | 3 ++- 9 files changed, 22 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7d56f9..d043219 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ## Unreleased +## Release 0.110 + +#### Fixed +- [169](https://github.com/devilbox/docker-php-fpm/issues/169) Fixes download for drupal console + + ## Release 0.109 #### Fixed diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index e825d4e..b4875a9 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -205,7 +205,8 @@ RUN set -eux \ \ \ # -------------------- drupalconsole -------------------- - && curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \ + && DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \ + && curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \ && chmod +x /usr/local/bin/drupal \ \ # -------------------- gitflow -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index a953b5c..4ee91bb 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -219,7 +219,8 @@ RUN set -eux \ \ \ # -------------------- drupalconsole -------------------- - && curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \ + && DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \ + && curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \ && chmod +x /usr/local/bin/drupal \ \ # -------------------- gitflow -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 790fff6..93ddaf2 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -219,7 +219,8 @@ RUN set -eux \ \ \ # -------------------- drupalconsole -------------------- - && curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \ + && DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \ + && curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \ && chmod +x /usr/local/bin/drupal \ \ # -------------------- gitflow -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 1ada5ac..b75ac18 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -219,7 +219,8 @@ RUN set -eux \ \ \ # -------------------- drupalconsole -------------------- - && curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \ + && DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \ + && curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \ && chmod +x /usr/local/bin/drupal \ \ # -------------------- gitflow -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 965299f..b50d4fe 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -219,7 +219,8 @@ RUN set -eux \ \ \ # -------------------- drupalconsole -------------------- - && curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \ + && DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \ + && curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \ && chmod +x /usr/local/bin/drupal \ \ # -------------------- gitflow -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index c6f0ad8..17bebde 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -219,7 +219,8 @@ RUN set -eux \ \ \ # -------------------- drupalconsole -------------------- - && curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \ + && DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \ + && curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \ && chmod +x /usr/local/bin/drupal \ \ # -------------------- gitflow -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index c92ae0d..4335ab1 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -219,7 +219,8 @@ RUN set -eux \ \ \ # -------------------- drupalconsole -------------------- - && curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \ + && DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \ + && curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \ && chmod +x /usr/local/bin/drupal \ \ # -------------------- gitflow -------------------- diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 8a03768..621a94f 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -498,7 +498,8 @@ software_available: disabled: [5.2, 5.3, 5.4, 8.0] # TODO: re-enable for 8.0 (currently errors) check: drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]' all: - command: curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal + pre: DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" + command: curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal post: chmod +x /usr/local/bin/drupal gitflow: check: git-flow version | grep -E '[0-9][.0-9]+' From 5684fac8a2ed4280e01251a49e35ebe3e8d6a7b2 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 12 Sep 2020 12:54:07 +0200 Subject: [PATCH 2/3] Fixes laravel installer for PHP 7.2 --- CHANGELOG.md | 1 + Dockerfiles/work/Dockerfile-7.2 | 4 ++-- build/ansible/group_vars/all/work.yml | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) 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 \ From b095b04ec394244041e5b4da6528ba3118c2bd59 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 12 Sep 2020 17:39:20 +0200 Subject: [PATCH 3/3] Fix laravel symlink location for PHP 7.2 --- Dockerfiles/work/Dockerfile-7.2 | 2 +- build/ansible/group_vars/all/work.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index d83cf65..758b320 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -239,7 +239,7 @@ RUN set -eux \ && 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/laravel /usr/local/bin/laravel \ + && 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 \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 76cb4d5..79df2d5 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -553,7 +553,7 @@ software_available: && cd /usr/local/src/laravel-installer \ && git checkout v4.0.0 \ post: - ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel + ln -s /usr/local/src/laravel-installer/bin/laravel /usr/local/bin/laravel all: pre: | git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \