(build) docker test improvements

Author: arturcic

build.cake

@@ -19,7 +19,7 @@
 #tool "nuget:?package=NUnit.ConsoleRunner&version=3.10.0"
 #tool "nuget:?package=ILRepack&version=2.0.17"
 #tool "nuget:?package=Codecov&version=1.5.0"
-#tool "nuget:?package=nuget.commandline&version=5.0.2"
+#tool "nuget:?package=nuget.commandline&version=5.1.0"
 
 // Install .NET Core Global tools.
 #tool "dotnet:?package=GitReleaseManager.Tool&version=0.8.0"

build/docker.cake

@@ -31,7 +31,7 @@ Task("Docker-Test")
         var tags = GetDockerTags(dockerImage, parameters);
         foreach (var tag in tags)
         {
-            DockerTestRun(settings, parameters, tag, containerDir);
+            DockerTestRun(settings, parameters, tag, containerDir, "/showvariable", "FullSemver");
         }
     }
 });

build/utils/docker.cake

@@ -89,11 +89,9 @@ string DockerRunImage(DockerContainerRunSettings settings, string image, string
 void DockerTestRun(DockerContainerRunSettings settings, BuildParameters parameters, string image, string command, params string[] args)
 {
     Information($"Testing image: {image}");
-    var output = DockerRunImage(settings, image, command, args);
+    var output = DockerRun(settings, image, command, args);
 
-    var version = DeserializeJson<GitVersion>(output);
-
-    Assert.Equal(parameters.Version.GitVersion.FullSemVer, version.FullSemVer);
+    Assert.Equal(parameters.Version.GitVersion.FullSemVer, output);
 }
 
 string[] GetDockerTags(DockerImage dockerImage, BuildParameters parameters) {