Skip to content
This repository has been archived by the owner on Nov 13, 2024. It is now read-only.

Commit

Permalink
Merge branch 'release/6.0.401'
Browse files Browse the repository at this point in the history
  • Loading branch information
@pascalberger
pascalberger committed Sep 13, 2022
2 parents 4f8a6a7 + c89ae2a commit 623b2c0
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
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
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
# Scan Docker image (not for release builds since we will have multiple tags)
- name: Scan Docker image
if: github.event_name != 'release'
uses: aquasecurity/trivy-action@cb606dfdb0d2b3698ace62192088ef4f5360b24f # tag=0.6.2
uses: aquasecurity/trivy-action@d63413b0a4a4482237085319f7f4a1ce99a8f2ac # tag=0.7.1
with:
image-ref: ${{ steps.meta.outputs.tags }}
format: 'sarif'
Expand All @@ -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@2ca79b6fa8d3ec278944088b4aa5f46912db5d63 # tag=v2.1.18
uses: github/codeql-action/upload-sarif@b398f525a5587552e573b247ac661067fafa920b # tag=v2.1.22
with:
sarif_file: trivy-results.sarif

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:11.3-slim
FROM debian:11.5-slim

LABEL org.opencontainers.image.vendor="Swiss GRC AG"
LABEL org.opencontainers.image.authors="Swiss GRC AG <[email protected]>"
Expand All @@ -11,9 +11,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# Install Docker CLI

# renovate: datasource=github-tags depName=docker/cli extractVersion=^v(?<version>.*)$
ENV DOCKERCLI_VERSION=20.10.17
ENV DOCKERCLI_VERSION=20.10.18
# renovate: datasource=repology depName=debian_11/curl versioning=loose
ENV CURL_VERSION=7.74.0-1.3+deb11u2
ENV CURL_VERSION=7.74.0-1.3+deb11u3
# renovate: datasource=repology depName=debian_11/ca-certificates versioning=loose
ENV CACERTIFICATES_VERSION=20210119
# renovate: datasource=repology depName=debian_11/lsb-release versioning=loose
Expand All @@ -36,7 +36,7 @@ RUN apt-get update -y && \
# Install .NET 6

# renovate: datasource=github-tags depName=dotnet/sdk extractVersion=^v(?<version>.*)$
ENV DOTNET_VERSION=6.0.400
ENV DOTNET_VERSION=6.0.401

ENV \
# Do not show first run text
Expand Down
11 changes: 6 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,24 @@ The following example shows the container used for a deployment step which shows
| Tag | Description | Base Image | Docker CLI | .NET SDK | Size |
|------------|-----------------------------------------------------------------------------------------------|------------------|------------|----------|----------------------------------------------------------------------------------------------------------------------------------|
| latest | Latest stable release (from `main` branch) | debian:11.3-slim | 20.10.17 | 6.0.400 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-dotnet/latest?style=flat-square) |
| unstable | Latest unstable release (from `develop` branch) | debian:11.3-slim | 20.10.17 | 6.0.400 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-dotnet/unstable?style=flat-square) |
| latest | Latest stable release (from `main` branch) | debian:11.5-slim | 20.10.18 | 6.0.401 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-dotnet/latest?style=flat-square) |
| unstable | Latest unstable release (from `develop` branch) | debian:11.5-slim | 20.10.18 | 6.0.401 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-dotnet/unstable?style=flat-square) |
| 6.0.301 | [.NET SDK 6.0.301](https://github.com/dotnet/core/blob/main/release-notes/6.0/6.0.6/6.0.6.md) | debian:11.3-slim | 20.10.17 | 6.0.301 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-dotnet/6.0.301?style=flat-square) |
| 6.0.302 | [.NET SDK 6.0.302](https://github.com/dotnet/core/blob/main/release-notes/6.0/6.0.7/6.0.7.md) | debian:11.3-slim | 20.10.17 | 6.0.302 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-dotnet/6.0.302?style=flat-square) |
| 6.0.302.1 | [.NET SDK 6.0.302](https://github.com/dotnet/core/blob/main/release-notes/6.0/6.0.7/6.0.7.md) | debian:11.3-slim | 20.10.17 | 6.0.302 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-dotnet/6.0.302.1?style=flat-square) |
| 6.0.400 | [.NET SDK 6.0.400](https://github.com/dotnet/core/blob/main/release-notes/6.0/6.0.8/6.0.8.md) | debian:11.3-slim | 20.10.17 | 6.0.400 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-dotnet/6.0.400?style=flat-square) |
| 6.0.401 | [.NET SDK 6.0.401](https://github.com/dotnet/core/blob/main/release-notes/6.0/6.0.9/6.0.9.md) | debian:11.5-slim | 20.10.18 | 6.0.401 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-dotnet/6.0.401?style=flat-square) |

### Configuration

These environment variables are supported:

| Environment variable | Default value | Description |
|------------------------|----------------------|------------------------------------------------------------------|
| DOCKERCLI_VERSION | `20.10.17` | Version of Docker CLI installed in the image. |
| DOTNET_VERSION | `6.0.400` | Version of .NET installed in the image. |
| DOCKERCLI_VERSION | `20.10.18` | Version of Docker CLI installed in the image. |
| DOTNET_VERSION | `6.0.401` | Version of .NET installed in the image. |
| CACERTIFICATES_VERSION | `20210119` | Version of `ca-certificates` package used to install components. |
| CURL_VERSION | `7.74.0-1.3+deb11u2` | Version of `curl` package used to install components. |
| CURL_VERSION | `7.74.0-1.3+deb11u3` | Version of `curl` package used to install components. |
| LSBRELEASE_VERSION | `11.1.0` | Version of `lsb-release` package used to install components. |
| GNUPG_VERSION | `2.2.27-2+deb11u2` | Version of `gnupg` package used to install components. |

Expand Down

0 comments on commit 623b2c0

Please sign in to comment.