Skip to content

Commit

Permalink
Merge branch 'release/1.9.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
@pascalberger
pascalberger committed Aug 21, 2024
2 parents 21dc538 + 832ff45 commit beedc9d
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 34 deletions.
57 changes: 25 additions & 32 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@ FROM base AS build
# Make sure to fail due to an error at any stage in shell pipes
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

# Install Terraform

# renovate: datasource=repology depName=debian_12/curl versioning=deb
ENV CURL_VERSION=7.88.1-10+deb12u6
# renovate: datasource=github-releases depName=hashicorp/terraform extractVersion=^v(?<version>.*)$
ENV TERRAFORM_VERSION=1.9.4
# renovate: datasource=repology depName=debian_12/unzip versioning=deb
ENV UNZIP_VERSION=6.0

# Install necessary dependencies
RUN apt-get update -y && \
# Install necessary dependencies
apt-get install -y --no-install-recommends curl=${CURL_VERSION} unzip=${UNZIP_VERSION}-28 && \
# Download Terraform
curl -o /tmp/terraform.zip https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
unzip /tmp/terraform.zip -d /tmp && \
apt-get install -y --no-install-recommends unzip=${UNZIP_VERSION}-28

# Install Terraform

# renovate: datasource=github-releases depName=hashicorp/terraform extractVersion=^v(?<version>.*)$
ENV TERRAFORM_VERSION=1.9.5

# Download Terraform
ADD https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip /tmp/terraform.zip
RUN 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.52.0
ENV TFLINT_VERSION=0.53.0

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 && \
ADD https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/tflint_linux_amd64.zip /tmp/tflint.zip
RUN unzip /tmp/tflint.zip -d /tmp && \
rm /tmp/tflint.zip


Expand All @@ -49,21 +49,14 @@ 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 && \
# Smoke test
terraform version

# Install tflint

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

# Cleanup

RUN rm -rf /tmp/*
RUN \
# Ensure prerequisits are available
git version && \
# Install Terraform
cp /tmp/terraform /usr/bin/terraform && \
terraform version && \
# Install tflint
cp /tmp/tflint /usr/local/bin/tflint && \
tflint --version && \
# Cleanup
rm -rf /tmp/*
5 changes: 3 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ Note that two secret variables (`Azure.UserName` and `Azure.Password`) are passe

| Tag | Description | Base Image | Terraform | TfLint | Size |
|----------|---------------------------------------------------------------------------------|-----------------------------------------------|-----------|--------|------------------------------------------------------------------------------------------------------------------------------------|
| latest | Latest stable release (from `main` branch) | swissgrc/azure-pipelines-azurecli:2.63.0-net8 | 1.9.4 | 0.52.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/latest?style=flat-square) |
| unstable | Latest unstable release (from `develop` branch) | swissgrc/azure-pipelines-azurecli:2.63.0-net8 | 1.9.4 | 0.52.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/unstable?style=flat-square) |
| latest | Latest stable release (from `main` branch) | swissgrc/azure-pipelines-azurecli:2.63.0-net8 | 1.9.5 | 0.53.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/latest?style=flat-square) |
| unstable | Latest unstable release (from `develop` branch) | swissgrc/azure-pipelines-azurecli:2.63.0-net8 | 1.9.5 | 0.53.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/unstable?style=flat-square) |
| 0.14.6 | [Terraform 0.14.6](https://github.com/hashicorp/terraform/releases/tag/v0.14.6) | azure-cli:2.19.1 | 0.14.6 | | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/0.14.6?style=flat-square) |
| 0.15.0 | [Terraform 0.15.0](https://github.com/hashicorp/terraform/releases/tag/v0.15.0) | azure-cli:2.22.0 | 0.15.0 | | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/0.15.0?style=flat-square) |
| 0.15.1 | [Terraform 0.15.1](https://github.com/hashicorp/terraform/releases/tag/v0.15.1) | azure-cli:2.22.1 | 0.15.1 | | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/0.15.1?style=flat-square) |
Expand Down Expand Up @@ -127,5 +127,6 @@ Note that two secret variables (`Azure.UserName` and `Azure.Password`) are passe
| 1.9.2 | [Terraform 1.9.2](https://github.com/hashicorp/terraform/releases/tag/v1.9.2) | swissgrc/azure-pipelines-azurecli:2.62.0-net8 | 1.9.2 | 0.52.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.9.2?style=flat-square) |
| 1.9.3 | [Terraform 1.9.3](https://github.com/hashicorp/terraform/releases/tag/v1.9.3) | swissgrc/azure-pipelines-azurecli:2.62.0-net8 | 1.9.3 | 0.52.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.9.3?style=flat-square) |
| 1.9.4 | [Terraform 1.9.4](https://github.com/hashicorp/terraform/releases/tag/v1.9.4) | swissgrc/azure-pipelines-azurecli:2.63.0-net8 | 1.9.4 | 0.52.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.9.4?style=flat-square) |
| 1.9.5 | [Terraform 1.9.5](https://github.com/hashicorp/terraform/releases/tag/v1.9.5) | swissgrc/azure-pipelines-azurecli:2.63.0-net8 | 1.9.5 | 0.53.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.9.5?style=flat-square) |

[Azure Pipelines container jobs]: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/container-phases

0 comments on commit beedc9d

Please sign in to comment.