Skip to content

Commit 59add56

Browse files
committed
Fixes Dockerbuild.
1 parent e534e59 commit 59add56

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

DockerBuild.ps1

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ $dockerContextDirectory = "$EngPath/docker-context"
3434

3535
Set-Location $PSScriptRoot
3636

37+
if ($env:IS_TEAMCITY_AGENT)
38+
{
39+
Write-Host "Running on TeamCity agent at '$BuildAgentPath'" -ForegroundColor Cyan
40+
}
41+
3742
# Function to create secrets JSON file
3843
function New-EnvJson
3944
{
@@ -476,7 +481,8 @@ if (Test-Path $sourceDependenciesDir)
476481
$sourceDirectories = Get-ChildItem -Path $sourceDependenciesDir -Force | Where-Object { $_.LinkType -eq $null }
477482
foreach ($sourceDirectory in $sourceDirectories)
478483
{
479-
$GitDirectories += $sourceDirectory
484+
Write-Host "Mounting source-dependencies directory: $($sourceDirectory.FullName)" -ForegroundColor Cyan
485+
$GitDirectories += $sourceDirectory.FullName
480486
}
481487
}
482488

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,20 @@ param(
2525

2626
####
2727
# These settings are replaced by the generate-scripts command.
28-
$EngPath = '<ENG_PATH>'
29-
$EnvironmentVariables = '<ENVIRONMENT_VARIABLES>'
28+
$EngPath = 'eng'
29+
$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,MetalamaLicense,NUGET_ORG_API_KEY,PostSharpLicense,SIGNSERVER_SECRET,TEAMCITY_CLOUD_TOKEN,TYPESENSE_API_KEY,VS_MARKETPLACE_ACCESS_TOKEN,VSS_NUGET_EXTERNAL_FEED_ENDPOINTS'
3030
####
3131

3232
$ErrorActionPreference = "Stop"
3333
$dockerContextDirectory = "$EngPath/docker-context"
3434

3535
Set-Location $PSScriptRoot
3636

37+
if ($env:IS_TEAMCITY_AGENT)
38+
{
39+
Write-Host "Running on TeamCity agent at '$BuildAgentPath'" -ForegroundColor Cyan
40+
}
41+
3742
# Function to create secrets JSON file
3843
function New-EnvJson
3944
{
@@ -476,7 +481,8 @@ if (Test-Path $sourceDependenciesDir)
476481
$sourceDirectories = Get-ChildItem -Path $sourceDependenciesDir -Force | Where-Object { $_.LinkType -eq $null }
477482
foreach ($sourceDirectory in $sourceDirectories)
478483
{
479-
$GitDirectories += $sourceDirectory
484+
Write-Host "Mounting source-dependencies directory: $($sourceDirectory.FullName)" -ForegroundColor Cyan
485+
$GitDirectories += $sourceDirectory.FullName
480486
}
481487
}
482488

0 commit comments

Comments
 (0)