(build) small changes to the DockerBuild target

Author: arturcic

.gitignore

@@ -117,7 +117,7 @@ releaseArtifacts
 .dotnet
 artifacts
 !build/artifacts
-build/docker/content
+build/docker/nuget
 src/PublicAPI.empty.txt
 
 !**/*.cake

build/CI.sln

@@ -5,6 +5,7 @@ ProjectSection(SolutionItems) = preProject
 	Directory.Packages.props = Directory.Packages.props
 	..\dotnet-tools.json = ..\dotnet-tools.json
 	..\global.json = ..\global.json
+	..\.gitignore = ..\.gitignore
 EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "build", "build\build.csproj", "{1AC00FB2-E28A-46B7-9683-AA7A1AFC29EB}"

build/common/Utilities/DockerContextExtensions.cs

@@ -49,8 +49,8 @@ public static void DockerBuildImage(this BuildContextBase context, DockerImage d
         var tags = context.GetDockerTags(dockerImage, arch);
 
         var suffix = arch.ToSuffix();
-        var imageSuffix = $"({distro}-{context.Version.NugetVersion}-{targetFramework}-{arch.ToSuffix()})";
-        var baseNameSuffix = $"{registry}/{Constants.DockerBaseImageName}:{distro}-runtime-{targetFramework}-{arch.ToSuffix()}";
+        var imageSuffix = $"({distro}-{context.Version.NugetVersion}-{targetFramework}-{suffix})";
+        var baseNameSuffix = $"{registry}/{Constants.DockerBaseImageName}:{distro}-runtime-{targetFramework}-{suffix}";
         var description = $"org.opencontainers.image.description=GitVersion images {imageSuffix}";
         var baseName = $"org.opencontainers.image.base.name={baseNameSuffix}";
         var version = $"org.opencontainers.image.version={context.Version.NugetVersion}";
@@ -68,7 +68,7 @@ public static void DockerBuildImage(this BuildContextBase context, DockerImage d
             File = workDir.CombineWithFilePath("Dockerfile").FullPath,
             BuildArg =
             [
-                "contentFolder=/content",
+                "nugetFolder=/nuget",
                 $"REGISTRY={registry}",
                 $"DOTNET_VERSION={targetFramework}",
                 $"DISTRO={distro}",

build/docker/Dockerfile

@@ -1,14 +1,14 @@
 ARG REGISTRY='docker.io'
-ARG DISTRO='debian-11'
+ARG DISTRO='debian.11'
 ARG DOTNET_VERSION='6.0'
 ARG VERSION='5.12.0'
 
 FROM $REGISTRY/gittools/build-images:$DISTRO-sdk-$DOTNET_VERSION as installer
-ARG contentFolder
+ARG nugetFolder
 ARG VERSION
 
-WORKDIR /app
-COPY $contentFolder/ ./
+WORKDIR /nuget
+COPY $nugetFolder/ ./
 RUN dotnet tool install GitVersion.Tool --version $VERSION --tool-path /tools --add-source .
 
 FROM $REGISTRY/gittools/build-images:$DISTRO-runtime-$DOTNET_VERSION

build/docker/Tasks/DockerBuild.cs

@@ -21,7 +21,7 @@ public override bool ShouldRun(BuildContext context)
     public override void Run(BuildContext context)
     {
         var tool = Paths.Nuget.CombineWithFilePath("GitVersion.Tool*");
-        var dest = Paths.Build.Combine("docker").Combine("content");
+        var dest = Paths.Build.Combine("docker").Combine("nuget");
         context.EnsureDirectoryExists(dest);
         context.CopyFiles(tool.FullPath, dest);