From 0b644b7fdd91b0f5f381e09c5e6b3d1d069b8d0a Mon Sep 17 00:00:00 2001 From: lksz Date: Wed, 20 Jan 2021 22:30:57 -0500 Subject: [PATCH] dco commands will run sequential with single projs --- docker/Invoke-DockerCompose.ps1 | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/docker/Invoke-DockerCompose.ps1 b/docker/Invoke-DockerCompose.ps1 index fcf7022..6741674 100644 --- a/docker/Invoke-DockerCompose.ps1 +++ b/docker/Invoke-DockerCompose.ps1 @@ -1,6 +1,6 @@ -[CmdletBinding(SupportsShouldProcess)]param( - [ArgumentCompleter({ param ( - $commandName, +[CmdletBinding(SupportsShouldProcess)]param( + [ArgumentCompleter({ param ( + $commandName, $parameterName, $wordToComplete, $commandAst, @@ -54,7 +54,8 @@ $local:dcPathList = $ProjectPath | ForEach-Object { } } if( -not $dcPathList ) { return } -Write-Verbose "$dcPathList" + +$local:SingleProject = $dcPathList.Length -eq 1 foreach( $local:p in $CliParams ) { if( -not $p ) { continue } @@ -65,8 +66,8 @@ foreach( $local:p in $CliParams ) { if( $p -isnot [String] -or $p.Length -eq 1 ) { $local:skipFirst = $true switch( $p[0] ) { - '&' { $AsJob = $true } - '!' { $Wait = $true } + '&' { $AsJob = -not $SingleProject } + '!' { $Wait = -not $SingleProject } default { $skipFirst = $false } } if( $skipFirst ) { $p = $p | Select-Object -Skip 1 } @@ -92,10 +93,11 @@ foreach( $local:p in $CliParams ) { if( -not $dcParams ) { continue } + $local:nextActionDescription = "In $dcPath Run $(if($AsJob){"(bg) "})with: $dcParams" if( $WhatIfPreference ) { - Write-Host "In $dcPath Run $(if($AsJob){"(bg) "})with: $dcParams" + Write-Host -ForegroundColor DarkYellow $nextActionDescription } else { - Write-Verbose "& docker-compose --file $dcPath $dcParams" + Write-Verbose $nextActionDescription if( $AsJob ) { $JobQueue += Start-Job -ArgumentList @($dcPath,$dcParams) -ScriptBlock {