Skip to content

Commit

Permalink
Merge branch 'release/1.3.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalberger committed Jan 7, 2023
2 parents 0900ac6 + 376a48c commit cb71ff5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
# Checkout the code base #
##########################
- name: Checkout Code
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
with:
# Full Git history is needed to get a proper list of changed files
fetch-depth: 0
Expand All @@ -43,7 +43,7 @@ jobs:
# Run Linter against code base #
################################
- name: Lint Code Base
uses: github/super-linter/slim@bb2d833b08b6c288608686672b93a8a4589cdc49 # tag=v4.9.7
uses: github/super-linter/slim@985ef206aaca4d560cb9ee2af2b42ba44adc1d55 # v4.10.0
env:
VALIDATE_ALL_CODEBASE: false
DEFAULT_BRANCH: develop
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

# Extract metadata (tags, labels) for Docker
- name: Extract Docker metadata
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
# Publish scan report to GitHub
- name: Publish scan report to GitHub
if: ${{ github.event_name != 'release' && always() }}
uses: github/codeql-action/upload-sarif@312e093a1892bd801f026f1090904ee8e460b9b6 # v2.1.34
uses: github/codeql-action/upload-sarif@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37
with:
sarif_file: trivy-results.sarif

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM swissgrc/azure-pipelines-azurecli:2.42.0
FROM swissgrc/azure-pipelines-azurecli:2.43.0

LABEL org.opencontainers.image.vendor="Swiss GRC AG"
LABEL org.opencontainers.image.authors="Swiss GRC AG <[email protected]>"
Expand All @@ -23,7 +23,7 @@ RUN apt-get update -y && \
# Install Terraform

# renovate: datasource=github-releases depName=hashicorp/terraform extractVersion=^v(?<version>.*)$
ENV TERRAFORM_VERSION=1.3.6
ENV TERRAFORM_VERSION=1.3.7
#Disabled renovate: datasource=repology depName=debian_11/unzip versioning=loose
ENV UNZIP_VERSION=6.0-26+deb11u1

Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Docker image for running Terraform commands in Azure Pipelines container job

<!-- markdownlint-disable MD013 -->
[![License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/swissgrc/docker-azure-pipelines-terraform/blob/main/LICENSE) [![Build](https://img.shields.io/github/workflow/status/swissgrc/docker-azure-pipelines-terraform/Build/develop?style=flat-square)](https://github.com/swissgrc/docker-azure-pipelines-terraform/actions/workflows/publish.yml) [![Pulls](https://img.shields.io/docker/pulls/swissgrc/azure-pipelines-terraform.svg?style=flat-square)](https://hub.docker.com/r/swissgrc/azure-pipelines-terraform) [![Stars](https://img.shields.io/docker/stars/swissgrc/azure-pipelines-terraform.svg?style=flat-square)](https://hub.docker.com/r/swissgrc/azure-pipelines-terraform)
[![License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/swissgrc/docker-azure-pipelines-terraform/blob/main/LICENSE) [![Build](https://img.shields.io/github/actions/workflow/status/swissgrc/docker-azure-pipelines-terraform/publish.yml?branch=develop&style=flat-square)](https://github.com/swissgrc/docker-azure-pipelines-terraform/actions/workflows/publish.yml) [![Pulls](https://img.shields.io/docker/pulls/swissgrc/azure-pipelines-terraform.svg?style=flat-square)](https://hub.docker.com/r/swissgrc/azure-pipelines-terraform) [![Stars](https://img.shields.io/docker/stars/swissgrc/azure-pipelines-terraform.svg?style=flat-square)](https://hub.docker.com/r/swissgrc/azure-pipelines-terraform)
<!-- markdownlint-restore -->

Docker image to run Terraform commands in [Azure Pipelines container jobs].
Expand Down Expand Up @@ -65,8 +65,8 @@ Note that two secret variables (`Azure.UserName` and `Azure.Password`) are passe

| Tag | Description | Base Image | Terraform | Size |
|----------|---------------------------------------------------------------------------------|--------------------------------------------|-----------|------------------------------------------------------------------------------------------------------------------------------------|
| latest | Latest stable release (from `main` branch) | swissgrc/azure-pipelines-azurecli:2.42.0 | 1.3.6 | ![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.42.0 | 1.3.6 | ![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.43.0 | 1.3.7 | ![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.43.0 | 1.3.7 | ![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 All @@ -87,14 +87,15 @@ Note that two secret variables (`Azure.UserName` and `Azure.Password`) are passe
| 1.3.4 | [Terraform 1.3.4](https://github.com/hashicorp/terraform/releases/tag/v1.3.4) | swissgrc/azure-pipelines-azurecli:2.42.0 | 1.3.4 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.3.4?style=flat-square) |
| 1.3.5 | [Terraform 1.3.5](https://github.com/hashicorp/terraform/releases/tag/v1.3.5) | swissgrc/azure-pipelines-azurecli:2.42.0 | 1.3.5 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.3.5?style=flat-square) |
| 1.3.6 | [Terraform 1.3.6](https://github.com/hashicorp/terraform/releases/tag/v1.3.6) | swissgrc/azure-pipelines-azurecli:2.42.0 | 1.3.6 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.3.6?style=flat-square) |
| 1.3.7 | [Terraform 1.3.7](https://github.com/hashicorp/terraform/releases/tag/v1.3.7) | swissgrc/azure-pipelines-azurecli:2.43.0 | 1.3.7 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.3.7?style=flat-square) |

### Configuration

These environment variables are supported:

| Environment variable | Default value | Description |
|------------------------|----------------------|------------------------------------------------------------------|
| TERRAFORM_VERSION | `1.3.6` | Version of Terraform installed in the image. |
| TERRAFORM_VERSION | `1.3.7` | Version of Terraform installed in the image. |
| GIT_VERSION | `1:2.30.2-1` | Version of Git installed in the image. |
| UNZIP_VERSION | `6.0-26+deb11u1` | Version of `unzip` package used to install components. |

Expand Down

0 comments on commit cb71ff5

Please sign in to comment.