Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
cat("$REPO:", VARIABLES[cat("dotnet|11.0|product-version")], "-", OS_VERSION, "-extra", ARCH_TAG_SUFFIX) ^
set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^
set installerImageTag to when(isAzureLinux,
cat(VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|repo")], "/base/core:",
OS_VERSION_NUMBER),
VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")],
cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl")) ^

set baseUrl to VARIABLES[cat("aspire-dashboard|base-url|", VARIABLES["branch"])] ^
Expand Down
3 changes: 1 addition & 2 deletions eng/dockerfile-templates/aspnet/Dockerfile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^

set installerImageTag to when(isDistrolessAzureLinux,
cat(VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|repo")], "/base/core:",
OS_VERSION_NUMBER),
VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")],
when(isAlpine || isFullAzureLinux,
runtimeBaseTag,
cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl"))) ^
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^

set installerImageTag to when(isDistrolessAzureLinux,
cat(VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|repo")], "/base/core:",
OS_VERSION_NUMBER),
VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")],
when(isAlpine || isFullAzureLinux,
runtimeDepsBaseTag,
cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl")))
Expand Down
3 changes: 1 addition & 2 deletions eng/dockerfile-templates/monitor-base/Dockerfile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
cat("$REPO:", VARIABLES[cat("dotnet|", dotnetMajorMinor, "|product-version")], "-", OS_VERSION, ARCH_TAG_SUFFIX) ^
set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^
set installerImageTag to when(isAzureLinux,
cat(VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|repo")], "/base/core:",
OS_VERSION_NUMBER),
VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")],
cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl")) ^
set monitorBaseTemplate to when(monitorMajor != "8" && monitorMajor != "9", "Dockerfile.linux.install-monitor-base.10", "Dockerfile.linux.install-monitor-base")
}}ARG REPO=mcr.microsoft.com/dotnet/aspnet
Expand Down
3 changes: 1 addition & 2 deletions eng/dockerfile-templates/monitor/Dockerfile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
cat("$REPO:", VARIABLES[cat("monitor|", monitorMajorMinor, "|product-version")], monitorBaseTagOsSuffix, ARCH_TAG_SUFFIX) ^
set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^
set installerImageTag to when(isAzureLinux,
cat(VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|repo")], "/base/core:",
OS_VERSION_NUMBER),
VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")],
cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl")) ^
set extensionsTemplate to when(monitorMajor != "8" && monitorMajor != "9", "Dockerfile.linux.install-extensions.10", "Dockerfile.linux.install-extensions")
}}ARG REPO=mcr.microsoft.com/dotnet/monitor/base
Expand Down
10 changes: 5 additions & 5 deletions eng/dockerfile-templates/runtime-deps/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
cat(ARCH_VERSIONED, "/debian"),
when(isUbuntu,
"ubuntu.azurecr.io/ubuntu",
when(isAzureLinux,
cat(VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|repo")], "/base/core"),
"<NOT-IMPLEMENTED>")))) ^
set baseImageTag to when(isAlpine || isAzureLinux, OS_VERSION_NUMBER, OS_VERSION) ^
set baseImage to cat(baseImageRepo, ":", baseImageTag) ^
"<NOT-IMPLEMENTED>"))) ^
set baseImageTag to when(isAlpine, OS_VERSION_NUMBER, OS_VERSION) ^
set baseImage to when(isAzureLinux,
VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")],
cat(baseImageRepo, ":", baseImageTag)) ^

set useGlobalizationInvariantMode to !ARGS["is-extra"] && (isDistroless || isAlpine) ^
set username to "app" ^
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
for example globalization support ^

set distrolessStagingDir to "/staging" ^
set azureLinuxRepo to VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|repo")] ^
set baseImage to cat(azureLinuxRepo, "/distroless/minimal:", OS_VERSION_NUMBER) ^
set installerImage to VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")] ^
set baseImage to VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|distroless-minimal")] ^
set isAzureLinux3 to defined(match(OS_VERSION, "^azurelinux3")) ^
set pkgMgrDir to when(isAzureLinux3, "tdnf", "dnf") ^
set username to "app" ^
set nonRootUser to "$APP_UID" ^
set uid to 1654 ^
set gid to uid
}}# Installer image
FROM {{azureLinuxRepo}}/base/core:{{OS_VERSION_NUMBER}} AS installer
FROM {{installerImage}} AS installer

