Merge pull request #170 from devilbox/release-0.110

cytopia · web-flow · commit 9e247307ad0b · 2020-09-13T11:16:48.000+02:00
Release v0.110
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@
 ## Unreleased
 
 
+## Release 0.110
+
+#### 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
 
 #### Fixed
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 --------------------
@@ -232,7 +233,7 @@ 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' \
diff --git 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
@@ -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
@@ -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]+'
@@ -546,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/bin/laravel /usr/local/bin/laravel
     all:
       pre: |
         git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,8 @@ RUN set -eux \`
`205`	`205`	`\`
`206`	`206`	`\`
`207`	`207`	`# -------------------- drupalconsole --------------------`
`208`		`- && curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \`
	`208`	`+ && 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')" \`
	`209`	`+ && curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \`
`209`	`210`	`&& chmod +x /usr/local/bin/drupal \`
`210`	`211`	`\`
`211`	`212`	`# -------------------- gitflow --------------------`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,8 @@ RUN set -eux \`
`219`	`219`	`\`
`220`	`220`	`\`
`221`	`221`	`# -------------------- drupalconsole --------------------`
`222`		`- && curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \`
	`222`	`+ && 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')" \`
	`223`	`+ && curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \`
`223`	`224`	`&& chmod +x /usr/local/bin/drupal \`
`224`	`225`	`\`
`225`	`226`	`# -------------------- gitflow --------------------`