Skip to content

Commit 28a3d19

Browse files
lbusselllbussell
committed
Workaround tar issue on Noble arm32
1 parent 8bd9903 commit 28a3d19

File tree

14 files changed

+20
-12
lines changed

14 files changed

+20
-12
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
set runtimeBaseTag to cat("$REPO:", tagVersion, "-", OS_VERSION, runtimeDepsVariant, ARCH_TAG_SUFFIX) ^
2121
set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
2222
set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^
23+
24+
_ Workaround for https://bugs.launchpad.net/ubuntu/+source/tar/+bug/2059734. Remove when fixed. ^
25+
set osVersionBase to when(osVersionBase = "noble" && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^
26+
2327
set installerImageTag to when(isDistrolessAzureLinux,
2428
cat(when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinuxpreview.azurecr.io/public/azurelinux", "mcr.microsoft.com/cbl-mariner"),
2529
"/base/core:",

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
set runtimeDepsBaseTag to cat(
2121
"$REPO:", tagVersion, "-", OS_VERSION, runtimeDepsVariant, ARCH_TAG_SUFFIX) ^
2222
set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^
23+
24+
_ Workaround for https://bugs.launchpad.net/ubuntu/+source/tar/+bug/2059734. Remove when fixed. ^
25+
set osVersionBase to when(osVersionBase = "noble" && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^
26+
2327
set installerImageTag to when(isDistrolessAzureLinux,
2428
cat(when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinuxpreview.azurecr.io/public/azurelinux", "mcr.microsoft.com/cbl-mariner"),
2529
"/base/core:",

‎src/aspnet/8.0/noble-chiseled-extra/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime
22

33
# Installer image
4-
FROM arm32v7/buildpack-deps:noble-curl AS installer
4+
FROM arm32v7/buildpack-deps:jammy-curl AS installer
55

66
# Retrieve ASP.NET Core
77
RUN aspnetcore_version=8.0.4 \

‎src/aspnet/8.0/noble-chiseled/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime
22

33
# Installer image
4-
FROM arm32v7/buildpack-deps:noble-curl AS installer
4+
FROM arm32v7/buildpack-deps:jammy-curl AS installer
55

66
# Retrieve ASP.NET Core
77
RUN aspnetcore_version=8.0.4 \

‎src/aspnet/8.0/noble/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime
22

33
# Installer image
4-
FROM arm32v7/buildpack-deps:noble-curl AS installer
4+
FROM arm32v7/buildpack-deps:jammy-curl AS installer
55

66
# Retrieve ASP.NET Core
77
RUN aspnetcore_version=8.0.4 \

‎src/aspnet/9.0/noble-chiseled-extra/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime
22

33
# Installer image
4-
FROM arm32v7/buildpack-deps:noble-curl AS installer
4+
FROM arm32v7/buildpack-deps:jammy-curl AS installer
55

66
# Retrieve ASP.NET Core
77
RUN aspnetcore_version=9.0.0-preview.4.24216.18 \

‎src/aspnet/9.0/noble-chiseled/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime
22

33
# Installer image
4-
FROM arm32v7/buildpack-deps:noble-curl AS installer
4+
FROM arm32v7/buildpack-deps:jammy-curl AS installer
55

66
# Retrieve ASP.NET Core
77
RUN aspnetcore_version=9.0.0-preview.4.24216.18 \

‎src/aspnet/9.0/noble/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime
22

33
# Installer image
4-
FROM arm32v7/buildpack-deps:noble-curl AS installer
4+
FROM arm32v7/buildpack-deps:jammy-curl AS installer
55

66
# Retrieve ASP.NET Core
77
RUN aspnetcore_version=9.0.0-preview.4.24216.18 \

‎src/runtime/8.0/noble-chiseled-extra/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
22

33
# Installer image
4-
FROM arm32v7/buildpack-deps:noble-curl AS installer
4+
FROM arm32v7/buildpack-deps:jammy-curl AS installer
55

66
# Retrieve .NET Runtime
77
RUN dotnet_version=8.0.4 \

‎src/runtime/8.0/noble-chiseled/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
22

33
# Installer image
4-
FROM arm32v7/buildpack-deps:noble-curl AS installer
4+
FROM arm32v7/buildpack-deps:jammy-curl AS installer
55

66
# Retrieve .NET Runtime
77
RUN dotnet_version=8.0.4 \

‎src/runtime/8.0/noble/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
22

33
# Installer image
4-
FROM arm32v7/buildpack-deps:noble-curl AS installer
4+
FROM arm32v7/buildpack-deps:jammy-curl AS installer
55

66
# Retrieve .NET Runtime
77
RUN dotnet_version=8.0.4 \

‎src/runtime/9.0/noble-chiseled-extra/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
22

33
# Installer image
4-
FROM arm32v7/buildpack-deps:noble-curl AS installer
4+
FROM arm32v7/buildpack-deps:jammy-curl AS installer
55

66
# Retrieve .NET Runtime
77
RUN dotnet_version=9.0.0-preview.4.24215.5 \

‎src/runtime/9.0/noble-chiseled/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
22

33
# Installer image
4-
FROM arm32v7/buildpack-deps:noble-curl AS installer
4+
FROM arm32v7/buildpack-deps:jammy-curl AS installer
55

66
# Retrieve .NET Runtime
77
RUN dotnet_version=9.0.0-preview.4.24215.5 \

‎src/runtime/9.0/noble/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
22

33
# Installer image
4-
FROM arm32v7/buildpack-deps:noble-curl AS installer
4+
FROM arm32v7/buildpack-deps:jammy-curl AS installer
55

66
# Retrieve .NET Runtime
77
RUN dotnet_version=9.0.0-preview.4.24215.5 \

0 commit comments

Comments
 (0)