Merge branch 'release/6.0.400'

swissgrc · Aug 9, 2022 · 4f8a6a7 · 4f8a6a7
2 parents ef721c1 + b9a8d11
commit 4f8a6a7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -30,7 +30,7 @@ jobs:
 
       # Build Docker image with Buildx
       - name: Build Docker image
-        uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0 # tag=v3.1.0
+        uses: docker/build-push-action@c84f38281176d4c9cdb1626ffafcd6b3911b5d94 # tag=v3.1.1
         with:
           context: .
           push: false
@@ -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@81b9a6f5abb1047d697af7a3ca18c13f55a97315 # tag=0.6.1
+        uses: aquasecurity/trivy-action@cb606dfdb0d2b3698ace62192088ef4f5360b24f # tag=0.6.2
         with:
           image-ref: ${{ steps.meta.outputs.tags }}
           format: 'sarif'
@@ -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@0c670bbf0414f39666df6ce8e718ec5662c21e03 # tag=v2.1.17
+        uses: github/codeql-action/upload-sarif@2ca79b6fa8d3ec278944088b4aa5f46912db5d63 # tag=v2.1.18
         with:
           sarif_file: trivy-results.sarif
 
@@ -63,7 +63,7 @@ jobs:
 
       # Publish Docker image for CI builds if not PR build
       - name: Push container image
-        uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0 # tag=v3.1.0
+        uses: docker/build-push-action@c84f38281176d4c9cdb1626ffafcd6b3911b5d94 # tag=v3.1.1
         if: github.event_name != 'pull_request'
         with:
           context: .

diff --git a/Dockerfile b/Dockerfile
@@ -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.302
+ENV DOTNET_VERSION=6.0.400
 
 ENV \
     # Do not show first run text

diff --git a/README.md b/README.md
@@ -33,13 +33,14 @@ The following example shows the container used for a deployment step which shows
 
 ### Tags
 
-| 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.301   | ![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.301   | ![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.1 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-dotnet/6.0.302.1?style=flat-square) |
+| 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)  |
+| 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)   |
 
 ### Configuration
 
@@ -48,7 +49,7 @@ 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.302`            | Version of .NET installed in the image.                          |
+| DOTNET_VERSION         | `6.0.400`            | 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.            |
 | LSBRELEASE_VERSION     | `11.1.0`             | Version of `lsb-release` package used to install components.     |