RUN {{InsertTemplate("../Dockerfile.linux.install-pkgs",
[
Expand Down
3 changes: 1 addition & 2 deletions eng/dockerfile-templates/runtime/Dockerfile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^

set installerImageTag to when(isDistrolessAzureLinux,
cat(VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|repo")], "/base/core:",
OS_VERSION_NUMBER),
VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")],
when(isAlpine || isFullAzureLinux,
runtimeDepsBaseTag,
cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl")))
Expand Down
2 changes: 1 addition & 1 deletion eng/dockerfile-templates/yarp/Dockerfile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set yarpMajorMinor to cat(yarpVersionParts[0], ".", yarpVersionParts[1]) ^
set aspnetBaseTag to
cat("$REPO:", VARIABLES[cat("dotnet|9.0|fixed-tag")], "-", OS_VERSION, ARCH_TAG_SUFFIX) ^
set installerImageTag to cat(VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|repo")], "/base/core:", OS_VERSION_NUMBER) ^
set installerImageTag to VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")] ^

set baseUrl to VARIABLES[cat("yarp|", yarpMajorMinor, "|base-url|", VARIABLES["branch"])] ^
set baseChecksumUrl to VARIABLES[cat("yarp|", yarpMajorMinor, "|base-url|checksums|", VARIABLES["branch"])] ^
Expand Down
6 changes: 4 additions & 2 deletions manifest.versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
"base-url|public-checksums|preview|main": "https://ci.dot.net/public-checksums",
"base-url|public-checksums|preview|nightly": "https://ci.dot.net/public-checksums",

"azurelinux|3.0|repo": "mcr.microsoft.com/azurelinux",
"azurelinux|4.0|repo": "mcr.microsoft.com/azurelinux-beta",
"azurelinux|3.0|core": "mcr.microsoft.com/azurelinux/base/core:3.0",
"azurelinux|3.0|distroless-minimal": "mcr.microsoft.com/azurelinux/distroless/minimal:3.0",
"azurelinux|4.0|core": "mcr.microsoft.com/azurelinux/core:4",
"azurelinux|4.0|distroless-minimal": "mcr.microsoft.com/azurelinux/core:4-distroless-minimal",

"alpine|floating-tag-version": "alpine3.24",
"alpine|11.0|floating-tag-version": "alpine3.24",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime-deps

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime-deps

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime-deps

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime-deps

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime-deps

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime-deps

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime-deps

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime-deps

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime

# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
ca-certificates \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
shadow-utils \
Expand Down Expand Up @@ -48,7 +48,7 @@ RUN \


# .NET runtime-deps image
FROM mcr.microsoft.com/azurelinux-beta/distroless/minimal:4.0
FROM mcr.microsoft.com/azurelinux/core:4-distroless-minimal

ENV \
# UID of the non-root user 'app'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
shadow-utils \
Expand Down Expand Up @@ -48,7 +48,7 @@ RUN \


# .NET runtime-deps image
FROM mcr.microsoft.com/azurelinux-beta/distroless/minimal:4.0
FROM mcr.microsoft.com/azurelinux/core:4-distroless-minimal

ENV \
# UID of the non-root user 'app'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
shadow-utils \
Expand Down Expand Up @@ -46,7 +46,7 @@ RUN \


# .NET runtime-deps image
FROM mcr.microsoft.com/azurelinux-beta/distroless/minimal:4.0
FROM mcr.microsoft.com/azurelinux/core:4-distroless-minimal

ENV \
# UID of the non-root user 'app'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
shadow-utils \
Expand Down Expand Up @@ -46,7 +46,7 @@ RUN \


# .NET runtime-deps image
FROM mcr.microsoft.com/azurelinux-beta/distroless/minimal:4.0
FROM mcr.microsoft.com/azurelinux/core:4-distroless-minimal

ENV \
# UID of the non-root user 'app'
Expand Down
2 changes: 1 addition & 1 deletion src/runtime-deps/10.0/azurelinux4.0/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0
FROM mcr.microsoft.com/azurelinux/core:4

ENV \
# UID of the non-root user 'app'
Expand Down
2 changes: 1 addition & 1 deletion src/runtime-deps/10.0/azurelinux4.0/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0
FROM mcr.microsoft.com/azurelinux/core:4

ENV \
# UID of the non-root user 'app'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
shadow-utils \
Expand Down Expand Up @@ -48,7 +48,7 @@ RUN \


# .NET runtime-deps image
FROM mcr.microsoft.com/azurelinux-beta/distroless/minimal:4.0
FROM mcr.microsoft.com/azurelinux/core:4-distroless-minimal

ENV \
# UID of the non-root user 'app'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
shadow-utils \
Expand Down Expand Up @@ -48,7 +48,7 @@ RUN \


# .NET runtime-deps image
FROM mcr.microsoft.com/azurelinux-beta/distroless/minimal:4.0
FROM mcr.microsoft.com/azurelinux/core:4-distroless-minimal

ENV \
# UID of the non-root user 'app'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Installer image
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer
FROM mcr.microsoft.com/azurelinux/core:4 AS installer

RUN dnf install -y \
shadow-utils \
Expand Down Expand Up @@ -46,7 +46,7 @@ RUN \


# .NET runtime-deps image
FROM mcr.microsoft.com/azurelinux-beta/distroless/minimal:4.0
FROM mcr.microsoft.com/azurelinux/core:4-distroless-minimal

ENV \
# UID of the non-root user 'app'
Expand Down
Loading
Loading