Merge pull request #33 from jcolfej/master

Fix Terraform versions parsing
cytopia · Jun 10, 2022 · 9ed05ea · 9ed05ea
2 parents dde66de + 75b03a2
commit 9ed05ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,14 +13,14 @@ RUN set -eux \
 	&& if [ "${TF_VERSION}" = "latest" ]; then \
 		VERSION="$( curl -sS https://releases.hashicorp.com/terraform/ \
 			| tac | tac \
-			| grep -Eo '/[.0-9]+/' \
+			| grep -Eo '/terraform/[.0-9]+\"' \
 			| grep -Eo '[.0-9]+' \
 			| sort -V \
 			| tail -1 )"; \
 	else \
 		VERSION="$( curl -sS https://releases.hashicorp.com/terraform/ \
 			| tac | tac \
-			| grep -Eo "/${TF_VERSION}\.[.0-9]+/" \
+			| grep -Eo "/terraform/${TF_VERSION}\.[.0-9]+\"" \
 			| grep -Eo '[.0-9]+' \
 			| sort -V \
 			| tail -1 )"; \

diff --git a/Makefile b/Makefile
@@ -73,7 +73,7 @@ _test-tf-version:
 		LATEST="$$( \
 			curl -L -sS https://releases.hashicorp.com/terraform/ \
 			| tac | tac \
-			| grep -Eo '/[.0-9]+/' \
+			| grep -Eo '/terraform/[.0-9]+\"' \
 			| grep -Eo '[.0-9]+' \
 			| sort -u \
 			| sort -V \