Ensure tar installed in SDK for Mariner 2.0 (dotnet#4065)

(cherry picked from commit 676db0d)
mthalman · Sep 13, 2022 · 7156919 · 7156919
1 parent 0fd5e85
commit 7156919
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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<SdkContentFileInfo> GetActualSdkContents(ProductImageData imageData)
-Original file line number
+Diff line change
@@ Expand Up / @@ -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",
@@ Expand Down @@