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]+'