diff --git a/Dockerfile b/Dockerfile index 9be6113..fbd1234 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,10 @@ RUN cd /src && \ go install github.com/Azure/terraform-module-test-helper/bin/breaking_detect@$TFMOD_TEST_HELPER_VERSION && \ go install github.com/terraform-linters/tflint@$TFLINT_VERSION && \ go install github.com/securego/gosec/v2/cmd/gosec@$GOSEC_VERSION && \ - go install github.com/minamijoyo/hcledit@$HCLEDIT_VERSION && \ +# go install github.com/minamijoyo/hcledit@$HCLEDIT_VERSION && \ + git clone https://github.com/lonegunmanb/hcledit.git && \ + cd hcledit && git checkout $HCLEDIT_VERSION && go install && \ + cd /src && \ go install github.com/lonegunmanb/previousTag@latest && \ go install github.com/magodo/hclgrep@latest && \ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH || $GOPATH)/bin $GOLANGCI_LINT_VERSION && \ @@ -72,7 +75,9 @@ COPY --from=build /src/tfenv /tfenv COPY .terraformrc /root/.terraformrc RUN yum update -y && \ yum install -y ca-certificates zip unzip jq python3-pip make git less diffutils build-essential openssh-server wget && \ - tdnf install moby-cli ca-certificates azure-cli -y && \ + tdnf install moby-cli ca-certificates -y && \ + pip3 install cryptography -U && \ + pip install azure-cli && \ wget -q https://go.dev/dl/go${GOLANG_IMAGE_TAG}.linux-${TARGETARCH}.tar.gz && \ tar -C /root -xzf go*.linux-${TARGETARCH}.tar.gz && \ rm go${GOLANG_IMAGE_TAG}.linux-${TARGETARCH}.tar.gz && \ diff --git a/version.env b/version.env index ba5640a..f4715db 100644 --- a/version.env +++ b/version.env @@ -4,7 +4,7 @@ TERRAGRUNT_VERSION=v0.55.2 TFMOD_TEST_HELPER_VERSION=v0.19.0 TFLINT_VERSION=v0.50.3 GOLANGCI_LINT_VERSION=v1.56.2 -HCLEDIT_VERSION=v0.2.10 +HCLEDIT_VERSION=v0.2.10.1 TERRAFORM_VERSION=1.7.1 CHECKOV_VERSION=2.2.155 TFLINT_AZURERM_VERSION=0.25.1 @@ -18,7 +18,7 @@ YORBOX_VERSION=348c3e0ca945c71ee295dd055e5b97614eb93e87 PACKER_VERSION=1.10.2 TFENV=v3.0.0 TFSEC_VERSION=v1.28.4 -GREPT_VERSION=v0.1.0 +GREPT_VERSION=v0.1.1 NEWRES_VERSION=a535fe92925845dfa033a3db71adf7d65511cbf3 AVMFIX_VERSION=9c158444b055e845c0cc9afc7cdc88d0ab19e5eb HCLMERGE_VERSION=8735bef83162f3ee952213b16e89f8d0ac0d08f7