Skip to content

Commit da94f40

Browse files
committed
add BaseImageDigest param to CreateImageIndex task
1 parent d4b3ed3 commit da94f40

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net9.0/PublicAPI.Unshipped.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.BaseImageName.get -> strin
2525
Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.BaseImageName.set -> void
2626
Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.BaseImageTag.get -> string!
2727
Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.BaseImageTag.set -> void
28+
Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.BaseImageDigest.get -> string!
29+
Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.BaseImageDigest.set -> void
2830
Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.ArchiveOutputPath.get -> string!
2931
Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.ArchiveOutputPath.set -> void
3032
Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.LocalRegistry.get -> string!

src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,14 @@ partial class CreateImageIndex
2525
/// The base image tag.
2626
/// Ex: 6.0
2727
/// </summary>
28-
[Required]
2928
public string BaseImageTag { get; set; }
3029

30+
/// <summary>
31+
/// The base image digest.
32+
/// Ex: sha256:12345...
33+
/// </summary>
34+
public string BaseImageDigest { get; set; }
35+
3136
/// <summary>
3237
/// Manifests to include in the image index.
3338
/// </summary>
@@ -78,6 +83,7 @@ public CreateImageIndex()
7883
BaseRegistry = string.Empty;
7984
BaseImageName = string.Empty;
8085
BaseImageTag = string.Empty;
86+
BaseImageDigest = string.Empty;
8187
GeneratedContainers = Array.Empty<ITaskItem>();
8288
OutputRegistry = string.Empty;
8389
ArchiveOutputPath = string.Empty;

src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
5858

5959
RegistryMode sourceRegistryMode = BaseRegistry.Equals(OutputRegistry, StringComparison.InvariantCultureIgnoreCase) ? RegistryMode.PullFromOutput : RegistryMode.Pull;
6060
Registry? sourceRegistry = IsLocalPull ? null : new Registry(BaseRegistry, logger, sourceRegistryMode);
61-
SourceImageReference sourceImageReference = new(sourceRegistry, BaseImageName, BaseImageTag);
61+
SourceImageReference sourceImageReference = new(sourceRegistry, BaseImageName, BaseImageTag, BaseImageDigest);
6262

6363
DestinationImageReference destinationImageReference = DestinationImageReference.CreateFromSettings(
6464
Repository,

src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@
322322
ContainerBaseRegistry=$(ContainerBaseRegistry);
323323
ContainerBaseName=$(ContainerBaseName);
324324
ContainerBaseTag=$(ContainerBaseTag);
325+
ContainerBaseDigest=$(ContainerBaseDigest);
325326
ContainerRegistry=$(ContainerRegistry);
326327
_ContainerImageTags=@(ContainerImageTags, ';');
327328
ContainerRepository=$(ContainerRepository);
@@ -359,7 +360,8 @@
359360
ImageTags="@(ContainerImageTags)"
360361
BaseRegistry="$(ContainerBaseRegistry)"
361362
BaseImageName="$(ContainerBaseName)"
362-
BaseImageTag="$(ContainerBaseTag)">
363+
BaseImageTag="$(ContainerBaseTag)"
364+
BaseImageDigest="$(ContainerBaseDigest)">
363365
<Output TaskParameter="GeneratedImageIndex" PropertyName="GeneratedImageIndex" />
364366
<Output TaskParameter="GeneratedArchiveOutputPath" PropertyName="GeneratedArchiveOutputPath" />
365367
</CreateImageIndex>

0 commit comments

Comments
 (0)