Git authentication fixes.

Author: gfraiteur

DockerBuild.ps1

@@ -17,7 +17,7 @@ param(
 
 # This setting is replaced by the generate-scripts command.
 $EngPath = 'eng'
-$EnvironmentVariables = 'AWS_ACCESS_KEY_ID,AWS_SECRET_ACCESS_KEY,AZ_IDENTITY_USERNAME,AZURE_CLIENT_ID,AZURE_CLIENT_SECRET,AZURE_DEVOPS_TOKEN,AZURE_DEVOPS_USER,AZURE_TENANT_ID,DOC_API_KEY,DOWNLOADS_API_KEY,ENG_USERNAME,GITHUB_AUTHOR_EMAIL,GITHUB_REVIEWER_TOKEN,GITHUB_TOKEN,IS_POSTSHARP_OWNED,IS_TEAMCITY_AGENT,NUGET_ORG_API_KEY,SIGNSERVER_SECRET,TEAMCITY_CLOUD_TOKEN,TYPESENSE_API_KEY,VS_MARKETPLACE_ACCESS_TOKEN,VSS_NUGET_EXTERNAL_FEED_ENDPOINTS'
+$EnvironmentVariables = 'AWS_ACCESS_KEY_ID,AWS_SECRET_ACCESS_KEY,AZ_IDENTITY_USERNAME,AZURE_CLIENT_ID,AZURE_CLIENT_SECRET,AZURE_DEVOPS_TOKEN,AZURE_DEVOPS_USER,AZURE_TENANT_ID,DOC_API_KEY,DOWNLOADS_API_KEY,ENG_USERNAME,GIT_USER_EMAIL,GIT_USER_NAME,GITHUB_AUTHOR_EMAIL,GITHUB_REVIEWER_TOKEN,GITHUB_TOKEN,IS_POSTSHARP_OWNED,IS_TEAMCITY_AGENT,NUGET_ORG_API_KEY,SIGNSERVER_SECRET,TEAMCITY_CLOUD_TOKEN,TYPESENSE_API_KEY,VS_MARKETPLACE_ACCESS_TOKEN,VSS_NUGET_EXTERNAL_FEED_ENDPOINTS'
 
 $dockerContextDirectory = "$EngPath/docker-context"
 
@@ -97,6 +97,9 @@ if (-not $KeepEnv)
     {
         $env:ENG_USERNAME = $env:USERNAME
     }
+
+    $env:GIT_USER_NAME = git config --global user.name
+    $env:GIT_USER_EMAIL = git config --global user.email
 
     New-EnvJson -EnvironmentVariableList $EnvironmentVariables
 }

Dockerfile

@@ -73,5 +73,7 @@ ENV NUGET_PACKAGES=c:\packages
 # Configure git
 ARG SRC_DIR
 RUN echo $env:PATH
-RUN git config --global --add safe.directory $env:SRC_DIR/
+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/Docker/EpilogueComponent.cs

@@ -39,7 +39,9 @@ ARG MOUNTPOINTS
             # Configure git
             ARG SRC_DIR
             RUN echo $env:PATH
-            RUN git config --global --add safe.directory $env:SRC_DIR/
+            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/EnvironmentVariableNames.cs

@@ -21,6 +21,10 @@ public static class EnvironmentVariableNames
 
     // NuGet.org
     public const string NuGetOrgApiKey = "NUGET_ORG_API_KEY";
+    
+    // Git - set by DockerBuild.ps1 from current git config.
+    public const string GitUserName = "GIT_USER_NAME";
+    public const string GitUserEmail = "GIT_USER_EMAIL";
 
     // GitHub
     public const string GitHubToken = "GITHUB_TOKEN";
@@ -58,6 +62,8 @@ public static class EnvironmentVariableNames
         AzureDevOpsToken,
         GitHubReviewerToken,
         GitHubAuthorEmail,
+        GitUserEmail,
+        GitUserName,
         NuGetOrgApiKey,
         AwsAccessKeyId,
         AwsAccessKeySecret,

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

@@ -97,6 +97,9 @@ if (-not $KeepEnv)
     {
         $env:ENG_USERNAME = $env:USERNAME
     }
+
+    $env:GIT_USER_NAME = git config --global user.name
+    $env:GIT_USER_EMAIL = git config --global user.email
 
     New-EnvJson -EnvironmentVariableList $EnvironmentVariables
 }