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.403'
Browse files Browse the repository at this point in the history
  • Loading branch information
@pascalberger
pascalberger committed Nov 8, 2022
2 parents c488480 + 9c7303f commit 99e4717
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 16 deletions.
21 changes: 15 additions & 6 deletions .github/workflows/publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
# Extract metadata (tags, labels) for Docker
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@69f6fc9d46f2f8bf0d5491e4aabe0bb8c6a4678a # renovate: tag=v4.0.1
uses: docker/metadata-action@57396166ad8aefe6098280995947635806a0e6ea # tag=v4.1.1
with:
images: swissgrc/azure-pipelines-dotnet
tags: |
Expand All @@ -30,7 +30,7 @@ jobs:
# Build Docker image with Buildx
- name: Build Docker image
uses: docker/build-push-action@c84f38281176d4c9cdb1626ffafcd6b3911b5d94 # tag=v3.1.1
uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # tag=v3.2.0
with:
context: .
push: false
Expand All @@ -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@d63413b0a4a4482237085319f7f4a1ce99a8f2ac # tag=0.7.1
uses: aquasecurity/trivy-action@9ab158e8597f3b310480b9a69402b419bc03dbd5 # tag=0.8.0
with:
image-ref: ${{ steps.meta.outputs.tags }}
format: 'sarif'
Expand All @@ -49,24 +49,33 @@ jobs:
# Publish scan report to GitHub
- name: Publish scan report to GitHub
if: ${{ github.event_name != 'release' && always() }}
uses: github/codeql-action/upload-sarif@e0e5ded33cabb451ae0a9768fc7b0410bad9ad44 # tag=v2.1.26
uses: github/codeql-action/upload-sarif@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 # tag=v2.1.31
with:
sarif_file: trivy-results.sarif

# Login to Docker registry if not PR build
- name: Log in to Docker Hub
if: github.event_name != 'pull_request'
uses: docker/login-action@49ed152c8eca782a232dede0303416e8f356c37b # renovate: tag=v2.0.0
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # tag=v2.1.0
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

# Publish Docker image for CI builds if not PR build
- name: Push container image
uses: docker/build-push-action@c84f38281176d4c9cdb1626ffafcd6b3911b5d94 # tag=v3.1.1
uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # tag=v3.2.0
if: github.event_name != 'pull_request'
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

# Update Readme on Docker Hub
- name: Publish README to Docker Hub
if: github.event_name != 'pull_request'
uses: peter-evans/dockerhub-description@93b93397c27ed52b4055b8c6b2f8d92456ab3c56 # tag=v3.1.2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
repository: swissgrc/azure-pipelines-dotnet
12 changes: 6 additions & 6 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# Install Docker CLI

# renovate: datasource=github-tags depName=docker/cli extractVersion=^v(?<version>.*)$
ENV DOCKERCLI_VERSION=20.10.18
# renovate: datasource=repology depName=debian_11/curl versioning=loose
ENV DOCKERCLI_VERSION=20.10.21
#Disabled renovate: datasource=repology depName=debian_11/curl versioning=loose
ENV CURL_VERSION=7.74.0-1.3+deb11u3
# renovate: datasource=repology depName=debian_11/ca-certificates versioning=loose
#Disabled renovate: datasource=repology depName=debian_11/ca-certificates versioning=loose
ENV CACERTIFICATES_VERSION=20210119
# renovate: datasource=repology depName=debian_11/lsb-release versioning=loose
#Disabled renovate: datasource=repology depName=debian_11/lsb-release versioning=loose
ENV LSBRELEASE_VERSION=11.1.0
# renovate: datasource=repology depName=debian_11/gnupg2 versioning=loose
#Disabled renovate: datasource=repology depName=debian_11/gnupg2 versioning=loose
ENV GNUPG_VERSION=2.2.27-2+deb11u2

RUN apt-get update -y && \
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.402
ENV DOTNET_VERSION=6.0.403

ENV \
# Do not show first run text
Expand Down
9 changes: 5 additions & 4 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.5-slim | 20.10.18 | 6.0.402 | ![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.402 | ![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.21 | 6.0.403 | ![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.21 | 6.0.403 | ![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) |
| 6.0.402 | [.NET SDK 6.0.402](https://github.com/dotnet/core/blob/main/release-notes/6.0/6.0.10/6.0.10.md) | debian:11.5-slim | 20.10.18 | 6.0.402 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-dotnet/6.0.402?style=flat-square) |
| 6.0.403 | [.NET SDK 6.0.403](https://github.com/dotnet/core/blob/main/release-notes/6.0/6.0.11/6.0.11.md) | debian:11.5-slim | 20.10.21 | 6.0.403 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-dotnet/6.0.402?style=flat-square) |

### Configuration

These environment variables are supported:

| Environment variable | Default value | Description |
|------------------------|----------------------|------------------------------------------------------------------|
| DOCKERCLI_VERSION | `20.10.18` | Version of Docker CLI installed in the image. |
| DOTNET_VERSION | `6.0.402` | Version of .NET installed in the image. |
| DOCKERCLI_VERSION | `20.10.21` | Version of Docker CLI installed in the image. |
| DOTNET_VERSION | `6.0.403` | 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+deb11u3` | Version of `curl` package used to install components. |
| LSBRELEASE_VERSION | `11.1.0` | Version of `lsb-release` package used to install components. |
Expand Down

0 comments on commit 99e4717

Please sign in to comment.