Merge branch 'release/1.4.4'

swissgrc · Apr 12, 2023 · 517af53 · 517af53
2 parents 826e901 + f0c401a
commit 517af53
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -1,17 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base",
-    "helpers:pinGitHubActionDigests",
-    ":semanticCommitsDisabled"
-  ],
-  "labels": ["dependencies"],
-  "regexManagers": [
-    {
-      "fileMatch": ["(^|/)Dockerfile$", "(^|/)Dockerfile\\.[^/]*$"],
-      "matchStrings": [
-        "#\\srenovate:\\sdatasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?( extractVersion=(?<extractVersion>.*?))?\\s(ENV|ARG) .*?_VERSION(\\s+|=)(?<currentValue>.*)\\s"
-      ]
-    }
+    "github>swissgrc/renovate-presets:docker"
   ]
 }
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Base image containing dependencies used in builder and final image
-FROM ghcr.io/swissgrc/azure-pipelines-azurecli:2.46.0 AS base
+FROM ghcr.io/swissgrc/azure-pipelines-azurecli:2.47.0 AS base
 
 
 # Builder image
@@ -13,7 +13,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # renovate: datasource=repology depName=debian_11/curl versioning=loose
 ENV CURL_VERSION=7.74.0-1.3+deb11u7
 # renovate: datasource=github-releases depName=hashicorp/terraform extractVersion=^v(?<version>.*)$
-ENV TERRAFORM_VERSION=1.4.3
+ENV TERRAFORM_VERSION=1.4.4
 # 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.46.0   | 1.4.3     | ![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.46.0   | 1.4.3     | ![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.47.0   | 1.4.4     | ![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.47.0   | 1.4.4     | ![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)   |
@@ -93,5 +93,6 @@ Note that two secret variables (`Azure.UserName` and `Azure.Password`) are passe
 | 1.4.1    | [Terraform 1.4.1](https://github.com/hashicorp/terraform/releases/tag/v1.4.1)   | swissgrc/azure-pipelines-azurecli:2.46.0   | 1.4.1     | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.4.1?style=flat-square)    |
 | 1.4.2    | [Terraform 1.4.2](https://github.com/hashicorp/terraform/releases/tag/v1.4.2)   | swissgrc/azure-pipelines-azurecli:2.46.0   | 1.4.2     | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.4.2?style=flat-square)    |
 | 1.4.3    | [Terraform 1.4.3](https://github.com/hashicorp/terraform/releases/tag/v1.4.3)   | swissgrc/azure-pipelines-azurecli:2.46.0   | 1.4.3     | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.4.3?style=flat-square)    |
+| 1.4.4    | [Terraform 1.4.4](https://github.com/hashicorp/terraform/releases/tag/v1.4.4)   | swissgrc/azure-pipelines-azurecli:2.47.0   | 1.4.4     | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.4.4?style=flat-square)    |
 
 [Azure Pipelines container jobs]: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/container-phases