Merge branch 'hotfix/7.0.6' into develop

nuke-build · Sep 24, 2023 · dfa68bb · dfa68bb
2 parents 2fb8c22 + f6da816
commit dfa68bb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [vNext]
 
+## [7.0.6] / 2023-09-24
+- Fixed logging of Docker target execution to fall back to debug messages
+
 ## [7.0.5] / 2023-09-05
 - Fixed filtering environment variables with newlines in Docker target execution
 - Fixed logging in Docker target execution
@@ -1100,7 +1103,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added CLT tasks for Git
 - Fixed background color in console output
 
-[vNext]: https://github.com/nuke-build/nuke/compare/7.0.5...HEAD
+[vNext]: https://github.com/nuke-build/nuke/compare/7.0.6...HEAD
+[7.0.6]: https://github.com/nuke-build/nuke/compare/7.0.5...7.0.6
 [7.0.5]: https://github.com/nuke-build/nuke/compare/7.0.4...7.0.5
 [7.0.4]: https://github.com/nuke-build/nuke/compare/7.0.3...7.0.4
 [7.0.3]: https://github.com/nuke-build/nuke/compare/7.0.2...7.0.3

diff --git a/source/Nuke.Common/Tools/Docker/DockerTargetDefinitionExtensions.cs b/source/Nuke.Common/Tools/Docker/DockerTargetDefinitionExtensions.cs
@@ -118,7 +118,17 @@ bool IsUpToDate() => build.BuildAssemblyDirectory.GlobFiles("*.dll")
                                  $"--{ParameterService.GetParameterDashedName(Constants.SkippedTargetsParameterName)}"
                              }.Concat(settings.Args))
                     .DisableProcessLogInvocation()
-                    .SetProcessLogger((_, message) => Log.Write(LogEventReader.ReadFromString(message))));
+                    .SetProcessLogger((_, message) =>
+                    {
+                        try
+                        {
+                            Log.Write(LogEventReader.ReadFromString(message));
+                        }
+                        catch
+                        {
+                            Log.Debug(message);
+                        }
+                    }));
             }
             finally
             {