Skip to content

Commit 22903f3

Browse files
lbusselllbussell
committed
Remove CBL Mariner 2.0 images (#7154)
1 parent 51ff29e commit 22903f3

74 files changed

Lines changed: 224 additions & 3377 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎documentation/distroless.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ docker scout cves mcr.microsoft.com/dotnet/runtime-deps:10.0-noble-chiseled
5757
**Azure Linux**:
5858

5959
```bash
60-
docker scout cves mcr.microsoft.com/dotnet/runtime-deps:10.0-cbl-mariner2.0-distroless
60+
docker scout cves mcr.microsoft.com/dotnet/runtime-deps:10.0-azurelinux3.0-distroless
6161
```
6262

6363
### How do I write my Dockerfile to work without a shell?

‎documentation/vulnerability-reporting.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ If you get an error like the following: `unable to start container process: exec
523523
docker run --rm <image-digest> cat /etc/os-release
524524
```
525525

526-
The output will include a `NAME` field indicating the name of the distro (`Debian`, `Ubuntu`, `Alpine`, `Microsoft Azure Linux`, or `Common Base Linux Mariner`).
526+
The output will include a `NAME` field indicating the name of the distro (`Debian`, `Ubuntu`, `Alpine`, or `Microsoft Azure Linux`).
527527
In the case of Debian and Ubuntu, the output will also include a `VERSION_CODENAME` field. Make note of this codename because the vulnerability pages on the distro's website refers to that codename instead of a version number.
528528

529529
#### Distroless Images

‎eng/dockerfile-templates/Dockerfile.common-dotnet-envs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
set isAlpine to find(OS_VERSION, "alpine") >= 0 ^
99
set isWindows to find(OS_VERSION, "nanoserver") >= 0 || find(OS_VERSION, "windowsservercore") >= 0 ^
10-
set isAzureLinux to find(OS_VERSION, "cbl-mariner") >= 0 || find(OS_VERSION, "azurelinux") >= 0 ^
10+
set isAzureLinux to find(OS_VERSION, "azurelinux") >= 0 ^
1111
set isDistroless to find(OS_VERSION, "distroless") >= 0 || find(OS_VERSION, "chiseled") >= 0 ^
1212

1313
set lineContinuation to when(isWindows, "`", "\") ^

‎eng/dockerfile-templates/Dockerfile.linux.install-deps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
set isAlpine to find(OS_ARCH_HYPHENATED, "Alpine") >= 0 ^
1010
set isDebian to find(OS_ARCH_HYPHENATED, "Debian") >= 0 ^
1111
set isUbuntu to find(OS_ARCH_HYPHENATED, "Ubuntu") >= 0 ^
12-
set isAzureLinux to find(OS_VERSION, "cbl-mariner") >= 0 || find(OS_VERSION, "azurelinux") >= 0 ^
13-
set isDistrolessAzureLinux to defined(match(OS_VERSION, "^cbl-mariner\d+\.\d+-distroless$")) || defined(match(OS_VERSION, "^azurelinux\d+\.\d+-distroless$")) ^
12+
set isAzureLinux to find(OS_VERSION, "azurelinux") >= 0 ^
13+
set isDistrolessAzureLinux to defined(match(OS_VERSION, "^azurelinux\d+\.\d+-distroless$")) ^
1414
set isFullAzureLinux to isAzureLinux && !isDistrolessAzureLinux ^
1515

1616
set dotnetDepsComment to "# .NET dependencies" ^

‎eng/dockerfile-templates/Dockerfile.linux.install-pkgs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
no-clean (optional): skip package manager cleanup after install ^
77

88
set isAlpine to find(OS_VERSION, "alpine") >= 0 ^
9-
set isAzureLinux to find(OS_VERSION, "cbl-mariner") >= 0 || find(OS_VERSION, "azurelinux") >= 0 ^
9+
set isAzureLinux to find(OS_VERSION, "azurelinux") >= 0 ^
1010
set isDnf to ARGS["pkg-mgr"] = "dnf" ^
1111
set isTdnf to ARGS["pkg-mgr"] = "tdnf" || (!isDnf && isAzureLinux) ^
1212
set isApk to ARGS["pkg-mgr"] = "apk" || isAlpine ^

‎eng/dockerfile-templates/Dockerfile.linux.remove-pkgs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
no-clean (optional): skip package manager cleanup after install ^
88

99
set isAlpine to find(OS_VERSION, "alpine") >= 0 ^
10-
set isAzureLinux to find(OS_VERSION, "cbl-mariner") >= 0 || find(OS_VERSION, "azurelinux") >= 0 ^
10+
set isAzureLinux to find(OS_VERSION, "azurelinux") >= 0 ^
1111

1212
set isDnf to ARGS["pkg-mgr"] = "dnf" ^
1313
set isTdnf to ARGS["pkg-mgr"] = "tdnf" || (!isDnf && isAzureLinux) ^
14-
set isTdnf3_4 to isTdnf && find(OS_VERSION, "3.0") >= 0 ^
1514
set isApk to ARGS["pkg-mgr"] = "apk" || isAlpine ^
1615
set isApt to ARGS["pkg-mgr"] = "apt-get" || (!isDnf && !isTdnf && !isApk) ^
1716

@@ -20,14 +19,12 @@
2019
"apk del",
2120
when(isDnf,
2221
"dnf remove -y",
23-
when(isTdnf3_4,
24-
"tdnf autoremove -y",
2522
when(isTdnf,
26-
"tdnf remove -y",
23+
"tdnf autoremove -y",
2724
when (ARGS["noninteractive"],
2825
"DEBIAN_FRONTEND=noninteractive apt-get remove -y",
2926
"apt-get remove -y"
30-
))))) ^
27+
)))) ^
3128

