Skip to content

Commit 390a622

Browse files
committed
don't try to remove existing docker daemon config (we're not admin anymore 😅)
1 parent 2cf6b4f commit 390a622

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

build.ps1

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -122,20 +122,13 @@ function Test-Image {
122122
return $failed
123123
}
124124

125-
function Initialize-Docker() {
125+
function Get-DockerInfo() {
126126
docker info
127-
# Cf https://github.com/jenkins-infra/jenkins-infra/blob/production/modules/profile/templates/jenkinscontroller/casc/clouds-ec2.yaml.erb
128-
$dockerDaemonConfigPath = 'C:\ProgramData\Docker\config\daemon.json'
129-
if (Test-Path $dockerDaemonConfigPath) {
130-
$dockerDaemonConfig = Get-Content -Path $dockerDaemonConfigPath -Raw | ConvertFrom-Json
131-
Write-Host "${dockerDaemonConfigPath} file content:"
132-
$dockerDaemonConfig | ConvertTo-Json
133-
}
134-
# System information
127+
128+
# Additional system information
135129
Get-ComputerInfo | Select-Object OsName, OsBuildNumber, WindowsVersion
136130
Get-CimInstance -ClassName Win32_Processor | Out-String
137131
Get-WindowsFeature Containers | Out-String
138-
docker info
139132
}
140133

141134
function Initialize-DockerComposeFile {
@@ -190,7 +183,7 @@ Test-CommandExists 'docker buildx'
190183
Test-CommandExists 'yq'
191184

192185
if($target -eq 'docker-init') {
193-
Initialize-Docker
186+
Get-DockerInfo
194187
}
195188

196189
foreach($agentType in $AgentTypes) {

0 commit comments

Comments
 (0)