github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add media type to export stream

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2022-10-04 15:34:45 -07:00
parent 52341a2343
commit 0762a3a759
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/transfer/archive/exporter.go
View File

@@ -34,20 +34,22 @@ func init() {
plugins.Register(&transfertypes.ImageImportStream{}, &ImageImportStream{})
}
// NewImageImportStream returns a image importer via tar stream
// TODO: Add import options
func NewImageExportStream(stream io.WriteCloser) *ImageExportStream {
// NewImageExportStream returns a image importer via tar stream
// TODO: Add export options
func NewImageExportStream(stream io.WriteCloser, mediaType string) *ImageExportStream {
return &ImageExportStream{
stream: stream,
stream: stream,
mediaType: mediaType,
}
}
type ImageExportStream struct {
stream io.WriteCloser
stream io.WriteCloser
mediaType string
}
func (iis *ImageExportStream) ExportStream(context.Context) (io.WriteCloser, error) {
return iis.stream, nil
func (iis *ImageExportStream) ExportStream(context.Context) (io.WriteCloser, string, error) {
return iis.stream, iis.mediaType, nil
}
func (iis *ImageExportStream) MarshalAny(ctx context.Context, sm streaming.StreamCreator) (typeurl.Any, error) {
@@ -66,7 +68,8 @@ func (iis *ImageExportStream) MarshalAny(ctx context.Context, sm streaming.Strea
}()
s := &transfertypes.ImageExportStream{
Stream: sid,
Stream: sid,
MediaType: iis.mediaType,
}
return typeurl.MarshalAny(s)
@@ -85,6 +88,7 @@ func (iis *ImageExportStream) UnmarshalAny(ctx context.Context, sm streaming.Str
}
iis.stream = tstreaming.WriteByteStream(ctx, stream)
iis.mediaType = s.MediaType
return nil
}