Merge pull request #70 from devilbox/release-0.54

Fixes #69: Loop yarn installs to mitigate network failures
devilbox · Dec 15, 2018 · 3378d7a · 3378d7a
2 parents f90a353 + 11ef4c6
commit 3378d7a
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 22 deletions.
diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2
@@ -150,8 +150,8 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt \
-&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli \
+	&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt; do sleep 1; done \
+&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli; do sleep 1; done \
 && rm -rf /tmp/y \
  \
 # linkcheck

diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3
@@ -169,8 +169,8 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt \
-&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli \
+	&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt; do sleep 1; done \
+&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli; do sleep 1; done \
 && rm -rf /tmp/y \
  \
 # linkcheck

diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
@@ -185,8 +185,8 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt \
-&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli \
+	&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt; do sleep 1; done \
+&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli; do sleep 1; done \
 && rm -rf /tmp/y \
  \
 # laravel

diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
@@ -192,8 +192,8 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt \
-&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli \
+	&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt; do sleep 1; done \
+&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli; do sleep 1; done \
 && rm -rf /tmp/y \
  \
 # laravel

diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
@@ -205,8 +205,8 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt \
-&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli \
+	&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt; do sleep 1; done \
+&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli; do sleep 1; done \
 && rm -rf /tmp/y \
  \
 # laravel

diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
@@ -205,8 +205,8 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt \
-&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli \
+	&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt; do sleep 1; done \
+&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli; do sleep 1; done \
 && rm -rf /tmp/y \
  \
 # laravel

diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
@@ -205,8 +205,8 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt \
-&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli \
+	&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt; do sleep 1; done \
+&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli; do sleep 1; done \
 && rm -rf /tmp/y \
  \
 # laravel

diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
@@ -205,8 +205,8 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt \
-&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli \
+	&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt; do sleep 1; done \
+&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli; do sleep 1; done \
 && rm -rf /tmp/y \
  \
 # laravel

diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3
@@ -205,8 +205,8 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt \
-&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli \
+	&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt; do sleep 1; done \
+&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli; do sleep 1; done \
 && rm -rf /tmp/y \
  \
 # laravel

diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4
@@ -205,8 +205,8 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt \
-&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli \
+	&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt; do sleep 1; done \
+&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli; do sleep 1; done \
 && rm -rf /tmp/y \
  \
 # laravel

diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml
@@ -423,8 +423,8 @@ software_available:
     check: grunt --version | grep -E '[.0-9]+'
     all:
       command: |
-        yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt \
-        && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli \
+        until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt; do sleep 1; done \
+        && until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli; do sleep 1; done \
         && rm -rf /tmp/y \
   laravel:
     check: laravel --version | grep -E '(Installer|version)\s*[.0-9]+'