DockerBuild.ps1: fixed -Interactive, added directory hash to image name.

gfraiteur · gfraiteur · commit 7adfd57548be · 2025-09-27T11:30:41.000+02:00
diff --git a/Build.ps1 b/Build.ps1
@@ -60,3 +60,7 @@ if (-not $Interactive -or $BuildArgs)
         Set-Location $previousLocation
     }
 }
+
+if ( $Interactive ) {
+    Write-Host "Entering interactive PowerShell." -ForegroundColor Green
+}
diff --git a/DockerBuild.ps1 b/DockerBuild.ps1
@@ -96,13 +96,20 @@ if ( [string]::IsNullOrEmpty($ImageName))
     # Get full path without drive name (e.g., "C:\src\Metalama.Compiler" becomes "src\Metalama.Compiler")
     $fullPath = $PSScriptRoot -replace '^[A-Za-z]:\\', ''
     # Sanitize path to valid Docker image name (lowercase alphanumeric and hyphens only)
-    $ImageName = $fullPath.ToLower() -replace '[^a-z0-9\-]', '-' -replace '-+', '-' -replace '^-|-$', ''
+    $ImageTag = $fullPath.ToLower() -replace '[^a-z0-9\-]', '-' -replace '-+', '-' -replace '^-|-$', ''
     # Ensure it doesn't start with a hyphen and has at least one character
-    if ([string]::IsNullOrEmpty($ImageName) -or $ImageName -match '^-')
+    if ([string]::IsNullOrEmpty($ImageTag) -or $ImageTag -match '^-')
     {
-        $ImageName = "docker-build-image"
+        $ImageTag = "docker-build-image"
     }
-    Write-Host "Generated image name from directory: $ImageName" -ForegroundColor Cyan
+    Write-Host "Generated image name from directory: $ImageTag" -ForegroundColor Cyan
+} else
+{
+    # Generate a hash of the repo directory tagging (4 bytes, 8 hex chars)
+    $hashBytes = (New-Object -TypeName System.Security.Cryptography.SHA256Managed).ComputeHash([System.Text.Encoding]::UTF8.GetBytes($PSScriptRoot))
+    $directoryHash = [System.BitConverter]::ToString($hashBytes, 0, 4).Replace("-", "").ToLower()
+    $ImageTag = "$ImageName`:$directoryHash"
+    Write-Host "Image will be tagged as: $ImageTag" -ForegroundColor Cyan
 }
 
 # When building locally (as opposed as on the build agent), we must do a complete cleanup because 
@@ -255,16 +262,16 @@ Write-Host "Mount points: " $mountPointsAsString -ForegroundColor Gray
 Write-Host "Git directories: " $gitDirectoriesAsString -ForegroundColor Gray
 
 # Kill all containers
