add hclmerge to the container

Azure · Jan 19, 2024 · d58350b · d58350b
1 parent 8e725e0
commit d58350b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -12,6 +12,7 @@ ARG TFENV=v3.0.0
 ARG GREPT_VERSION=1a4f08c2fdc41b6a3702fa1238354c40a3fcce3e
 ARG NEWRES_VERSION=a535fe92925845dfa033a3db71adf7d65511cbf3
 ARG AVMFIX_VERSION=9c158444b055e845c0cc9afc7cdc88d0ab19e5eb
+ARG HCLMERGE_VERSION=8735bef83162f3ee952213b16e89f8d0ac0d08f7
 ARG TARGETARCH
 COPY GNUmakefile /src/GNUmakefile
 COPY scripts /src/scripts
@@ -35,6 +36,7 @@ RUN cd /src && \
     go install github.com/lonegunmanb/yorbox@$YORBOX_VERSION && \
     go install github.com/Azure/grept@$GREPT_VERSION && \
     go install github.com/lonegunmanb/newres/v3@$NEWRES_VERSION && \
+    go install github.com/lonegunmanb/hclmerge@$HCLMERGE_VERSION && \
 #    curl '-#' -fL -o /tmp/yor.tar.gz https://github.com/bridgecrewio/yor/releases/download/${YOR_VERSION}/yor_${YOR_VERSION}_linux_${TARGETARCH}.tar.gz && \
 #    tar -xzf /tmp/yor.tar.gz -C /go/bin && chmod +x /go/bin/yor
     git clone https://github.com/lonegunmanb/yor.git && \

diff --git a/version.env b/version.env
@@ -18,4 +18,5 @@ TFENV=v3.0.0
 TFSEC_VERSION=v1.28.4
 GREPT_VERSION=d022538697a9a10b1d0d278170b008bf09057e48
 NEWRES_VERSION=a535fe92925845dfa033a3db71adf7d65511cbf3
-AVMFIX_VERSION=9c158444b055e845c0cc9afc7cdc88d0ab19e5eb
+AVMFIX_VERSION=9c158444b055e845c0cc9afc7cdc88d0ab19e5eb
+HCLMERGE_VERSION=8735bef83162f3ee952213b16e89f8d0ac0d08f7