Fix wget download

cytopia · cytopia · commit 0cbd58141d2c · 2020-01-04T21:22:39.000+01:00
diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2
@@ -191,7 +191,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
+	&& curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \
diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3
@@ -208,7 +208,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
+	&& curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \
@@ -264,7 +264,7 @@ RUN set -eux \
  \
 	\
 # -------------------- phpmd --------------------
-	&& wget --no-hsts https://phpmd.org/static/latest/phpmd.phar \
+	&& curl -sS -L https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
  \
diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
@@ -237,7 +237,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
+	&& curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \
@@ -293,7 +293,7 @@ RUN set -eux \
  \
 	\
 # -------------------- phpmd --------------------
-	&& wget --no-hsts https://phpmd.org/static/latest/phpmd.phar \
+	&& curl -sS -L https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
  \
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
@@ -241,7 +241,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
+	&& curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \
@@ -298,7 +298,7 @@ RUN set -eux \
  \
 	\
 # -------------------- phpmd --------------------
-	&& wget --no-hsts https://phpmd.org/static/latest/phpmd.phar \
+	&& curl -sS -L https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
  \
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
@@ -254,7 +254,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
+	&& curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \
@@ -311,7 +311,7 @@ RUN set -eux \
  \
 	\
 # -------------------- phpmd --------------------
-	&& wget --no-hsts https://phpmd.org/static/latest/phpmd.phar \
+	&& curl -sS -L https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
  \
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
@@ -254,7 +254,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
+	&& curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \
@@ -311,7 +311,7 @@ RUN set -eux \
  \
 	\
 # -------------------- phpmd --------------------
-	&& wget --no-hsts https://phpmd.org/static/latest/phpmd.phar \
+	&& curl -sS -L https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
  \
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
@@ -254,7 +254,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
+	&& curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \
@@ -311,7 +311,7 @@ RUN set -eux \
  \
 	\
 # -------------------- phpmd --------------------
-	&& wget --no-hsts https://phpmd.org/static/latest/phpmd.phar \
+	&& curl -sS -L https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
  \
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
@@ -254,7 +254,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
+	&& curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \
@@ -312,7 +312,7 @@ RUN set -eux \
  \
 	\
 # -------------------- phpmd --------------------
-	&& wget --no-hsts https://phpmd.org/static/latest/phpmd.phar \
+	&& curl -sS -L https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
  \
diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3
@@ -254,7 +254,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
+	&& curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \
@@ -298,7 +298,7 @@ RUN set -eux \
  \
 	\
 # -------------------- phpmd --------------------
-	&& wget --no-hsts https://phpmd.org/static/latest/phpmd.phar \
+	&& curl -sS -L https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
  \
diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4
@@ -254,7 +254,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
+	&& curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \
@@ -293,7 +293,7 @@ RUN set -eux \
  \
 	\
 # -------------------- phpmd --------------------
-	&& wget --no-hsts https://phpmd.org/static/latest/phpmd.phar \
+	&& curl -sS -L https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
  \
diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0
@@ -197,7 +197,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
+	&& curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \
@@ -236,7 +236,7 @@ RUN set -eux \
  \
 	\
 # -------------------- phpmd --------------------
-	&& wget --no-hsts https://phpmd.org/static/latest/phpmd.phar \
+	&& curl -sS -L https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
  \
diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml
@@ -572,7 +572,7 @@ software_available:
   mhsendmail:
     all:
       command: |
-        wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
+        curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
         && chmod +x mhsendmail_linux_amd64 \
         && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
   mysqldumpsecure:
@@ -737,7 +737,7 @@ software_available:
     check: phpmd --version | grep -E '^PHPMD [.0-9]+'
     all:
       command: |
