@@ -17,6 +17,8 @@ public record struct Registry(Uri BaseUri)
17
17
private const string DockerManifestV2 = "application/vnd.docker.distribution.manifest.v2+json" ;
18
18
private const string DockerContainerV1 = "application/vnd.docker.container.image.v1+json" ;
19
19
20
+ private string RegistryName { get ; } = BaseUri . Host ;
21
+
20
22
public async Task < Image > GetImageManifest ( string name , string reference )
21
23
{
22
24
using HttpClient client = GetClient ( ) ;
@@ -181,7 +183,7 @@ public async Task Push(Image x, string name, string? tag, string baseName, Actio
181
183
var reg = this ;
182
184
await Task . WhenAll ( x . LayerDescriptors . Select ( async descriptor => {
183
185
string digest = descriptor . Digest ;
184
- logProgressMessage ( $ "Uploading layer { digest } to registry ") ;
186
+ logProgressMessage ( $ "Uploading layer { digest } to { reg . RegistryName } ") ;
185
187
if ( await reg . BlobAlreadyUploaded ( name , digest , client ) )
186
188
{
187
189
logProgressMessage ( $ "Layer { digest } already existed") ;
@@ -204,7 +206,7 @@ await Task.WhenAll(x.LayerDescriptors.Select(async descriptor => {
204
206
await x . originatingRegistry . Value . DownloadBlob ( x . OriginatingName , descriptor ) ;
205
207
// Then push it to the destination registry
206
208
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 } ") ;
208
210
}
209
211
} ) ) ;
210
212
@@ -217,7 +219,7 @@ await Task.WhenAll(x.LayerDescriptors.Select(async descriptor => {
217
219
}
218
220
219
221
var manifestDigest = x . GetDigest ( x . manifest ) ;
220
- logProgressMessage ( $ "Uploading manifest to registry at blob { manifestDigest } ") ;
222
+ logProgressMessage ( $ "Uploading manifest to { RegistryName } as blob { manifestDigest } ") ;
221
223
string jsonString = x . manifest . ToJsonString ( ) ;
222
224
HttpContent manifestUploadContent = new StringContent ( jsonString ) ;
223
225
manifestUploadContent . Headers . ContentType = new MediaTypeHeaderValue ( DockerManifestV2 ) ;
@@ -227,16 +229,16 @@ await Task.WhenAll(x.LayerDescriptors.Select(async descriptor => {
227
229
{
228
230
throw new ContainerHttpException ( "Registry push failed." , putResponse . RequestMessage ? . RequestUri ? . ToString ( ) , jsonString ) ;
229
231
}
230
- logProgressMessage ( $ "Uploaded manifest to registry ") ;
232
+ logProgressMessage ( $ "Uploaded manifest to { RegistryName } ") ;
231
233
232
- logProgressMessage ( $ "Uploading tag { tag } to registry ") ;
234
+ logProgressMessage ( $ "Uploading tag { tag } to { RegistryName } ") ;
233
235
var putResponse2 = await client . PutAsync ( new Uri ( BaseUri , $ "/v2/{ name } /manifests/{ tag } ") , manifestUploadContent ) ;
234
236
235
237
if ( ! putResponse2 . IsSuccessStatusCode )
236
238
{
237
239
throw new ContainerHttpException ( "Registry push failed." , putResponse2 . RequestMessage ? . RequestUri ? . ToString ( ) , jsonString ) ;
238
240
}
239
241
240
- logProgressMessage ( $ "Uploaded tag to registry ") ;
242
+ logProgressMessage ( $ "Uploaded tag { tag } to { RegistryName } ") ;
241
243
}
242
244
}
0 commit comments