root
/
buildah
mirror of https://github.com/containers/buildah.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

makeImageRef: pass in the whole CommitOptions structure 

Instead of passing in an increasing number of the fields of
CommitOptions to makeImageRef(), just pass the whole thing.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

Closes: #1539
Approved by: rhatdan
This commit is contained in:
Nalin Dahyabhai 2019-04-24 09:12:01 -04:00 committed by Atomic Bot
parent 39d98c2bbb
commit 5c068beb85
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commit.go
View File

@ -167,7 +167,7 @@ func (b *Builder) Commit(ctx context.Context, dest types.ImageReference, options
}
}
// Build an image reference from which we can copy the finished image.
src, err := b.makeImageRef(options.PreferredManifestType, exportBaseLayers, options.Squash, options.BlobDirectory, options.Compression, options.HistoryTimestamp, options.OmitTimestamp)
src, err := b.makeImageRef(options, exportBaseLayers)
if err != nil {
return imgID, nil, "", errors.Wrapf(err, "error computing layer digests and building metadata for container %q", b.ContainerID)
}

15
image.go
View File

@ -636,7 +636,7 @@ func (i *containerImageSource) GetBlob(ctx context.Context, blob types.BlobInfo,
return ioutils.NewReadCloserWrapper(layerFile, closer), size, nil
}
func (b *Builder) makeImageRef(manifestType string, exporting bool, squash bool, blobDirectory string, compress archive.Compression, historyTimestamp *time.Time, omitTimestamp bool) (types.ImageReference, error) {
func (b *Builder) makeImageRef(options CommitOptions, exporting bool) (types.ImageReference, error) {
var name reference.Named
container, err := b.store.Container(b.ContainerID)
if err != nil {
@ -647,6 +647,7 @@ func (b *Builder) makeImageRef(manifestType string, exporting bool, squash bool,
name = parsed
}
}
manifestType := options.PreferredManifestType
if manifestType == "" {
manifestType = OCIv1ImageManifest
}
@ -659,8 +660,8 @@ func (b *Builder) makeImageRef(manifestType string, exporting bool, squash bool,
return nil, errors.Wrapf(err, "error encoding docker-format image configuration %#v", b.Docker)
}
created := time.Now().UTC()
if historyTimestamp != nil {
created = historyTimestamp.UTC()
if options.HistoryTimestamp != nil {
created = options.HistoryTimestamp.UTC()
}
createdBy := b.CreatedBy()
if createdBy == "" {
@ -670,7 +671,7 @@ func (b *Builder) makeImageRef(manifestType string, exporting bool, squash bool,
}
}
if omitTimestamp {
if options.OmitTimestamp {
created = time.Unix(0, 0)
}
@ -684,7 +685,7 @@ func (b *Builder) makeImageRef(manifestType string, exporting bool, squash bool,
ref := &containerImageRef{
store: b.store,
compression: compress,
compression: options.Compression,
name: name,
names: container.Names,
containerID: container.ID,
@ -698,10 +699,10 @@ func (b *Builder) makeImageRef(manifestType string, exporting bool, squash bool,
annotations: b.Annotations(),
preferredManifestType: manifestType,
exporting: exporting,
squash: squash,
squash: options.Squash,
tarPath: b.tarPath(),
parent: parent,
blobDirectory: blobDirectory,
blobDirectory: options.BlobDirectory,
preEmptyLayers: b.PrependedEmptyLayers,
postEmptyLayers: b.AppendedEmptyLayers,
}