-docker ps -q --filter "ancestor=$ImageName" | ForEach-Object {
+docker ps -q --filter "ancestor=$ImageTag" | ForEach-Object {
     Write-Host "Killing container $_"
     docker kill $_ 
 }
 
 # Building the image.
 if (-not $NoBuildImage)
 {
-    Write-Host "Building the image." -ForegroundColor Green
-    Get-Content -Raw Dockerfile | docker build -t $ImageName  --build-arg GITDIRS="$gitDirectoriesAsString"  --build-arg MOUNTPOINTS="$mountPointsAsString"  -f - $dockerContextDirectory
+    Write-Host "Building the image with tag: $ImageTag" -ForegroundColor Green
+    Get-Content -Raw Dockerfile | docker build -t $ImageTag  --build-arg GITDIRS="$gitDirectoriesAsString"  --build-arg MOUNTPOINTS="$mountPointsAsString"  -f - $dockerContextDirectory
     if ($LASTEXITCODE -ne 0)
     {
         Write-Host "Docker build failed with exit code $LASTEXITCODE" -ForegroundColor Red
@@ -293,23 +300,25 @@ if (-not $BuildImage)
     if ($Interactive)
     {
         $pwshArgs = "-NoExit"
-$BuildArgs = @("-Interactive") + $BuildArgs
-$dockerArgs = @("-it")
+        $BuildArgs = @("-Interactive") + $BuildArgs
+        $dockerArgs = @("-it")
+        $pwshExitCommand = ""
     }
     else
     {
         $pwshArgs = "-NonInteractive"
-$dockerArgs = @()
+        $dockerArgs = @()
+        $pwshExitCommand = "exit `$LASTEXITCODE`;"
     }
 
     $buildArgsString = $BuildArgs -join " "
-$VolumeMappingsAsString = $VolumeMappings -join " "
-$dockerArgsAsString = $dockerArgs -join " "
+    $VolumeMappingsAsString = $VolumeMappings -join " "
+    $dockerArgsAsString = $dockerArgs -join " "
 
 
-    Write-Host "Executing: ``docker run --rm --memory= 12g $VolumeMappingsAsString -w $SourceDirName $dockerArgsAsString $ImageName pwsh $pwshArgs -Command `"& .\Build.ps1 $buildArgsString`; exit `$LASTEXITCODE`"``." -ForegroundColor Cyan
+    Write-Host "Executing: ``docker run --rm --memory=12g $dockerArgsAsString $VolumeMappingsAsString -w $SourceDirName $ImageTag pwsh $pwshArgs -Command `"& .\Build.ps1 $buildArgsString`; $pwshExitCommand`"" -ForegroundColor Cyan
 
-    docker run --rm --memory=12g @VolumeMappings -w $SourceDirName @dockerArgs $ImageName pwsh $pwshArgs -Command "& .\Build.ps1 $buildArgsString`; exit `$LASTEXITCODE; "
+    docker run --rm --memory=12g $dockerArgs @VolumeMappings -w $SourceDirName @dockerArgs $ImageTag pwsh $pwshArgs -Command "& .\Build.ps1 $buildArgsString`; $pwshExitCommand; "
     if ($LASTEXITCODE -ne 0)
     {
         Write-Host "Docker run (build) failed with exit code $LASTEXITCODE" -ForegroundColor Red
diff --git a/src/PostSharp.Engineering.BuildTools/Resources/Build.ps1 b/src/PostSharp.Engineering.BuildTools/Resources/Build.ps1
@@ -60,3 +60,7 @@ if (-not $Interactive -or $BuildArgs)
         Set-Location $previousLocation
     }
 }
+
+if ( $Interactive ) {
+    Write-Host "Entering interactive PowerShell." -ForegroundColor Green
+}
diff --git a/src/PostSharp.Engineering.BuildTools/Resources/DockerBuild.ps1 b/src/PostSharp.Engineering.BuildTools/Resources/DockerBuild.ps1
@@ -96,13 +96,20 @@ if ( [string]::IsNullOrEmpty($ImageName))
     # Get full path without drive name (e.g., "C:\src\Metalama.Compiler" becomes "src\Metalama.Compiler")
     $fullPath = $PSScriptRoot -replace '^[A-Za-z]:\\', ''
     # Sanitize path to valid Docker image name (lowercase alphanumeric and hyphens only)
-    $ImageName = $fullPath.ToLower() -replace '[^a-z0-9\-]', '-' -replace '-+', '-' -replace '^-|-$', ''
+    $ImageTag = $fullPath.ToLower() -replace '[^a-z0-9\-]', '-' -replace '-+', '-' -replace '^-|-$', ''
     # Ensure it doesn't start with a hyphen and has at least one character
-    if ([string]::IsNullOrEmpty($ImageName) -or $ImageName -match '^-')
+    if ([string]::IsNullOrEmpty($ImageTag) -or $ImageTag -match '^-')
     {
-        $ImageName = "docker-build-image"
+        $ImageTag = "docker-build-image"
     }
-    Write-Host "Generated image name from directory: $ImageName" -ForegroundColor Cyan
+    Write-Host "Generated image name from directory: $ImageTag" -ForegroundColor Cyan
+} else
+{
+    # Generate a hash of the repo directory tagging (4 bytes, 8 hex chars)
+    $hashBytes = (New-Object -TypeName System.Security.Cryptography.SHA256Managed).ComputeHash([System.Text.Encoding]::UTF8.GetBytes($PSScriptRoot))
+    $directoryHash = [System.BitConverter]::ToString($hashBytes, 0, 4).Replace("-", "").ToLower()
+    $ImageTag = "$ImageName`:$directoryHash"
+    Write-Host "Image will be tagged as: $ImageTag" -ForegroundColor Cyan
 }
 
 # When building locally (as opposed as on the build agent), we must do a complete cleanup because 
@@ -255,16 +262,16 @@ Write-Host "Mount points: " $mountPointsAsString -ForegroundColor Gray
 Write-Host "Git directories: " $gitDirectoriesAsString -ForegroundColor Gray
 
 # Kill all containers
-docker ps -q --filter "ancestor=$ImageName" | ForEach-Object {
+docker ps -q --filter "ancestor=$ImageTag" | ForEach-Object {
     Write-Host "Killing container $_"
     docker kill $_ 
 }
 
 # Building the image.
 if (-not $NoBuildImage)
 {
-    Write-Host "Building the image." -ForegroundColor Green
-    Get-Content -Raw Dockerfile | docker build -t $ImageName  --build-arg GITDIRS="$gitDirectoriesAsString"  --build-arg MOUNTPOINTS="$mountPointsAsString"  -f - $dockerContextDirectory
+    Write-Host "Building the image with tag: $ImageTag" -ForegroundColor Green
+    Get-Content -Raw Dockerfile | docker build -t $ImageTag  --build-arg GITDIRS="$gitDirectoriesAsString"  --build-arg MOUNTPOINTS="$mountPointsAsString"  -f - $dockerContextDirectory
     if ($LASTEXITCODE -ne 0)
     {
         Write-Host "Docker build failed with exit code $LASTEXITCODE" -ForegroundColor Red
@@ -293,23 +300,25 @@ if (-not $BuildImage)
     if ($Interactive)
     {
         $pwshArgs = "-NoExit"
-$BuildArgs = @("-Interactive") + $BuildArgs
-$dockerArgs = @("-it")
+        $BuildArgs = @("-Interactive") + $BuildArgs
+        $dockerArgs = @("-it")
+        $pwshExitCommand = ""
     }
     else
     {
         $pwshArgs = "-NonInteractive"
-$dockerArgs = @()
+        $dockerArgs = @()
+        $pwshExitCommand = "exit `$LASTEXITCODE`;"
     }
 
     $buildArgsString = $BuildArgs -join " "
-$VolumeMappingsAsString = $VolumeMappings -join " "
-$dockerArgsAsString = $dockerArgs -join " "
+    $VolumeMappingsAsString = $VolumeMappings -join " "
+    $dockerArgsAsString = $dockerArgs -join " "
 
 
-    Write-Host "Executing: ``docker run --rm --memory= 12g $VolumeMappingsAsString -w $SourceDirName $dockerArgsAsString $ImageName pwsh $pwshArgs -Command `"& .\Build.ps1 $buildArgsString`; exit `$LASTEXITCODE`"``." -ForegroundColor Cyan
+    Write-Host "Executing: ``docker run --rm --memory=12g $dockerArgsAsString $VolumeMappingsAsString -w $SourceDirName $ImageTag pwsh $pwshArgs -Command `"& .\Build.ps1 $buildArgsString`; $pwshExitCommand`"" -ForegroundColor Cyan
 
-    docker run --rm --memory=12g @VolumeMappings -w $SourceDirName @dockerArgs $ImageName pwsh $pwshArgs -Command "& .\Build.ps1 $buildArgsString`; exit `$LASTEXITCODE; "
+    docker run --rm --memory=12g $dockerArgs @VolumeMappings -w $SourceDirName @dockerArgs $ImageTag pwsh $pwshArgs -Command "& .\Build.ps1 $buildArgsString`; $pwshExitCommand; "
     if ($LASTEXITCODE -ne 0)
     {
         Write-Host "Docker run (build) failed with exit code $LASTEXITCODE" -ForegroundColor Red

Original file line number	Diff line number	Diff line change
`@@ -60,3 +60,7 @@ if (-not $Interactive -or $BuildArgs)`
`60`	`60`	`Set-Location $previousLocation`
`61`	`61`	`}`
`62`	`62`	`}`
	`63`	`+`
	`64`	`+if ( $Interactive ) {`
	`65`	`+ Write-Host "Entering interactive PowerShell." -ForegroundColor Green`
	`66`	`+}`