Skip to content

Commit

Permalink
Merge branch 'release/1.9.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalberger committed Jun 26, 2024
2 parents 8619023 + d5b21dd commit abe73b8
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 64 deletions.
29 changes: 24 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# renovate: datasource=repology depName=debian_12/curl versioning=deb
ENV CURL_VERSION=7.88.1-10+deb12u5
# renovate: datasource=github-releases depName=hashicorp/terraform extractVersion=^v(?<version>.*)$
ENV TERRAFORM_VERSION=1.8.5
ENV TERRAFORM_VERSION=1.9.0
# renovate: datasource=repology depName=debian_12/unzip versioning=deb
ENV UNZIP_VERSION=6.0

Expand All @@ -25,6 +25,15 @@ RUN apt-get update -y && \
unzip /tmp/terraform.zip -d /tmp && \
rm /tmp/terraform.zip

# Install tflint

# renovate: datasource=github-releases depName=terraform-linters/tflint extractVersion=^v(?<version>.*)$
ENV TFLINT_VERSION=0.51.1

RUN curl -Lo /tmp/tflint.zip https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/tflint_linux_amd64.zip && \
unzip /tmp/tflint.zip -d /tmp && \
rm /tmp/tflint.zip


# Final image
FROM base AS final
Expand All @@ -40,11 +49,21 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
WORKDIR /
COPY --from=build /tmp/ /tmp

# Ensure prerequisits are available
RUN git version

# Install Terraform

RUN cp /tmp/terraform /usr/bin/terraform && \
rm -rf /tmp/* && \
# Smoke test
terraform version && \
# Ensure prerequisits are available
git version
terraform version

# Install tflint

RUN cp /tmp/tflint /usr/local/bin/tflint && \
# Smoke test
tflint --version

# Cleanup

RUN rm -rf /tmp/*
Loading

0 comments on commit abe73b8

Please sign in to comment.