From b537f07c167314b0fd0f826ecd76be6d4ed8badc Mon Sep 17 00:00:00 2001 From: Benjamin DUPUIS Date: Mon, 17 Mar 2025 10:43:18 +0100 Subject: [PATCH 1/2] fix: display tofu & terraform version --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 59bc2fd7b..98e678774 100644 --- a/Dockerfile +++ b/Dockerfile @@ -84,8 +84,8 @@ RUN /install/trivy.sh RUN . /.env && \ F=tools_versions_info && \ pre-commit --version >> $F && \ - (if [ "$OPENTOFU_VERSION" != "false" ]; then echo "./tofu --version | head -n 1" >> $F; else echo "opentofu SKIPPED" >> $F ; fi) && \ - (if [ "$TERRAFORM_VERSION" != "false" ]; then echo "./terraform --version | head -n 1" >> $F; else echo "terraform SKIPPED" >> $F ; fi) && \ + (if [ "$OPENTOFU_VERSION" != "false" ]; then echo "tofu $(./tofu --version | head -n 1)" >> $F; else echo "opentofu SKIPPED" >> $F ; fi) && \ + (if [ "$TERRAFORM_VERSION" != "false" ]; then echo "terraform $(./terraform --version | head -n 1)" >> $F; else echo "terraform SKIPPED" >> $F ; fi) && \ \ (if [ "$CHECKOV_VERSION" != "false" ]; then echo "checkov $(checkov --version)" >> $F; else echo "checkov SKIPPED" >> $F ; fi) && \ (if [ "$HCLEDIT_VERSION" != "false" ]; then echo "hcledit $(./hcledit version)" >> $F; else echo "hcledit SKIPPED" >> $F ; fi) && \ From 5de13b95dc31713b5e078105fdc5b42119e4dcc9 Mon Sep 17 00:00:00 2001 From: Maksym Vlasov Date: Fri, 21 Mar 2025 00:44:01 +0200 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: George L. Yermulnik --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 98e678774..587a9c652 100644 --- a/Dockerfile +++ b/Dockerfile @@ -84,8 +84,9 @@ RUN /install/trivy.sh RUN . /.env && \ F=tools_versions_info && \ pre-commit --version >> $F && \ - (if [ "$OPENTOFU_VERSION" != "false" ]; then echo "tofu $(./tofu --version | head -n 1)" >> $F; else echo "opentofu SKIPPED" >> $F ; fi) && \ - (if [ "$TERRAFORM_VERSION" != "false" ]; then echo "terraform $(./terraform --version | head -n 1)" >> $F; else echo "terraform SKIPPED" >> $F ; fi) && \ + (if [ "$OPENTOFU_VERSION" != "false" ]; then ./tofu --version | head -n 1 >> $F; else echo "opentofu SKIPPED" >> $F ; fi) && \ + (if [ "$TERRAFORM_VERSION" != "false" ]; then ./terraform --version | head -n 1 >> $F; else echo "terraform SKIPPED" >> $F ; fi) && \ + \ (if [ "$CHECKOV_VERSION" != "false" ]; then echo "checkov $(checkov --version)" >> $F; else echo "checkov SKIPPED" >> $F ; fi) && \ (if [ "$HCLEDIT_VERSION" != "false" ]; then echo "hcledit $(./hcledit version)" >> $F; else echo "hcledit SKIPPED" >> $F ; fi) && \