Skip to content

Commit ff09583

Browse files
committed
(build) use global tool for docker image artifacts
1 parent ce54012 commit ff09583

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

build/docker-build.cake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ Task("Docker-Build")
66
.IsDependentOnWhen("Pack-Prepare", singleStageRun)
77
.Does<BuildParameters>((parameters) =>
88
{
9+
var workDir = DirectoryPath.FromString($"./src/Docker");
10+
11+
var tool = parameters.Paths.Directories.NugetRoot.CombineWithFilePath("GitVersion.Tool*");
12+
CopyFiles(tool.FullPath, workDir.Combine("content"));
13+
914
foreach(var dockerImage in parameters.Docker.Images)
1015
{
1116
DockerBuild(dockerImage, parameters);

build/utils/docker.cake

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ void DockerBuild(DockerImage dockerImage, BuildParameters parameters)
2727
{
2828
var (os, distro, targetframework) = dockerImage;
2929
var workDir = DirectoryPath.FromString($"./src/Docker");
30-
31-
var sourceDir = parameters.Paths.Directories.ArtifactsBin.Combine(targetframework);
32-
33-
CopyDirectory(sourceDir, workDir.Combine("content"));
34-
3530
var tags = GetDockerTags(dockerImage, parameters);
3631

3732
var buildSettings = new DockerImageBuildSettings
@@ -42,7 +37,6 @@ void DockerBuild(DockerImage dockerImage, BuildParameters parameters)
4237
BuildArg = new []
4338
{
4439
$"contentFolder=/content",
45-
"DOTNET_VARIANT=runtime",
4640
$"DOTNET_VERSION={targetframework.Replace("netcoreapp", "")}",
4741
$"DISTRO={distro}"
4842
},

src/Docker/Dockerfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
ARG DISTRO='debian-9'
22
ARG DOTNET_VERSION='2.1'
3-
ARG DOTNET_VARIANT='runtime'
43

5-
FROM gittools/build-images:$DISTRO-$DOTNET_VARIANT-$DOTNET_VERSION
4+
FROM gittools/build-images:$DISTRO-sdk-$DOTNET_VERSION as installer
65
ARG contentFolder
76

87
WORKDIR /app
98
COPY $contentFolder/ ./
9+
RUN dotnet tool install GitVersion.Tool --tool-path /tools --add-source .
1010

11-
ENTRYPOINT ["dotnet", "/app/gitversion.dll"]
11+
FROM gittools/build-images:$DISTRO-runtime-$DOTNET_VERSION
12+
13+
WORKDIR /tools
14+
COPY --from=installer /tools .
15+
16+
ENTRYPOINT ["/tools/dotnet-gitversion"]

0 commit comments

Comments
 (0)