Skip to content

Pack ImageBuilder as dotnet tool #2007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lbussell merged 7 commits into from
Mar 18, 2026
Merged

Pack ImageBuilder as dotnet tool #2007

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b71e495
Package ImageBuilder as dotnet tool
lbussell Mar 6, 2026
ccef31d
Bump version to 0.3.0
lbussell Mar 6, 2026
e39d613
Update CHANGELOG
lbussell Mar 6, 2026
0a7dc1b
Un-set AssemblyName
lbussell Mar 11, 2026
13f1ff7
Merge remote-tracking branch 'upstream/main' into pack-as-tool
lbussell Mar 17, 2026
86f33e8
Remove changelog entry for ImageBuilder .NET tool
lbussell Mar 18, 2026
f1301d6
Merge branch 'main' into pack-as-tool
lbussell Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PropertyGroup>
<!-- Follow https://semver.org/spec/v2.0.0.html -->
<MajorVersion>0</MajorVersion>
<MinorVersion>2</MinorVersion>
<MinorVersion>3</MinorVersion>
<PatchVersion>0</PatchVersion>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
Expand Down
16 changes: 16 additions & 0 deletions eng/docker-tools/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/docker-tools-packages-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ trigger:
include:
- eng/common/*
- eng/pipelines/*
- src/ImageBuilder/*
- src/ImageBuilder.Models/*
- Directory.Build.props
- Directory.Build.targets
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/docker-tools-packages-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ pr:
include:
- eng/common/*
- eng/pipelines/*
- src/ImageBuilder/*
- src/ImageBuilder.Models/*
- Directory.Build.props
- Directory.Build.targets
Expand Down
2 changes: 1 addition & 1 deletion src/Dockerfile.linux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion src/Dockerfile.windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
9 changes: 9 additions & 0 deletions src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<AssemblyName>imagebuilder</AssemblyName>
Comment thread
lbussell marked this conversation as resolved.
Outdated
<PublishTrimmed>False</PublishTrimmed>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>Microsoft.DotNet.ImageBuilder</RootNamespace>
Expand All @@ -12,6 +13,14 @@
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup Label="Tool Packaging">
<IsPackable>true</IsPackable>
<PackAsTool>true</PackAsTool>
<ToolCommandName>imagebuilder</ToolCommandName>
<PackageId>Microsoft.DotNet.ImageBuilder</PackageId>
<Description>CLI tool that orchestrates Docker image builds.</Description>
</PropertyGroup>

<PropertyGroup>
<!-- The "Cottle" templating package does not have a strong name. -->
<SignAssembly>false</SignAssembly>
Expand Down
Loading