diff --git a/eng/Versions.props b/eng/Versions.props index 9d4c88ef..907af902 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,7 +5,7 @@ 0 - 2 + 3 0 $(MajorVersion).$(MinorVersion).$(PatchVersion) beta diff --git a/eng/docker-tools/CHANGELOG.md b/eng/docker-tools/CHANGELOG.md index aba13609..87cc5b8a 100644 --- a/eng/docker-tools/CHANGELOG.md +++ b/eng/docker-tools/CHANGELOG.md @@ -4,6 +4,22 @@ All breaking changes and new features in `eng/docker-tools` will be documented i --- +## 2026-03-06: ImageBuilder is now packaged as a .NET tool + +ImageBuilder is now packaged as a .NET tool. +The ImageBuilder executable has been renamed from `Microsoft.DotNet.ImageBuilder` to `imagebuilder`. + +**Changes:** +- ImageBuilder is now packaged as a .NET tool. +- The executable/assembly name has been changed from `Microsoft.DotNet.ImageBuilder` to `imagebuilder` +- The Windows staging folder name has been changed from `.Microsoft.DotNet.ImageBuilder` to `.imagebuilder` +- The ImageBuilder version has been updated to `0.3.0`. + +**Impact:** +- Any custom scripts referencing `Microsoft.DotNet.ImageBuilder.exe` or the `.Microsoft.DotNet.ImageBuilder/` folder must be updated to reference `imagebuilder.exe` and `.imagebuilder/` respectively. + +--- + ## 2026-03-04: Pre-build validation gated by `preBuildTestScriptPath` variable The `PreBuildValidation` job condition now checks the new `preBuildTestScriptPath` variable instead of `testScriptPath`. diff --git a/eng/pipelines/docker-tools-packages-official.yml b/eng/pipelines/docker-tools-packages-official.yml index 88a3462a..09e1670d 100644 --- a/eng/pipelines/docker-tools-packages-official.yml +++ b/eng/pipelines/docker-tools-packages-official.yml @@ -17,6 +17,7 @@ trigger: include: - eng/common/* - eng/pipelines/* + - src/ImageBuilder/* - src/ImageBuilder.Models/* - Directory.Build.props - Directory.Build.targets diff --git a/eng/pipelines/docker-tools-packages-pr.yml b/eng/pipelines/docker-tools-packages-pr.yml index c2c0848f..c32bc0e5 100644 --- a/eng/pipelines/docker-tools-packages-pr.yml +++ b/eng/pipelines/docker-tools-packages-pr.yml @@ -16,6 +16,7 @@ pr: include: - eng/common/* - eng/pipelines/* + - src/ImageBuilder/* - src/ImageBuilder.Models/* - Directory.Build.props - Directory.Build.targets diff --git a/src/Dockerfile.linux b/src/Dockerfile.linux index ae829141..b938ee96 100644 --- a/src/Dockerfile.linux +++ b/src/Dockerfile.linux @@ -50,4 +50,4 @@ COPY ["notation-trust/policies/", "/notation-trust/policies/"] WORKDIR /image-builder COPY --from=build-env /image-builder/out ./ -ENTRYPOINT ["/image-builder/Microsoft.DotNet.ImageBuilder"] +ENTRYPOINT ["/image-builder/imagebuilder"] diff --git a/src/Dockerfile.windows b/src/Dockerfile.windows index ac395518..e5578c4f 100644 --- a/src/Dockerfile.windows +++ b/src/Dockerfile.windows @@ -26,4 +26,4 @@ FROM mcr.microsoft.com/windows/$WINDOWS_BASE WORKDIR /image-builder COPY --from=build-env /image-builder/out ./ -ENTRYPOINT ["/image-builder/Microsoft.DotNet.ImageBuilder"] +ENTRYPOINT ["/image-builder/imagebuilder"] diff --git a/src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj b/src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj index ff5df7d5..16bdb0cc 100644 --- a/src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj +++ b/src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj @@ -2,6 +2,7 @@ Exe + imagebuilder False net9.0 Microsoft.DotNet.ImageBuilder @@ -12,6 +13,14 @@ enable + + true + true + imagebuilder + Microsoft.DotNet.ImageBuilder + CLI tool that orchestrates Docker image builds. + + false