Merge branch 'release/1.3.6'

swissgrc · Dec 1, 2022 · 0900ac6 · 0900ac6
2 parents 3cc88fc + f5f26e3
commit 0900ac6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -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@678fc3afe258fb2e0cdc165ccf77b85719de7b3c # v2.1.33
+        uses: github/codeql-action/upload-sarif@312e093a1892bd801f026f1090904ee8e460b9b6 # v2.1.34
         with:
           sarif_file: trivy-results.sarif
 

diff --git a/Dockerfile b/Dockerfile
@@ -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.5
+ENV TERRAFORM_VERSION=1.3.6
 #Disabled renovate: datasource=repology depName=debian_11/unzip versioning=loose
 ENV UNZIP_VERSION=6.0-26+deb11u1
 

diff --git a/README.md b/README.md
@@ -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.5     | ![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.5     | ![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.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) |
 | 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)   |
@@ -86,14 +86,15 @@ Note that two secret variables (`Azure.UserName` and `Azure.Password`) are passe
 | 1.3.3    | [Terraform 1.3.3](https://github.com/hashicorp/terraform/releases/tag/v1.3.3)   | swissgrc/azure-pipelines-azurecli:2.41.0   | 1.3.3     | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.3.3?style=flat-square)    |
 | 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)    |
 
 ### Configuration
 
 These environment variables are supported:
 
 | Environment variable   | Default value        | Description                                                      |
 |------------------------|----------------------|------------------------------------------------------------------|
-| TERRAFORM_VERSION      | `1.3.5`              | Version of Terraform installed in the image.                     |
+| TERRAFORM_VERSION      | `1.3.6`              | 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.           |