-        wget --no-hsts https://phpmd.org/static/latest/phpmd.phar \
+        curl -sS -L https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
         && mv phpmd.phar /usr/local/bin/phpmd \
         && chmod +x /usr/local/bin/phpmd \
   phpunit:

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ RUN set -eux \`
`191`	`191`	`\`
`192`	`192`	`\`
`193`	`193`	`# -------------------- mhsendmail --------------------`
`194`		`- && wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \`
	`194`	`+ && curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \`
`195`	`195`	`&& chmod +x mhsendmail_linux_amd64 \`
`196`	`196`	`&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \`
`197`	`197`	`\`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ RUN set -eux \`
`208`	`208`	`\`
`209`	`209`	`\`
`210`	`210`	`# -------------------- mhsendmail --------------------`
`211`		`- && wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \`
	`211`	`+ && curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \`
`212`	`212`	`&& chmod +x mhsendmail_linux_amd64 \`
`213`	`213`	`&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \`
`214`	`214`	`\`
`@@ -264,7 +264,7 @@ RUN set -eux \`
`264`	`264`	`\`
`265`	`265`	`\`
`266`	`266`	`# -------------------- phpmd --------------------`
`267`		`- && wget --no-hsts https://phpmd.org/static/latest/phpmd.phar \`
	`267`	`+ && curl -sS -L https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \`
`268`	`268`	`&& mv phpmd.phar /usr/local/bin/phpmd \`
`269`	`269`	`&& chmod +x /usr/local/bin/phpmd \`
`270`	`270`	`\`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ RUN set -eux \`
`237`	`237`	`\`
`238`	`238`	`\`
`239`	`239`	`# -------------------- mhsendmail --------------------`
`240`		`- && wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \`
	`240`	`+ && curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \`
`241`	`241`	`&& chmod +x mhsendmail_linux_amd64 \`
`242`	`242`	`&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \`
`243`	`243`	`\`
`@@ -293,7 +293,7 @@ RUN set -eux \`
`293`	`293`	`\`
`294`	`294`	`\`
`295`	`295`	`# -------------------- phpmd --------------------`
`296`		`- && wget --no-hsts https://phpmd.org/static/latest/phpmd.phar \`
	`296`	`+ && curl -sS -L https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \`
`297`	`297`	`&& mv phpmd.phar /usr/local/bin/phpmd \`
`298`	`298`	`&& chmod +x /usr/local/bin/phpmd \`
`299`	`299`	`\`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ RUN set -eux \`
`241`	`241`	`\`
`242`	`242`	`\`
`243`	`243`	`# -------------------- mhsendmail --------------------`
`244`		`- && wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \`
	`244`	`+ && curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \`
`245`	`245`	`&& chmod +x mhsendmail_linux_amd64 \`
`246`	`246`	`&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \`
`247`	`247`	`\`
`@@ -298,7 +298,7 @@ RUN set -eux \`
`298`	`298`	`\`
`299`	`299`	`\`
`300`	`300`	`# -------------------- phpmd --------------------`
`301`		`- && wget --no-hsts https://phpmd.org/static/latest/phpmd.phar \`
	`301`	`+ && curl -sS -L https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \`
`302`	`302`	`&& mv phpmd.phar /usr/local/bin/phpmd \`
`303`	`303`	`&& chmod +x /usr/local/bin/phpmd \`
`304`	`304`	`\`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ RUN set -eux \`
`254`	`254`	`\`
`255`	`255`	`\`
`256`	`256`	`# -------------------- mhsendmail --------------------`
`257`		`- && wget --no-hsts https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \`
	`257`	`+ && curl -sS -L https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \`
`258`	`258`	`&& chmod +x mhsendmail_linux_amd64 \`
`259`	`259`	`&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \`
`260`	`260`	`\`
`@@ -311,7 +311,7 @@ RUN set -eux \`
`311`	`311`	`\`
`312`	`312`	`\`
`313`	`313`	`# -------------------- phpmd --------------------`
`314`		`- && wget --no-hsts https://phpmd.org/static/latest/phpmd.phar \`
	`314`	`+ && curl -sS -L https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \`
`315`	`315`	`&& mv phpmd.phar /usr/local/bin/phpmd \`
`316`	`316`	`&& chmod +x /usr/local/bin/phpmd \`
`317`	`317`	`\`