Docker: fixed issue with source dependencies.

Author: gfraiteur

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

@@ -35,14 +35,21 @@ ARG MOUNTPOINTS
 
             # Configure NuGet
             ENV NUGET_PACKAGES=c:\packages
-            
+
             # Configure .NET SDK
             ENV DOTNET_NOLOGO=1
 
             # Configure git
-            ARG SRC_DIR
-            RUN git config --global --add safe.directory $env:SRC_DIR/; `
-                git config --global user.name $env:GIT_USER_NAME; `
+            ARG GITDIRS
+            RUN if ($env:GITDIRS) { `
+                    $gitdirs = $env:GITDIRS -split ';'; `
+                    foreach ($dir in $gitdirs) { `
+                        if ($dir) { `
+                            git config --global --add safe.directory $dir/; `
+                        } `
+                    } `
+                }
+            RUN 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

@@ -53,7 +53,8 @@ function New-EnvJson
     {
         $moduleName = "Az.KeyVault"
 
-        if (-not (Get-Module -ListAvailable -Name $moduleName)) {
+        if (-not (Get-Module -ListAvailable -Name $moduleName))
+        {
             Write-Error "The required module '$moduleName' is not installed. Please install it with: Install-Module -Name $moduleName"
             exit 1
         }
@@ -158,18 +159,16 @@ if (-not (Test-Path $dockerContextDirectory))
 
 
 # Prepare volume mappings
-$volumeMappings = @("-v", "${SourceDirName}:${SourceDirName}")
-$MountPoints = @($SourceDirName)
-
-# We must add a MountPoint anyway so the directory is created in the container.
-$MountPoints += "c:\packages"
+$VolumeMappings = @("-v", "${SourceDirName}:${SourceDirName}")
+$MountPoints = @($SourceDirName, "c:\packages")
+$GitDirectories = @($SourceDirName)
 
-# Define static Git system directory for mapping
+# Define static Git system directory for mapping. This used by Teamcity as an LFS parent repo.
 $gitSystemDir = "$BuildAgentPath\system\git"
 
 if (Test-Path $gitSystemDir)
 {
-    $volumeMappings += @("-v", "${gitSystemDir}:${gitSystemDir}:ro")
+    $VolumeMappings += @("-v", "${gitSystemDir}:${gitSystemDir}:ro")
     $MountPoints += $gitSystemDir
 }
 
@@ -184,27 +183,27 @@ if (-not $NoNuGetCache)
         New-Item -ItemType Directory -Force -Path $nugetCacheDir | Out-Null
     }
 
-    $volumeMappings += @("-v", "${nugetCacheDir}:c:\packages")
+    $VolumeMappings += @("-v", "${nugetCacheDir}:c:\packages")
 }
 
 # Mount VS Remote Debugger
-if ( $VsDebug)
+if ($VsDebug)
 {
-    if ( -not $env:DevEnvDir)
+    if (-not $env:DevEnvDir)
     {
         Write-Host "Environment variable 'DevEnvDir' is not defined." -ForegroundColor Red
         exit 1
     }
 
-    $remoteDebuggerHostDir = "$($env:DevEnvDir)Remote Debugger\x64"
-    if ( -not (Test-Path $remoteDebuggerHostDir))
+    $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")
+    $VolumeMappings += @("-v", "${remoteDebuggerHostDir}:${remoteDebuggerContainerDir}:ro")
     $MountPoints += $remoteDebuggerContainerDir
 
 }
@@ -221,14 +220,21 @@ if (Test-Path $sourceDependenciesDir)
         if (-not [string]::IsNullOrEmpty($targetPath) -and (Test-Path $targetPath))
         {
             Write-Host "Found symbolic link '$( $link.Name )' -> '$targetPath'" -ForegroundColor Cyan
-            $volumeMappings += @("-v", "${targetPath}:${targetPath}:ro")
+            $VolumeMappings += @("-v", "${targetPath}:${targetPath}:ro")
             $MountPoints += $targetPath
+            $GitDirectories += $targetPath
         }
         else
         {
             Write-Host "Warning: Symbolic link '$( $link.Name )' target '$targetPath' does not exist or is invalid" -ForegroundColor Yellow
         }
     }
+
+    $sourceDirectories = Get-ChildItem -Path $sourceDependenciesDir -Force | Where-Object { $_.LinkType -eq $null }
+    foreach ($sourceDirectory in $sourceDirectories)
+    {
+        $GitDirectories += $sourceDirectory
+    }
 }
 
 # Execute auto-generated DockerMounts.g.ps1 script to add more directory mounts.
@@ -239,16 +245,18 @@ if (Test-Path $dockerMountsScript)
     . $dockerMountsScript
 }
 
-$mountPointsArg = $MountPoints -Join ";"
+$mountPointsAsString = $MountPoints -Join ";"
+$gitDirectoriesAsString = $GitDirectories -Join ";"
 
-Write-Host "Volume mappings: " @volumeMappings -ForegroundColor Gray
-Write-Host "Mount points: " $mountPointsArg -ForegroundColor Gray
+Write-Host "Volume mappings: " @VolumeMappings -ForegroundColor Gray
+Write-Host "Mount points: " $mountPointsAsString -ForegroundColor Gray
+Write-Host "Git directories: " $gitDirectoriesAsString -ForegroundColor Gray
 
 # Building the image.
 if (-not $NoBuildImage)
 {
     Write-Host "Building the image." -ForegroundColor Green
-    Get-Content -Raw Dockerfile | docker build -t $ImageName  --build-arg SRC_DIR="$SourceDirName"  --build-arg MOUNTPOINTS="$mountPointsArg"  -f - $dockerContextDirectory
+    Get-Content -Raw Dockerfile | docker build -t $ImageName  --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
@@ -269,12 +277,12 @@ if (-not $BuildImage)
     Write-Host "Building the product in the container." -ForegroundColor Green
 
     # Prepare Build.ps1 arguments
-    if ( $VsDebug )
+    if ($VsDebug)
     {
         $BuildArgs = @("-VsDebug") + $BuildArgs
     }
 
-    if ( $Interactive )
+    if ($Interactive)
     {
         $pwshArgs = "-NoExit"
         $BuildArgs = @("-Interactive") + $BuildArgs
@@ -287,13 +295,13 @@ if (-not $BuildImage)
     }
 
     $buildArgsString = $BuildArgs -join " "
-    $volumeMappingsAsString = $volumeMappings -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
+    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