Update Docker components for multi-OS support

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: gfraiteur

Dockerfile

@@ -20,7 +20,7 @@ ENV LC_ALL=C.UTF-8
 ENV DOTNET_CLI_UI_LANGUAGE=en
 ENV VSLANG=1033
 
-# Set base PATH explicitly to avoid issues with ${PATH} expansion
+# Set base PATH explicitly to avoid issues with expansion
 ENV PATH="C:\Windows\System32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0"
 
 # Enable long path support
@@ -63,6 +63,9 @@ RUN & .\dotnet-install.ps1 -Version 9.0.310 -InstallDir 'C:\Program Files\dotnet
 
 
 # Epilogue
+# Link to private repository for GHCR visibility
+LABEL org.opencontainers.image.source=https://github.com/postsharp/PostSharp.Engineering.Images
+
 # Create docker-context directory for build scripts
 RUN New-Item -ItemType Directory -Path c:\docker-context -Force | Out-Null
 

Dockerfile.claude

@@ -20,7 +20,7 @@ ENV LC_ALL=C.UTF-8
 ENV DOTNET_CLI_UI_LANGUAGE=en
 ENV VSLANG=1033
 
-# Set base PATH explicitly to avoid issues with ${PATH} expansion
+# Set base PATH explicitly to avoid issues with expansion
 ENV PATH="C:\Windows\System32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0"
 
 # Enable long path support
@@ -96,6 +96,9 @@ SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-Comma
 
 
 # Epilogue
+# Link to private repository for GHCR visibility
+LABEL org.opencontainers.image.source=https://github.com/postsharp/PostSharp.Engineering.Images
+
 # Create docker-context directory for build scripts
 RUN New-Item -ItemType Directory -Path c:\docker-context -Force | Out-Null
 

src/PostSharp.Engineering.BuildTools/ContinuousIntegration/GenerateScriptsCommand.cs

@@ -40,13 +40,18 @@ public static bool Execute( BuildContext context, CommonCommandSettings settings
             EmbeddedResourceHelper.ExtractScript( context, "RunClaude.ps1", "eng" );
             var image = (ContainerRequirements) product.OverriddenBuildAgentRequirements!;
 
-            if ( !image.WriteDockerfile( context ) )
+            if ( !image.WriteDockerfile( context, ContainerOperatingSystem.Windows2025, "Dockerfile" ) )
+            {
+                return false;
+            }
+            
+            if ( !image.WriteDockerfile( context, ContainerOperatingSystem.Windows2022, "Dockerfile.win2022" ) )
             {
                 return false;
             }
 
             // Generate Claude Dockerfile (will auto-add NodeJs if not present)
-            if ( !image.WriteClaudeDockerfile( context ) )
+            if ( !image.WriteClaudeDockerfile( context, ContainerOperatingSystem.Windows2025, "Dockerfile.claude" ) )
             {
                 return false;
             }

src/PostSharp.Engineering.BuildTools/Docker/AzureArtifactsCredentialProviderComponent.cs

@@ -12,7 +12,7 @@ public sealed class AzureArtifactsCredentialProviderComponent : ContainerCompone
 
     public override ContainerComponentKind Kind => ContainerComponentKind.AzureArtifactsCredentialProvider;
 
-    public override void WriteDockerfile( TextWriter writer )
+    public override void WriteDockerfile( TextWriter writer, ContainerOperatingSystem operatingSystem )
     {
         writer.WriteLine(
             """

src/PostSharp.Engineering.BuildTools/Docker/AzureCliComponent.cs

@@ -12,7 +12,7 @@ public sealed class AzureCliComponent : ContainerComponent
 
     public override ContainerComponentKind Kind => ContainerComponentKind.AzureCli;
 
-    public override void WriteDockerfile( TextWriter writer )
+    public override void WriteDockerfile( TextWriter writer, ContainerOperatingSystem operatingSystem )
     {
         writer.WriteLine(
             """

src/PostSharp.Engineering.BuildTools/Docker/ChocolateyComponent.cs

@@ -10,7 +10,7 @@ public class ChocolateyComponent : ContainerComponent
 
     public override ContainerComponentKind Kind => ContainerComponentKind.Chocolatey;
 
-    public override void WriteDockerfile( TextWriter writer )
+    public override void WriteDockerfile( TextWriter writer, ContainerOperatingSystem operatingSystem )
     {
         writer.WriteLine(
             """

src/PostSharp.Engineering.BuildTools/Docker/ClaudeAddInsComponent.cs

@@ -38,7 +38,7 @@ public class ClaudeAddInsComponent : ContainerComponent
         "eng"
     ];
 
-    public override void WriteDockerfile( TextWriter writer )
+    public override void WriteDockerfile( TextWriter writer, ContainerOperatingSystem operatingSystem )
     {
         // Use cmd shell to avoid HCS issues with PowerShell
         writer.WriteLine(

src/PostSharp.Engineering.BuildTools/Docker/ClaudeComponent.cs

@@ -19,7 +19,7 @@ public class ClaudeComponent : ContainerComponent
 
     public override ContainerComponentKind Kind => ContainerComponentKind.Claude;
 
-    public override void WriteDockerfile( TextWriter writer )
+    public override void WriteDockerfile( TextWriter writer, ContainerOperatingSystem operatingSystem )
     {
         // We don't use the native installer because it's very slow to download.
         // At least the NPM version is stored on fast CDNs.

src/PostSharp.Engineering.BuildTools/Docker/ContainerComponent.cs

@@ -13,7 +13,7 @@ public abstract class ContainerComponent : IComparable<ContainerComponent>
 
     public abstract ContainerComponentKind Kind { get; }
 
-    public abstract void WriteDockerfile( TextWriter writer );
+    public abstract void WriteDockerfile( TextWriter writer, ContainerOperatingSystem operatingSystem );
 
     public virtual void AddRequirements( IReadOnlyList<ContainerComponent> components, Action<ContainerComponent> add ) { }
 

src/PostSharp.Engineering.BuildTools/Docker/ContainerOperatingSystem.cs

@@ -6,4 +6,11 @@ public enum ContainerOperatingSystem
     Default = Windows2025,
     Windows2022,
     Linux
+}
+
+
+public enum OperatingSystemFamily
+{
+    Windows,
+    Linux
 }