Merge branch 'develop' into main

clemlesne · Mar 30, 2023 · 0fee176 · 0fee176
2 parents aa73c06 + 0a6a085
commit 0fee176
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 65 deletions.
diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml
@@ -94,10 +94,6 @@ jobs:
       matrix:
         include:
           - os: bullseye
-            arch: linux/amd64,linux/arm/v5,linux/arm/v7,linux/arm64/v8
-          - os: buster
-            arch: linux/amd64,linux/arm/v7,linux/arm64/v8
-          - os: bionic
             arch: linux/amd64,linux/arm/v7,linux/arm64/v8
           - os: focal
             arch: linux/amd64,linux/arm/v7,linux/arm64/v8

diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@ Features:
 - Compatible with all Debian and Ubuntu LTS releases.
 - Container security updates are applied every week.
 - SBOM (Software Bill of Materials) is packaged with each container image.
+- Systems are based on [Microsoft official .NET images](https://mcr.microsoft.com/en-us/product/dotnet/aspnet/about).
 
 ## Usage
 
@@ -32,8 +33,6 @@ helm upgrade --install agent clemlesne-azure-pipelines-agent/azure-pipelines-age
 | Ref | OS | Arch | Support |
 |-|-|-|-|
 | `docker pull ghcr.io/clemlesne/azure-pipelines-agent:bullseye-main` | Debian Bullseye (11) slim | `linux/amd64`, `linux/arm/v5`, `linux/arm/v7`, `linux/arm64/v8` | [See Debian LTS wiki.](https://wiki.debian.org/LTS) |
-| `docker pull ghcr.io/clemlesne/azure-pipelines-agent:buster-main` | Debian Buster (10) slim | `linux/amd64`, `linux/arm/v7`, `linux/arm64/v8` | [See Debian LTS wiki.](https://wiki.debian.org/LTS) |
-| `docker pull ghcr.io/clemlesne/azure-pipelines-agent:bionic-main` | Ubuntu Bionic (18.04) minimal | `linux/amd64`, `linux/arm/v7`, `linux/arm64/v8` | [See Ubuntu LTS wiki.](https://wiki.ubuntu.com/Releases) |
 | `docker pull ghcr.io/clemlesne/azure-pipelines-agent:focal-main` | Ubuntu Focal (20.04) minimal | `linux/amd64`, `linux/arm/v7`, `linux/arm64/v8` | [See Ubuntu LTS wiki.](https://wiki.ubuntu.com/Releases) |
 | `docker pull ghcr.io/clemlesne/azure-pipelines-agent:jammy-main` | Ubuntu Jammy (22.04) minimal | `linux/amd64`, `linux/arm/v7`, `linux/arm64/v8` | [See Ubuntu LTS wiki.](https://wiki.ubuntu.com/Releases) |
 

diff --git a/src/docker/Dockerfile-bionic b/src/docker/Dockerfile-bionic
diff --git a/src/docker/Dockerfile-bullseye b/src/docker/Dockerfile-bullseye
@@ -1,4 +1,4 @@
-FROM docker.io/library/debian:bullseye-slim
+FROM mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim
 
 ENV DEBIAN_FRONTEND=noninteractive
 

diff --git a/src/docker/Dockerfile-buster b/src/docker/Dockerfile-buster
diff --git a/src/docker/Dockerfile-focal b/src/docker/Dockerfile-focal
@@ -1,4 +1,4 @@
-FROM docker.io/library/ubuntu:focal
+FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal
 
 ENV DEBIAN_FRONTEND=noninteractive
 

diff --git a/src/docker/Dockerfile-jammy b/src/docker/Dockerfile-jammy
@@ -1,4 +1,4 @@
-FROM docker.io/library/ubuntu:jammy
+FROM mcr.microsoft.com/dotnet/aspnet:6.0-jammy
 
 ENV DEBIAN_FRONTEND=noninteractive