3229
set cleanCmd to
3330
when(isApk,

‎eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
set aspireVersionParts to split(PRODUCT_VERSION, ".") ^
33
set aspireMajorMinor to cat(aspireVersionParts[0], ".", aspireVersionParts[1]) ^
44

5-
set isAzureLinux to find(OS_VERSION, "mariner") >= 0 || find(OS_VERSION, "azurelinux") >= 0 ^
5+
set isAzureLinux to find(OS_VERSION, "azurelinux") >= 0 ^
66
set aspnetBaseTag to
77
cat("$REPO:", VARIABLES[cat("dotnet|8.0|product-version")], "-", OS_VERSION, "-extra", ARCH_TAG_SUFFIX) ^
88
set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^
99
set installerImageTag to when(isAzureLinux,
10-
cat("mcr.microsoft.com/",
11-
when(find(OS_VERSION, "3.0") >= 0, "azurelinux", "cbl-mariner"),
12-
"/base/core:",
10+
cat("mcr.microsoft.com/azurelinux/base/core:",
1311
OS_VERSION_NUMBER),
1412
cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl")) ^
1513

‎eng/dockerfile-templates/aspnet/Dockerfile.linux‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
77
set isAlpine to find(OS_VERSION, "alpine") >= 0 ^
8-
set isAzureLinux to find(OS_VERSION, "mariner") >= 0 || find(OS_VERSION, "azurelinux") >= 0 ^
8+
set isAzureLinux to find(OS_VERSION, "azurelinux") >= 0 ^
99
set isDistroless to find(OS_VERSION, "distroless") >= 0 || find(OS_VERSION, "chiseled") >= 0 ^
1010
set isFullAzureLinux to isAzureLinux && !isDistroless ^
1111
set isDistrolessAzureLinux to isAzureLinux && isDistroless ^
@@ -24,9 +24,7 @@
2424
set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^
2525

2626
set installerImageTag to when(isDistrolessAzureLinux,
27-
cat("mcr.microsoft.com/"
28-
when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinux", "cbl-mariner"),
29-
"/base/core:",
27+
cat("mcr.microsoft.com/azurelinux/base/core:",
3028
OS_VERSION_NUMBER),
3129
when(isAlpine || isFullAzureLinux,
3230
runtimeBaseTag,

‎eng/dockerfile-templates/aspnet/Dockerfile.linux-composite‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{
22
set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
33
set isAlpine to find(OS_VERSION, "alpine") >= 0 ^
4-
set isAzureLinux to find(OS_VERSION, "mariner") >= 0 || find(OS_VERSION, "azurelinux") >= 0 ^
4+
set isAzureLinux to find(OS_VERSION, "azurelinux") >= 0 ^
55
set isDistroless to find(OS_VERSION, "distroless") >= 0 || find(OS_VERSION, "chiseled") >= 0 ^
66
set isFullAzureLinux to isAzureLinux && !isDistroless ^
77
set isDistrolessAzureLinux to isAzureLinux && isDistroless ^
@@ -21,9 +21,7 @@
2121
set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^
2222

2323
set installerImageTag to when(isDistrolessAzureLinux,
24-
cat("mcr.microsoft.com/",
25-
when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinux", "cbl-mariner"),
26-
"/base/core:",
24+
cat("mcr.microsoft.com/azurelinux/base/core:",
2725
OS_VERSION_NUMBER),
2826
when(isAlpine || isFullAzureLinux,
2927
runtimeDepsBaseTag,

‎eng/dockerfile-templates/monitor-base/Dockerfile.linux‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,12 @@
2323
set monitorBaseUrl to cat(monitorBaseUrl, monitorPath) ^
2424
set monitorBaseChecksumUrl to cat(monitorBaseChecksumUrl, monitorChecksumPath) ^
2525

26-
set isAzureLinux to find(OS_VERSION, "mariner") >= 0 || find(OS_VERSION, "azurelinux") >=0 ^
26+
set isAzureLinux to find(OS_VERSION, "azurelinux") >= 0 ^
2727
set aspnetBaseTag to
2828
cat("$REPO:", VARIABLES[cat("dotnet|", dotnetMajorMinor, "|product-version")], "-", OS_VERSION, ARCH_TAG_SUFFIX) ^
2929
set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^
3030
set installerImageTag to when(isAzureLinux,
31-
cat("mcr.microsoft.com/"
32-
when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinux", "cbl-mariner"),
33-
"/base/core:",
31+
cat("mcr.microsoft.com/azurelinux/base/core:",
3432
OS_VERSION_NUMBER),
3533
cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl")) ^
3634
set monitorBaseTemplate to when(monitorMajor != "8" && monitorMajor != "9", "Dockerfile.linux.install-monitor-base.10", "Dockerfile.linux.install-monitor-base")

0 commit comments

Comments
 (0)