Skip to content

Commit b68af9f

Browse files
authored
issue #3525 (#3540)
Bump version number Fixes #3525 Dumps free disk space on container exceptions Increase download timeout on insider or no CDN Co-authored-by: freddydk <[email protected]>
1 parent db40110 commit b68af9f

6 files changed

+12
-3
lines changed

BC.HelperFunctions.ps1

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ function Get-ContainerHelperConfig {
1919
"useWinRmSession" = "allow" # allow, always, never
2020
"addTryCatchToScriptBlock" = $true
2121
"killPsSessionProcess" = $false
22+
"usePrereleaseAlTool" = $true
2223
"useVolumes" = $false
2324
"useVolumeForMyFolder" = $false
2425
"use7zipIfAvailable" = $true

Common/Download-File.ps1

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ function Download-File {
7373
if ($bcContainerHelperConfig.DoNotUseCdnForArtifacts -or $sourceUrl -like 'https://bcinsider*.net/*') {
7474
# Do not use CDN when configured or bcinsider
7575
$sourceUrl = ReplaceCDN -sourceUrl $sourceUrl -useBlobUrl
76+
$timeout += $timeout
7677
}
7778
try {
7879
DownloadFileLow -sourceUrl (ReplaceCDN -sourceUrl $sourceUrl) -destinationFile $destinationFile -dontOverwrite:$dontOverwrite -timeout $timeout -headers $headers

ContainerHandling/Invoke-ScriptInNavContainer.ps1

+2
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ function Invoke-ScriptInBcContainer {
7373
$isOutOfMemory = Invoke-Command -Session $session -ScriptBlock { Param($containerName, $startTime)
7474
$cimInstance = Get-CIMInstance Win32_OperatingSystem
7575
Write-Host "`nContainer Free Physical Memory: $(($cimInstance.FreePhysicalMemory/1024/1024).ToString('F1',[CultureInfo]::InvariantCulture))Gb"
76+
Get-PSDrive C | ForEach-Object { Write-Host "Disk C: Free $([Math]::Round($_.Free / 1GB))Gb from $([Math]::Round(($_.Free+$_.Used) / 1GB))Gb" }
7677
$any = $false
7778
Write-Host "`nServices in container $($containerName):"
7879
Get-Service |
@@ -235,6 +236,7 @@ if ($exception) {
235236
$isOutOfMemory = Invoke-Command -ScriptBlock { Param($containerName, $startTime)
236237
$cimInstance = Get-CIMInstance Win32_OperatingSystem
237238
Write-Host "Container Free Physical Memory: $(($cimInstance.FreePhysicalMemory/1024/1024).ToString('F1',[CultureInfo]::InvariantCulture))Gb"
239+
Get-PSDrive C | ForEach-Object { Write-Host "Disk C: Free $([Math]::Round($_.Free / 1GB))Gb from $([Math]::Round(($_.Free+$_.Used) / 1GB))Gb" }
238240
$any = $false
239241
Write-Host "`nServices in container $($containerName):"
240242
Get-Service |

HelperFunctions.ps1

+3-2
Original file line numberDiff line numberDiff line change
@@ -1228,9 +1228,10 @@ function DownloadLatestAlLanguageExtension {
12281228

12291229
function RunAlTool {
12301230
Param(
1231-
[string[]] $arguments
1231+
[string[]] $arguments,
1232+
[switch] $usePrereleaseAlTool = ($bccontainerHelperConfig.usePrereleaseAlTool)
12321233
)
1233-
$path = DownloadLatestAlLanguageExtension
1234+
$path = DownloadLatestAlLanguageExtension -allowPrerelease:$usePrereleaseAlTool
12341235
if ($isLinux) {
12351236
$alToolExe = Join-Path $path 'extension/bin/linux/altool'
12361237
Write-Host "Setting execute permissions on altool"

ReleaseNotes.txt

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
6.0.18
2+
Use altool from prerelease AL Language extension
3+
Display disk free inside container on error
4+
15
6.0.17
26
Issue 3518 If WinRm is not running on the host, a container couldn't be created
37
Issue 3519 New-BcContainer fails due to password complexity on some computers

Version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.0.17-dev
1+
6.0.18-dev

0 commit comments

Comments
 (0)