Skip to content

Commit

Permalink
Merge branch 'release/1.2.9'
Browse files Browse the repository at this point in the history
  • Loading branch information
@pascalberger
pascalberger committed Sep 8, 2022
2 parents bae82cf + 2026865 commit f3d2382
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# These owners will be the default owners for everything in the repo and
# will be requested for review when someone opens a pull request.
* @swissgrc/development
* @swissgrc/platform
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Original file line number Diff line number Diff line change
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@7fee4ca032ac341c12486c4c06822c5221c76533 # tag=v2.1.20
uses: github/codeql-action/upload-sarif@b398f525a5587552e573b247ac661067fafa920b # tag=v2.1.22
with:
sarif_file: trivy-results.sarif

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM swissgrc/azure-pipelines-azurecli:2.39.0.1
FROM swissgrc/azure-pipelines-azurecli:2.40.0

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

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

RUN apt-get update -y && \
apt-get install -y --no-install-recommends unzip=${UNZIP_VERSION} && \
Expand Down
11 changes: 6 additions & 5 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 | Size |
|----------|---------------------------------------------------------------------------------|--------------------------------------------|-----------|------------------------------------------------------------------------------------------------------------------------------------|
| latest | Latest stable release (from `main` branch) | swissgrc/azure-pipelines-azurecli:2.39.0.1 | 1.2.8 | ![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.39.0.1 | 1.2.8 | ![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.40 | 1.2.9 | ![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.40.0 | 1.2.9 | ![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 @@ -76,18 +76,19 @@ Note that two secret variables (`Azure.UserName` and `Azure.Password`) are passe
| 1.2.4 | [Terraform 1.2.4](https://github.com/hashicorp/terraform/releases/tag/v1.2.4) | debian:11.3-slim | 1.2.4 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.2.4?style=flat-square) |
| 1.2.5 | [Terraform 1.2.5](https://github.com/hashicorp/terraform/releases/tag/v1.2.5) | swissgrc/azure-pipelines-azurecli:2.38.0 | 1.2.5 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.2.5?style=flat-square) |
| 1.2.6 | [Terraform 1.2.6](https://github.com/hashicorp/terraform/releases/tag/v1.2.6) | swissgrc/azure-pipelines-azurecli:2.38.0 | 1.2.6 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.2.6?style=flat-square) |
| 1.2.6.1 | [Terraform 1.2.6](https://github.com/hashicorp/terraform/releases/tag/v1.2.6) | swissgrc/azure-pipelines-azurecli:2.39.0.1 | 1.2.6 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.2.6.1?style=flat-square) |
| 1.2.6.1 | [Terraform 1.2.6](https://github.com/hashicorp/terraform/releases/tag/v1.2.6) | swissgrc/azure-pipelines-azurecli:2.39.0.1 | 1.2.6 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.2.6.1?style=flat-square) |
| 1.2.7 | [Terraform 1.2.7](https://github.com/hashicorp/terraform/releases/tag/v1.2.7) | swissgrc/azure-pipelines-azurecli:2.39.0.1 | 1.2.7 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.2.7?style=flat-square) |
| 1.2.8 | [Terraform 1.2.8](https://github.com/hashicorp/terraform/releases/tag/v1.2.8) | swissgrc/azure-pipelines-azurecli:2.39.0.1 | 1.2.8 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.2.8?style=flat-square) |
| 1.2.9 | [Terraform 1.2.9](https://github.com/hashicorp/terraform/releases/tag/v1.2.9) | swissgrc/azure-pipelines-azurecli:2.40 | 1.2.9 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-terraform/1.2.9?style=flat-square) |

### Configuration

These environment variables are supported:

| Environment variable | Default value | Description |
|------------------------|----------------------|------------------------------------------------------------------|
| TERRAFORM_VERSION | `1.2.8` | Version of Terraform installed in the image. |
| TERRAFORM_VERSION | `1.2.9` | 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` | Version of `unzip` package used to install components. |
| UNZIP_VERSION | `6.0-26+deb11u1` | Version of `unzip` package used to install components. |

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

0 comments on commit f3d2382

Please sign in to comment.