Skip to content

Commit 4691278

Browse files
Name registry in progress messages (#233)
This is cheap to implement and provides (me, at least) a bit more reassurance that things are going to the right place.
1 parent 6b163ab commit 4691278

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

Microsoft.NET.Build.Containers/Registry.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ public record struct Registry(Uri BaseUri)
1717
private const string DockerManifestV2 = "application/vnd.docker.distribution.manifest.v2+json";
1818
private const string DockerContainerV1 = "application/vnd.docker.container.image.v1+json";
1919

20+
private string RegistryName { get; } = BaseUri.Host;
21+
2022
public async Task<Image> GetImageManifest(string name, string reference)
2123
{
2224
using HttpClient client = GetClient();
@@ -181,7 +183,7 @@ public async Task Push(Image x, string name, string? tag, string baseName, Actio
181183
var reg = this;
182184
await Task.WhenAll(x.LayerDescriptors.Select(async descriptor => {
183185
string digest = descriptor.Digest;
184-
logProgressMessage($"Uploading layer {digest} to registry");
186+
logProgressMessage($"Uploading layer {digest} to {reg.RegistryName}");
185187
if (await reg.BlobAlreadyUploaded(name, digest, client))
186188
{
187189
logProgressMessage($"Layer {digest} already existed");
@@ -204,7 +206,7 @@ await Task.WhenAll(x.LayerDescriptors.Select(async descriptor => {
204206
await x.originatingRegistry.Value.DownloadBlob(x.OriginatingName, descriptor);
205207
// Then push it to the destination registry
206208
await reg.Push(Layer.FromDescriptor(descriptor), name, logProgressMessage);
207-
logProgressMessage($"Finished uploading layer {digest} to registry");
209+
logProgressMessage($"Finished uploading layer {digest} to {reg.RegistryName}");
208210
}
209211
}));
210212

@@ -217,7 +219,7 @@ await Task.WhenAll(x.LayerDescriptors.Select(async descriptor => {
217219
}
218220

219221
var manifestDigest = x.GetDigest(x.manifest);
220-
logProgressMessage($"Uploading manifest to registry at blob {manifestDigest}");
222+
logProgressMessage($"Uploading manifest to {RegistryName} as blob {manifestDigest}");
221223
string jsonString = x.manifest.ToJsonString();
222224
HttpContent manifestUploadContent = new StringContent(jsonString);
223225
manifestUploadContent.Headers.ContentType = new MediaTypeHeaderValue(DockerManifestV2);
@@ -227,16 +229,16 @@ await Task.WhenAll(x.LayerDescriptors.Select(async descriptor => {
227229
{
228230
throw new ContainerHttpException("Registry push failed.", putResponse.RequestMessage?.RequestUri?.ToString(), jsonString);
229231
}
230-
logProgressMessage($"Uploaded manifest to registry");
232+
logProgressMessage($"Uploaded manifest to {RegistryName}");
231233

232-
logProgressMessage($"Uploading tag {tag} to registry");
234+
logProgressMessage($"Uploading tag {tag} to {RegistryName}");
233235
var putResponse2 = await client.PutAsync(new Uri(BaseUri, $"/v2/{name}/manifests/{tag}"), manifestUploadContent);
234236

235237
if (!putResponse2.IsSuccessStatusCode)
236238
{
237239
throw new ContainerHttpException("Registry push failed.", putResponse2.RequestMessage?.RequestUri?.ToString(), jsonString);
238240
}
239241

240-
logProgressMessage($"Uploaded tag to registry");
242+
logProgressMessage($"Uploaded tag {tag} to {RegistryName}");
241243
}
242244
}

0 commit comments

Comments
 (0)