diff --git a/eng/dockerfile-templates/sdk/Dockerfile.linux b/eng/dockerfile-templates/sdk/Dockerfile.linux index 70b344f75d..8be0fabd16 100644 --- a/eng/dockerfile-templates/sdk/Dockerfile.linux +++ b/eng/dockerfile-templates/sdk/Dockerfile.linux @@ -24,7 +24,7 @@ [ "git", when(dotnetVersion = "3.1", "procps-ng", ""), - when(find(OS_VERSION, "1.0") < 0 && dotnetVersion = "6.0", "tar", "") + when(find(OS_VERSION, "1.0") < 0, "tar", "") ], [ "curl", diff --git a/src/sdk/7.0/cbl-mariner2.0/amd64/Dockerfile b/src/sdk/7.0/cbl-mariner2.0/amd64/Dockerfile index 76e0d36094..e8f04a2608 100644 --- a/src/sdk/7.0/cbl-mariner2.0/amd64/Dockerfile +++ b/src/sdk/7.0/cbl-mariner2.0/amd64/Dockerfile @@ -19,6 +19,7 @@ ENV \ RUN tdnf install -y \ git \ + tar \ && tdnf clean all # Install .NET SDK diff --git a/src/sdk/7.0/cbl-mariner2.0/arm64v8/Dockerfile b/src/sdk/7.0/cbl-mariner2.0/arm64v8/Dockerfile index 6894703c71..d6baa7a191 100644 --- a/src/sdk/7.0/cbl-mariner2.0/arm64v8/Dockerfile +++ b/src/sdk/7.0/cbl-mariner2.0/arm64v8/Dockerfile @@ -19,6 +19,7 @@ ENV \ RUN tdnf install -y \ git \ + tar \ && tdnf clean all # Install .NET SDK diff --git a/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs index a564fd280f..29f08302c2 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs @@ -253,15 +253,12 @@ public void VerifyGitInstallation(ProductImageData imageData) [MemberData(nameof(GetImageData))] public void VerifyTarInstallation(ProductImageData imageData) { - if (imageData.Version.Major != 7) - { - // tar should exist in the SDK for both Linux and Windows. The --version option works in either OS - DockerHelper.Run( - image: imageData.GetImage(DotNetImageType.SDK, DockerHelper), - name: imageData.GetIdentifier("tar"), - command: "tar --version" - ); - } + // tar should exist in the SDK for both Linux and Windows. The --version option works in either OS + DockerHelper.Run( + image: imageData.GetImage(DotNetImageType.SDK, DockerHelper), + name: imageData.GetIdentifier("tar"), + command: "tar --version" + ); } private IEnumerable GetActualSdkContents(ProductImageData imageData)