(build) use global tool for docker image artifacts

GitTools · Mar 7, 2020 · ff09583 · ff09583
1 parent ce54012
commit ff09583
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/build/docker-build.cake b/build/docker-build.cake
@@ -6,6 +6,11 @@ Task("Docker-Build")
     .IsDependentOnWhen("Pack-Prepare", singleStageRun)
     .Does<BuildParameters>((parameters) =>
 {
+    var workDir = DirectoryPath.FromString($"./src/Docker");
+
+    var tool = parameters.Paths.Directories.NugetRoot.CombineWithFilePath("GitVersion.Tool*");
+    CopyFiles(tool.FullPath, workDir.Combine("content"));
+
     foreach(var dockerImage in parameters.Docker.Images)
     {
         DockerBuild(dockerImage, parameters);

diff --git a/build/utils/docker.cake b/build/utils/docker.cake
@@ -27,11 +27,6 @@ void DockerBuild(DockerImage dockerImage, BuildParameters parameters)
 {
     var (os, distro, targetframework) = dockerImage;
     var workDir = DirectoryPath.FromString($"./src/Docker");
-
-    var sourceDir = parameters.Paths.Directories.ArtifactsBin.Combine(targetframework);
-
-    CopyDirectory(sourceDir, workDir.Combine("content"));
-
     var tags = GetDockerTags(dockerImage, parameters);
 
     var buildSettings = new DockerImageBuildSettings
@@ -42,7 +37,6 @@ void DockerBuild(DockerImage dockerImage, BuildParameters parameters)
         BuildArg = new []
         {
             $"contentFolder=/content",
-            "DOTNET_VARIANT=runtime",
             $"DOTNET_VERSION={targetframework.Replace("netcoreapp", "")}",
             $"DISTRO={distro}"
         },

diff --git a/src/Docker/Dockerfile b/src/Docker/Dockerfile
@@ -1,11 +1,16 @@
 ARG DISTRO='debian-9'
 ARG DOTNET_VERSION='2.1'
-ARG DOTNET_VARIANT='runtime'
 
-FROM gittools/build-images:$DISTRO-$DOTNET_VARIANT-$DOTNET_VERSION
+FROM gittools/build-images:$DISTRO-sdk-$DOTNET_VERSION as installer
 ARG contentFolder
 
 WORKDIR /app
 COPY $contentFolder/ ./
+RUN dotnet tool install GitVersion.Tool --tool-path /tools --add-source .
 
-ENTRYPOINT ["dotnet", "/app/gitversion.dll"]
+FROM gittools/build-images:$DISTRO-runtime-$DOTNET_VERSION
+
+WORKDIR /tools
+COPY --from=installer /tools .
+
+ENTRYPOINT ["/tools/dotnet-gitversion"]