DockerBuild.ps1 fixes.

Author: gfraiteur

Build.ps1

@@ -15,7 +15,7 @@ $EngPath = 'eng'
 $ProductName = 'PostSharpEngineering'
 ####
 
-if ( $env:RUNNING_IN_DOCKER -and $env:START_REMOTE_DEBUGGER  )
+if ( $VsDebug  )
 {
     $vsmonport = 4024
     Write-Host "Starting Visual Studio Remote Debugger, listening at port $vsmonport." -ForegroundColor Cyan
@@ -24,7 +24,17 @@ if ( $env:RUNNING_IN_DOCKER -and $env:START_REMOTE_DEBUGGER  )
         -NoNewWindow
 }
 
-if ( -not $Interactive )
+# Change the prompt and window title in Docker.
+if ( $env:RUNNING_IN_DOCKER  )
 {
-    & dotnet run --project "$PSScriptRoot\$EngPath\src\Build$ProductName.csproj" -- $args
-}
+    function global:prompt {
+        $host.UI.RawUI.WindowTitle = "[docker] " + (Get-Location).Path
+        "[docker] $(Get-Location)> "
+    }
+}
+
+
+if ( -not $Interactive -or $BuildArgs )
+{
+    & dotnet run --project "$PSScriptRoot\$EngPath\src\Build$ProductName.csproj" -- $BuildArgs
+}

DockerBuild.ps1

@@ -67,7 +67,7 @@ function New-EnvJson
             $envVariables[$envName] = $envValue
         }
     }
-    
+
     # Convert to JSON and save
     $jsonPath = Join-Path $dockerContextDirectory "env.g.json"
 
@@ -195,14 +195,14 @@ if ( $VsDebug)
         Write-Host "Environment variable 'DevEnvDir' is not defined." -ForegroundColor Red
         exit 1
     }
-    
+
     $remoteDebuggerHostDir = "$($env:DevEnvDir)Remote Debugger\x64"
     if ( -not (Test-Path $remoteDebuggerHostDir))
     {
         Write-Host "Directory '$remoteDebuggerHostDir' does not exist." -ForegroundColor Red
         exit 1
     }
-    
+
     $remoteDebuggerContainerDir = "C:\msvsmon"
     $volumeMappings += @("-v", "${remoteDebuggerHostDir}:${remoteDebuggerContainerDir}:ro")
     $MountPoints += $remoteDebuggerContainerDir
@@ -269,26 +269,31 @@ if (-not $BuildImage)
     Write-Host "Building the product in the container." -ForegroundColor Green
 
     # Prepare Build.ps1 arguments
-    $buildCommand = "$SourceDirName\Build.ps1"
     if ( $VsDebug )
     {
-        $BuildArgs = @("-VsDebug") + $BuildArgs 
+        $BuildArgs = @("-VsDebug") + $BuildArgs
     }
-    $buildArgsString = $BuildArgs -join " "
-    $buildCommand += " $buildArgsString"
-    
+
     if ( $Interactive )
     {
         $pwshArgs = "-NoExit"
+        $BuildArgs = @("-Interactive") + $BuildArgs
+        $dockerArgs = @("-it")
     }
     else
     {
         $pwshArgs = "-NonInteractive"
+        $dockerArgs = @()
     }
-    
-    Write-Host "Executing in container: `".\Build.ps1 $buildArgsString`"." -ForegroundColor Cyan
 
-    docker run --rm --memory=12g @volumeMappings -w $SourceDirName $ImageName pwsh $pwshArgs -Command $buildCommand
+    $buildArgsString = $BuildArgs -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`"``." -ForegroundColor Cyan
+
+    docker run --rm --memory=12g @volumeMappings -w $SourceDirName @dockerArgs $ImageName pwsh $pwshArgs -Command "& .\Build.ps1 $buildArgsString"
     if ($LASTEXITCODE -ne 0)
     {
         Write-Host "Docker run (build) failed with exit code $LASTEXITCODE" -ForegroundColor Red

Dockerfile

@@ -70,9 +70,11 @@ RUN c:\ReadEnvironmentVariables.ps1 c:\env.g.json
 # Configure NuGet
 ENV NUGET_PACKAGES=c:\packages
 
+# Configure .NET SDK
+ENV DOTNET_NOLOGO=1
+
 # Configure git
 ARG SRC_DIR
-RUN echo $env:PATH
 RUN git config --global --add safe.directory $env:SRC_DIR/; `
     git config --global user.name $env:GIT_USER_NAME; `
     git config --global user.email $env:GIT_USER_EMAIL;

src/PostSharp.Engineering.BuildTools/Resources/DockerBuild.ps1

@@ -278,20 +278,22 @@ if (-not $BuildImage)
     {
         $pwshArgs = "-NoExit"
         $BuildArgs = @("-Interactive") + $BuildArgs
-        $dockerArgs = "-it"
+        $dockerArgs = @("-it")
     }
     else
     {
         $pwshArgs = "-NonInteractive"
-        $dockerArgs = ""
+        $dockerArgs = @()
     }
 
     $buildArgsString = $BuildArgs -join " "
+    $volumeMappingsAsString = $volumeMappings -join " "
+    $dockerArgsAsString = $dockerArgs -join " "
 
 
-    Write-Host "Executing in container: ``pwsh $pwshArgs -Command `"& .\Build.ps1 $buildArgsString`"``." -ForegroundColor Cyan
+    Write-Host "Executing: ``docker run --rm --memory=12g $volumeMappingsAsString -w $SourceDirName $dockerArgsAsString $ImageName pwsh $pwshArgs -Command `"& .\Build.ps1 $buildArgsString`"``." -ForegroundColor Cyan
 
-    docker run --rm --memory=12g @volumeMappings -w $SourceDirName $dockerArgs $ImageName pwsh $pwshArgs -Command "& .\Build.ps1 $buildArgsString"
+    docker run --rm --memory=12g @volumeMappings -w $SourceDirName @dockerArgs $ImageName pwsh $pwshArgs -Command "& .\Build.ps1 $buildArgsString"
     if ($LASTEXITCODE -ne 0)
     {
         Write-Host "Docker run (build) failed with exit code $LASTEXITCODE" -ForegroundColor Red