2017-02-11 00:48:15 +08:00
|
|
|
package buildah
|
2017-01-27 00:58:00 +08:00
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
2017-10-10 03:05:56 +08:00
|
|
|
"context"
|
2017-01-27 00:58:00 +08:00
|
|
|
"encoding/json"
|
2018-05-22 05:02:50 +08:00
|
|
|
"fmt"
|
2017-01-27 00:58:00 +08:00
|
|
|
"io"
|
|
|
|
"io/ioutil"
|
|
|
|
"os"
|
|
|
|
"path/filepath"
|
2017-01-27 22:38:32 +08:00
|
|
|
"time"
|
2017-01-27 00:58:00 +08:00
|
|
|
|
2018-09-18 03:20:16 +08:00
|
|
|
"github.com/containers/buildah/docker"
|
2017-01-27 00:58:00 +08:00
|
|
|
"github.com/containers/image/docker/reference"
|
|
|
|
"github.com/containers/image/image"
|
2018-07-19 07:49:56 +08:00
|
|
|
"github.com/containers/image/manifest"
|
2017-01-27 00:58:00 +08:00
|
|
|
is "github.com/containers/image/storage"
|
|
|
|
"github.com/containers/image/types"
|
2017-05-17 23:53:28 +08:00
|
|
|
"github.com/containers/storage"
|
2017-01-27 00:58:00 +08:00
|
|
|
"github.com/containers/storage/pkg/archive"
|
|
|
|
"github.com/containers/storage/pkg/ioutils"
|
|
|
|
digest "github.com/opencontainers/go-digest"
|
|
|
|
specs "github.com/opencontainers/image-spec/specs-go"
|
|
|
|
"github.com/opencontainers/image-spec/specs-go/v1"
|
2017-06-02 03:23:02 +08:00
|
|
|
"github.com/pkg/errors"
|
2017-10-10 03:05:56 +08:00
|
|
|
"github.com/sirupsen/logrus"
|
2017-01-27 00:58:00 +08:00
|
|
|
)
|
|
|
|
|
2017-05-18 05:02:40 +08:00
|
|
|
const (
|
|
|
|
// OCIv1ImageManifest is the MIME type of an OCIv1 image manifest,
|
|
|
|
// suitable for specifying as a value of the PreferredManifestType
|
|
|
|
// member of a CommitOptions structure. It is also the default.
|
|
|
|
OCIv1ImageManifest = v1.MediaTypeImageManifest
|
|
|
|
// Dockerv2ImageManifest is the MIME type of a Docker v2s2 image
|
|
|
|
// manifest, suitable for specifying as a value of the
|
|
|
|
// PreferredManifestType member of a CommitOptions structure.
|
2018-07-19 07:49:56 +08:00
|
|
|
Dockerv2ImageManifest = manifest.DockerV2Schema2MediaType
|
2017-05-18 05:02:40 +08:00
|
|
|
)
|
|
|
|
|
2017-01-27 00:58:00 +08:00
|
|
|
type containerImageRef struct {
|
2017-05-18 05:02:40 +08:00
|
|
|
store storage.Store
|
|
|
|
compression archive.Compression
|
|
|
|
name reference.Named
|
2017-06-02 00:09:23 +08:00
|
|
|
names []string
|
2018-05-22 05:02:50 +08:00
|
|
|
containerID string
|
|
|
|
mountLabel string
|
2017-06-02 00:09:23 +08:00
|
|
|
layerID string
|
2017-05-18 05:02:40 +08:00
|
|
|
oconfig []byte
|
|
|
|
dconfig []byte
|
2017-06-01 01:44:41 +08:00
|
|
|
created time.Time
|
2017-05-18 05:02:40 +08:00
|
|
|
createdBy string
|
2018-04-27 22:59:03 +08:00
|
|
|
historyComment string
|
2017-05-18 05:02:40 +08:00
|
|
|
annotations map[string]string
|
|
|
|
preferredManifestType string
|
Take a shortcut when writing to local storage
When writing to local storage, take a couple of shortcuts: instead of
recompressing layers to ensure that the values we store in the image
manifest will be correct for content-addressibility, just pretend that
the layer ID is a blob hash value, and that it's a valid layer diffID.
Local storage doesn't generally care if these values are correct, and we
already have to recompute these values when exporting an image, but this
saves us quite a bit of time.
The image library's Copy() routine actually cares about and
sanity-checks these things, so if we're going to take advantage of the
shortcuts, we need to use its higher-level APIs to write a layer, write
the configuration, and write the manifest, then move those items that it
writes to an image with the right set of layers.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Closes: #141
Approved by: rhatdan
2017-06-01 01:56:25 +08:00
|
|
|
exporting bool
|
2018-05-22 05:02:50 +08:00
|
|
|
squash bool
|
2018-03-17 05:19:29 +08:00
|
|
|
tarPath func(path string) (io.ReadCloser, error)
|
2018-06-09 00:55:46 +08:00
|
|
|
parent string
|
2018-10-18 06:06:16 +08:00
|
|
|
blobDirectory string
|
2019-01-19 04:39:58 +08:00
|
|
|
preEmptyLayers []v1.History
|
|
|
|
postEmptyLayers []v1.History
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
type containerImageSource struct {
|
2018-10-18 06:06:16 +08:00
|
|
|
path string
|
|
|
|
ref *containerImageRef
|
|
|
|
store storage.Store
|
|
|
|
containerID string
|
|
|
|
mountLabel string
|
|
|
|
layerID string
|
|
|
|
names []string
|
|
|
|
compression archive.Compression
|
|
|
|
config []byte
|
|
|
|
configDigest digest.Digest
|
|
|
|
manifest []byte
|
|
|
|
manifestType string
|
|
|
|
exporting bool
|
|
|
|
blobDirectory string
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
|
|
|
|
2018-04-12 22:20:36 +08:00
|
|
|
func (i *containerImageRef) NewImage(ctx context.Context, sc *types.SystemContext) (types.ImageCloser, error) {
|
|
|
|
src, err := i.NewImageSource(ctx, sc)
|
2017-01-27 00:58:00 +08:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2018-04-12 22:20:36 +08:00
|
|
|
return image.FromSource(ctx, sc, src)
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
|
|
|
|
2018-01-05 07:05:40 +08:00
|
|
|
func expectedOCIDiffIDs(image v1.Image) int {
|
|
|
|
expected := 0
|
|
|
|
for _, history := range image.History {
|
|
|
|
if !history.EmptyLayer {
|
|
|
|
expected = expected + 1
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return expected
|
|
|
|
}
|
|
|
|
|
|
|
|
func expectedDockerDiffIDs(image docker.V2Image) int {
|
|
|
|
expected := 0
|
|
|
|
for _, history := range image.History {
|
|
|
|
if !history.EmptyLayer {
|
|
|
|
expected = expected + 1
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return expected
|
|
|
|
}
|
|
|
|
|
2018-05-22 05:02:50 +08:00
|
|
|
// Compute the media types which we need to attach to a layer, given the type of
|
|
|
|
// compression that we'll be applying.
|
2018-10-18 06:06:16 +08:00
|
|
|
func computeLayerMIMEType(what string, layerCompression archive.Compression) (omediaType, dmediaType string, err error) {
|
2018-05-22 05:02:50 +08:00
|
|
|
omediaType = v1.MediaTypeImageLayer
|
|
|
|
dmediaType = docker.V2S2MediaTypeUncompressedLayer
|
2018-10-18 06:06:16 +08:00
|
|
|
if layerCompression != archive.Uncompressed {
|
|
|
|
switch layerCompression {
|
2018-05-22 05:02:50 +08:00
|
|
|
case archive.Gzip:
|
|
|
|
omediaType = v1.MediaTypeImageLayerGzip
|
2018-07-19 07:49:56 +08:00
|
|
|
dmediaType = manifest.DockerV2Schema2LayerMediaType
|
2018-05-22 05:02:50 +08:00
|
|
|
logrus.Debugf("compressing %s with gzip", what)
|
|
|
|
case archive.Bzip2:
|
|
|
|
// Until the image specs define a media type for bzip2-compressed layers, even if we know
|
|
|
|
// how to decompress them, we can't try to compress layers with bzip2.
|
|
|
|
return "", "", errors.New("media type for bzip2-compressed layers is not defined")
|
|
|
|
case archive.Xz:
|
|
|
|
// Until the image specs define a media type for xz-compressed layers, even if we know
|
|
|
|
// how to decompress them, we can't try to compress layers with xz.
|
|
|
|
return "", "", errors.New("media type for xz-compressed layers is not defined")
|
|
|
|
default:
|
|
|
|
logrus.Debugf("compressing %s with unknown compressor(?)", what)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return omediaType, dmediaType, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Extract the container's whole filesystem as if it were a single layer.
|
|
|
|
func (i *containerImageRef) extractRootfs() (io.ReadCloser, error) {
|
|
|
|
mountPoint, err := i.store.Mount(i.containerID, i.mountLabel)
|
|
|
|
if err != nil {
|
2018-10-03 22:05:46 +08:00
|
|
|
return nil, errors.Wrapf(err, "error mounting container %q", i.containerID)
|
2018-05-22 05:02:50 +08:00
|
|
|
}
|
2018-03-17 05:19:29 +08:00
|
|
|
rc, err := i.tarPath(mountPoint)
|
2018-05-22 05:02:50 +08:00
|
|
|
if err != nil {
|
2018-10-03 22:05:46 +08:00
|
|
|
return nil, errors.Wrapf(err, "error extracting rootfs from container %q", i.containerID)
|
2018-05-22 05:02:50 +08:00
|
|
|
}
|
|
|
|
return ioutils.NewReadCloserWrapper(rc, func() error {
|
2018-10-03 22:05:46 +08:00
|
|
|
if err = rc.Close(); err != nil {
|
2018-05-22 05:02:50 +08:00
|
|
|
err = errors.Wrapf(err, "error closing tar archive of container %q", i.containerID)
|
|
|
|
}
|
2018-07-18 23:49:09 +08:00
|
|
|
if _, err2 := i.store.Unmount(i.containerID, false); err == nil {
|
2018-05-22 05:02:50 +08:00
|
|
|
if err2 != nil {
|
|
|
|
err2 = errors.Wrapf(err2, "error unmounting container %q", i.containerID)
|
|
|
|
}
|
|
|
|
err = err2
|
|
|
|
}
|
|
|
|
return err
|
|
|
|
}), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Build fresh copies of the container configuration structures so that we can edit them
|
|
|
|
// without making unintended changes to the original Builder.
|
|
|
|
func (i *containerImageRef) createConfigsAndManifests() (v1.Image, v1.Manifest, docker.V2Image, docker.V2S2Manifest, error) {
|
|
|
|
created := i.created
|
|
|
|
|
|
|
|
// Build an empty image, and then decode over it.
|
|
|
|
oimage := v1.Image{}
|
|
|
|
if err := json.Unmarshal(i.oconfig, &oimage); err != nil {
|
|
|
|
return v1.Image{}, v1.Manifest{}, docker.V2Image{}, docker.V2S2Manifest{}, err
|
|
|
|
}
|
|
|
|
// Always replace this value, since we're newer than our base image.
|
|
|
|
oimage.Created = &created
|
|
|
|
// Clear the list of diffIDs, since we always repopulate it.
|
|
|
|
oimage.RootFS.Type = docker.TypeLayers
|
|
|
|
oimage.RootFS.DiffIDs = []digest.Digest{}
|
|
|
|
// Only clear the history if we're squashing, otherwise leave it be so that we can append
|
|
|
|
// entries to it.
|
|
|
|
if i.squash {
|
|
|
|
oimage.History = []v1.History{}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Build an empty image, and then decode over it.
|
|
|
|
dimage := docker.V2Image{}
|
|
|
|
if err := json.Unmarshal(i.dconfig, &dimage); err != nil {
|
|
|
|
return v1.Image{}, v1.Manifest{}, docker.V2Image{}, docker.V2S2Manifest{}, err
|
|
|
|
}
|
2018-06-09 00:55:46 +08:00
|
|
|
dimage.Parent = docker.ID(digest.FromString(i.parent))
|
2018-05-22 05:02:50 +08:00
|
|
|
// Always replace this value, since we're newer than our base image.
|
|
|
|
dimage.Created = created
|
|
|
|
// Clear the list of diffIDs, since we always repopulate it.
|
|
|
|
dimage.RootFS = &docker.V2S2RootFS{}
|
|
|
|
dimage.RootFS.Type = docker.TypeLayers
|
|
|
|
dimage.RootFS.DiffIDs = []digest.Digest{}
|
|
|
|
// Only clear the history if we're squashing, otherwise leave it be so that we can append
|
|
|
|
// entries to it.
|
|
|
|
if i.squash {
|
|
|
|
dimage.History = []docker.V2S2History{}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Build empty manifests. The Layers lists will be populated later.
|
|
|
|
omanifest := v1.Manifest{
|
|
|
|
Versioned: specs.Versioned{
|
|
|
|
SchemaVersion: 2,
|
|
|
|
},
|
|
|
|
Config: v1.Descriptor{
|
|
|
|
MediaType: v1.MediaTypeImageConfig,
|
|
|
|
},
|
|
|
|
Layers: []v1.Descriptor{},
|
|
|
|
Annotations: i.annotations,
|
|
|
|
}
|
|
|
|
|
|
|
|
dmanifest := docker.V2S2Manifest{
|
|
|
|
V2Versioned: docker.V2Versioned{
|
|
|
|
SchemaVersion: 2,
|
2018-07-19 07:49:56 +08:00
|
|
|
MediaType: manifest.DockerV2Schema2MediaType,
|
2018-05-22 05:02:50 +08:00
|
|
|
},
|
|
|
|
Config: docker.V2S2Descriptor{
|
2018-07-19 07:49:56 +08:00
|
|
|
MediaType: manifest.DockerV2Schema2ConfigMediaType,
|
2018-05-22 05:02:50 +08:00
|
|
|
},
|
|
|
|
Layers: []docker.V2S2Descriptor{},
|
|
|
|
}
|
|
|
|
|
|
|
|
return oimage, omanifest, dimage, dmanifest, nil
|
|
|
|
}
|
|
|
|
|
2018-04-12 22:20:36 +08:00
|
|
|
func (i *containerImageRef) NewImageSource(ctx context.Context, sc *types.SystemContext) (src types.ImageSource, err error) {
|
2017-06-02 00:09:23 +08:00
|
|
|
// Decide which type of manifest and configuration output we're going to provide.
|
2017-10-10 03:05:56 +08:00
|
|
|
manifestType := i.preferredManifestType
|
2017-05-18 05:01:06 +08:00
|
|
|
// If it's not a format we support, return an error.
|
2018-07-19 07:49:56 +08:00
|
|
|
if manifestType != v1.MediaTypeImageManifest && manifestType != manifest.DockerV2Schema2MediaType {
|
2017-06-03 00:17:27 +08:00
|
|
|
return nil, errors.Errorf("no supported manifest types (attempted to use %q, only know %q and %q)",
|
2018-07-19 07:49:56 +08:00
|
|
|
manifestType, v1.MediaTypeImageManifest, manifest.DockerV2Schema2MediaType)
|
2017-05-18 05:01:06 +08:00
|
|
|
}
|
2017-06-01 01:44:41 +08:00
|
|
|
// Start building the list of layers using the read-write layer.
|
2017-01-27 00:58:00 +08:00
|
|
|
layers := []string{}
|
2017-06-02 00:09:23 +08:00
|
|
|
layerID := i.layerID
|
2017-05-17 23:53:28 +08:00
|
|
|
layer, err := i.store.Layer(layerID)
|
2017-01-27 00:58:00 +08:00
|
|
|
if err != nil {
|
2017-06-02 03:23:02 +08:00
|
|
|
return nil, errors.Wrapf(err, "unable to read layer %q", layerID)
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
2018-05-22 05:02:50 +08:00
|
|
|
// Walk the list of parent layers, prepending each as we go. If we're squashing,
|
|
|
|
// stop at the layer ID of the top layer, which we won't really be using anyway.
|
2017-01-27 00:58:00 +08:00
|
|
|
for layer != nil {
|
|
|
|
layers = append(append([]string{}, layerID), layers...)
|
|
|
|
layerID = layer.Parent
|
2018-05-22 05:02:50 +08:00
|
|
|
if layerID == "" || i.squash {
|
2017-01-27 00:58:00 +08:00
|
|
|
err = nil
|
|
|
|
break
|
|
|
|
}
|
2017-05-17 23:53:28 +08:00
|
|
|
layer, err = i.store.Layer(layerID)
|
2017-01-27 00:58:00 +08:00
|
|
|
if err != nil {
|
2017-06-02 03:23:02 +08:00
|
|
|
return nil, errors.Wrapf(err, "unable to read layer %q", layerID)
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
|
|
|
}
|
2017-01-27 22:38:32 +08:00
|
|
|
logrus.Debugf("layer list: %q", layers)
|
|
|
|
|
2017-06-01 01:44:41 +08:00
|
|
|
// Make a temporary directory to hold blobs.
|
2017-01-27 19:28:12 +08:00
|
|
|
path, err := ioutil.TempDir(os.TempDir(), Package)
|
2017-01-27 00:58:00 +08:00
|
|
|
if err != nil {
|
2018-10-03 22:05:46 +08:00
|
|
|
return nil, errors.Wrapf(err, "error creating temporary directory to hold layer blobs")
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
2017-01-28 15:18:02 +08:00
|
|
|
logrus.Debugf("using %q to hold temporary data", path)
|
2017-01-27 00:58:00 +08:00
|
|
|
defer func() {
|
|
|
|
if src == nil {
|
|
|
|
err2 := os.RemoveAll(path)
|
|
|
|
if err2 != nil {
|
2018-10-03 22:05:46 +08:00
|
|
|
logrus.Errorf("error removing layer blob directory %q: %v", path, err)
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
2018-05-22 05:02:50 +08:00
|
|
|
// Build fresh copies of the configurations and manifest so that we don't mess with any
|
|
|
|
// values in the Builder object itself.
|
|
|
|
oimage, omanifest, dimage, dmanifest, err := i.createConfigsAndManifests()
|
2017-05-18 05:01:06 +08:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2017-01-27 22:38:32 +08:00
|
|
|
|
2017-06-01 01:44:41 +08:00
|
|
|
// Extract each layer and compute its digests, both compressed (if requested) and uncompressed.
|
2017-01-27 00:58:00 +08:00
|
|
|
for _, layerID := range layers {
|
2018-05-22 05:02:50 +08:00
|
|
|
what := fmt.Sprintf("layer %q", layerID)
|
|
|
|
if i.squash {
|
|
|
|
what = fmt.Sprintf("container %q", i.containerID)
|
|
|
|
}
|
2017-06-29 05:07:58 +08:00
|
|
|
// The default layer media type assumes no compression.
|
Take a shortcut when writing to local storage
When writing to local storage, take a couple of shortcuts: instead of
recompressing layers to ensure that the values we store in the image
manifest will be correct for content-addressibility, just pretend that
the layer ID is a blob hash value, and that it's a valid layer diffID.
Local storage doesn't generally care if these values are correct, and we
already have to recompute these values when exporting an image, but this
saves us quite a bit of time.
The image library's Copy() routine actually cares about and
sanity-checks these things, so if we're going to take advantage of the
shortcuts, we need to use its higher-level APIs to write a layer, write
the configuration, and write the manifest, then move those items that it
writes to an image with the right set of layers.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Closes: #141
Approved by: rhatdan
2017-06-01 01:56:25 +08:00
|
|
|
omediaType := v1.MediaTypeImageLayer
|
|
|
|
dmediaType := docker.V2S2MediaTypeUncompressedLayer
|
2018-10-18 06:06:16 +08:00
|
|
|
// Look up this layer.
|
|
|
|
layer, err := i.store.Layer(layerID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, errors.Wrapf(err, "unable to locate layer %q", layerID)
|
|
|
|
}
|
2018-05-22 05:02:50 +08:00
|
|
|
// If we're not re-exporting the data, and we're reusing layers individually, reuse
|
|
|
|
// the blobsum and diff IDs.
|
|
|
|
if !i.exporting && !i.squash && layerID != i.layerID {
|
2017-06-29 05:07:58 +08:00
|
|
|
if layer.UncompressedDigest == "" {
|
|
|
|
return nil, errors.Errorf("unable to look up size of layer %q", layerID)
|
|
|
|
}
|
|
|
|
layerBlobSum := layer.UncompressedDigest
|
|
|
|
layerBlobSize := layer.UncompressedSize
|
2018-10-18 06:06:16 +08:00
|
|
|
diffID := layer.UncompressedDigest
|
|
|
|
// Note this layer in the manifest, using the appropriate blobsum.
|
2017-06-29 05:07:58 +08:00
|
|
|
olayerDescriptor := v1.Descriptor{
|
|
|
|
MediaType: omediaType,
|
|
|
|
Digest: layerBlobSum,
|
|
|
|
Size: layerBlobSize,
|
|
|
|
}
|
|
|
|
omanifest.Layers = append(omanifest.Layers, olayerDescriptor)
|
|
|
|
dlayerDescriptor := docker.V2S2Descriptor{
|
|
|
|
MediaType: dmediaType,
|
|
|
|
Digest: layerBlobSum,
|
|
|
|
Size: layerBlobSize,
|
|
|
|
}
|
|
|
|
dmanifest.Layers = append(dmanifest.Layers, dlayerDescriptor)
|
2018-10-18 06:06:16 +08:00
|
|
|
// Note this layer in the list of diffIDs, again using the uncompressed digest.
|
|
|
|
oimage.RootFS.DiffIDs = append(oimage.RootFS.DiffIDs, diffID)
|
|
|
|
dimage.RootFS.DiffIDs = append(dimage.RootFS.DiffIDs, diffID)
|
2017-06-29 05:07:58 +08:00
|
|
|
continue
|
|
|
|
}
|
2018-10-18 06:06:16 +08:00
|
|
|
// Figure out if we need to change the media type, in case we've changed the compression.
|
|
|
|
omediaType, dmediaType, err = computeLayerMIMEType(what, i.compression)
|
2018-05-22 05:02:50 +08:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
Take a shortcut when writing to local storage
When writing to local storage, take a couple of shortcuts: instead of
recompressing layers to ensure that the values we store in the image
manifest will be correct for content-addressibility, just pretend that
the layer ID is a blob hash value, and that it's a valid layer diffID.
Local storage doesn't generally care if these values are correct, and we
already have to recompute these values when exporting an image, but this
saves us quite a bit of time.
The image library's Copy() routine actually cares about and
sanity-checks these things, so if we're going to take advantage of the
shortcuts, we need to use its higher-level APIs to write a layer, write
the configuration, and write the manifest, then move those items that it
writes to an image with the right set of layers.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Closes: #141
Approved by: rhatdan
2017-06-01 01:56:25 +08:00
|
|
|
}
|
2018-05-22 05:02:50 +08:00
|
|
|
// Start reading either the layer or the whole container rootfs.
|
2017-06-29 05:07:58 +08:00
|
|
|
noCompression := archive.Uncompressed
|
|
|
|
diffOptions := &storage.DiffOptions{
|
|
|
|
Compression: &noCompression,
|
|
|
|
}
|
2018-05-22 05:02:50 +08:00
|
|
|
var rc io.ReadCloser
|
|
|
|
if i.squash {
|
|
|
|
// Extract the root filesystem as a single layer.
|
|
|
|
rc, err = i.extractRootfs()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// Extract this layer, one of possibly many.
|
|
|
|
rc, err = i.store.Diff("", layerID, diffOptions)
|
|
|
|
if err != nil {
|
|
|
|
return nil, errors.Wrapf(err, "error extracting %s", what)
|
|
|
|
}
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
2017-01-28 15:18:02 +08:00
|
|
|
srcHasher := digest.Canonical.Digester()
|
2017-06-29 05:07:58 +08:00
|
|
|
reader := io.TeeReader(rc, srcHasher.Hash())
|
2017-06-01 01:44:41 +08:00
|
|
|
// Set up to write the possibly-recompressed blob.
|
2017-01-27 00:58:00 +08:00
|
|
|
layerFile, err := os.OpenFile(filepath.Join(path, "layer"), os.O_CREATE|os.O_WRONLY, 0600)
|
|
|
|
if err != nil {
|
2018-09-18 03:04:48 +08:00
|
|
|
rc.Close()
|
2018-05-22 05:02:50 +08:00
|
|
|
return nil, errors.Wrapf(err, "error opening file for %s", what)
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
2017-01-28 15:18:02 +08:00
|
|
|
destHasher := digest.Canonical.Digester()
|
|
|
|
counter := ioutils.NewWriteCounter(layerFile)
|
|
|
|
multiWriter := io.MultiWriter(counter, destHasher.Hash())
|
2017-06-29 05:07:58 +08:00
|
|
|
// Compress the layer, if we're recompressing it.
|
2017-06-01 01:44:41 +08:00
|
|
|
writer, err := archive.CompressStream(multiWriter, i.compression)
|
2017-01-28 15:18:02 +08:00
|
|
|
if err != nil {
|
2018-09-18 03:04:48 +08:00
|
|
|
layerFile.Close()
|
|
|
|
rc.Close()
|
2018-05-22 05:02:50 +08:00
|
|
|
return nil, errors.Wrapf(err, "error compressing %s", what)
|
2017-01-28 15:18:02 +08:00
|
|
|
}
|
2017-06-01 01:44:41 +08:00
|
|
|
size, err := io.Copy(writer, reader)
|
2018-09-18 03:04:48 +08:00
|
|
|
writer.Close()
|
|
|
|
layerFile.Close()
|
|
|
|
rc.Close()
|
2017-01-27 00:58:00 +08:00
|
|
|
if err != nil {
|
2018-05-22 05:02:50 +08:00
|
|
|
return nil, errors.Wrapf(err, "error storing %s to file", what)
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
2017-01-28 15:18:02 +08:00
|
|
|
if i.compression == archive.Uncompressed {
|
|
|
|
if size != counter.Count {
|
2018-05-22 05:02:50 +08:00
|
|
|
return nil, errors.Errorf("error storing %s to file: inconsistent layer size (copied %d, wrote %d)", what, size, counter.Count)
|
2017-01-28 15:18:02 +08:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
size = counter.Count
|
|
|
|
}
|
2018-05-22 05:02:50 +08:00
|
|
|
logrus.Debugf("%s size is %d bytes", what, size)
|
2017-06-01 01:44:41 +08:00
|
|
|
// Rename the layer so that we can more easily find it by digest later.
|
2018-10-18 06:06:16 +08:00
|
|
|
finalBlobName := filepath.Join(path, destHasher.Digest().String())
|
|
|
|
if err = os.Rename(filepath.Join(path, "layer"), finalBlobName); err != nil {
|
|
|
|
return nil, errors.Wrapf(err, "error storing %s to file while renaming %q to %q", what, filepath.Join(path, "layer"), finalBlobName)
|
2017-03-07 23:41:25 +08:00
|
|
|
}
|
2017-06-01 01:44:41 +08:00
|
|
|
// Add a note in the manifest about the layer. The blobs are identified by their possibly-
|
|
|
|
// compressed blob digests.
|
2017-05-18 05:01:06 +08:00
|
|
|
olayerDescriptor := v1.Descriptor{
|
|
|
|
MediaType: omediaType,
|
|
|
|
Digest: destHasher.Digest(),
|
|
|
|
Size: size,
|
|
|
|
}
|
|
|
|
omanifest.Layers = append(omanifest.Layers, olayerDescriptor)
|
|
|
|
dlayerDescriptor := docker.V2S2Descriptor{
|
|
|
|
MediaType: dmediaType,
|
2017-02-14 00:44:47 +08:00
|
|
|
Digest: destHasher.Digest(),
|
2017-01-27 00:58:00 +08:00
|
|
|
Size: size,
|
|
|
|
}
|
2017-05-18 05:01:06 +08:00
|
|
|
dmanifest.Layers = append(dmanifest.Layers, dlayerDescriptor)
|
2017-06-29 05:07:58 +08:00
|
|
|
// Add a note about the diffID, which is always the layer's uncompressed digest.
|
2017-06-28 23:40:28 +08:00
|
|
|
oimage.RootFS.DiffIDs = append(oimage.RootFS.DiffIDs, srcHasher.Digest())
|
2017-05-18 05:01:06 +08:00
|
|
|
dimage.RootFS.DiffIDs = append(dimage.RootFS.DiffIDs, srcHasher.Digest())
|
2017-01-27 22:38:32 +08:00
|
|
|
}
|
|
|
|
|
2017-06-29 05:07:58 +08:00
|
|
|
// Build history notes in the image configurations.
|
2019-01-19 04:39:58 +08:00
|
|
|
appendHistory := func(history []v1.History) {
|
|
|
|
for i := range history {
|
|
|
|
var created *time.Time
|
|
|
|
if history[i].Created != nil {
|
|
|
|
copiedTimestamp := *history[i].Created
|
|
|
|
created = &copiedTimestamp
|
|
|
|
}
|
|
|
|
onews := v1.History{
|
|
|
|
Created: created,
|
|
|
|
CreatedBy: history[i].CreatedBy,
|
|
|
|
Author: history[i].Author,
|
|
|
|
Comment: history[i].Comment,
|
|
|
|
EmptyLayer: true,
|
|
|
|
}
|
|
|
|
oimage.History = append(oimage.History, onews)
|
|
|
|
if created == nil {
|
|
|
|
created = &time.Time{}
|
|
|
|
}
|
|
|
|
dnews := docker.V2S2History{
|
|
|
|
Created: *created,
|
|
|
|
CreatedBy: history[i].CreatedBy,
|
|
|
|
Author: history[i].Author,
|
|
|
|
Comment: history[i].Comment,
|
|
|
|
EmptyLayer: true,
|
|
|
|
}
|
|
|
|
dimage.History = append(dimage.History, dnews)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
appendHistory(i.preEmptyLayers)
|
2017-06-29 05:07:58 +08:00
|
|
|
onews := v1.History{
|
|
|
|
Created: &i.created,
|
|
|
|
CreatedBy: i.createdBy,
|
|
|
|
Author: oimage.Author,
|
2018-04-27 22:59:03 +08:00
|
|
|
Comment: i.historyComment,
|
2017-06-29 05:07:58 +08:00
|
|
|
EmptyLayer: false,
|
2017-05-18 05:01:06 +08:00
|
|
|
}
|
2017-06-29 05:07:58 +08:00
|
|
|
oimage.History = append(oimage.History, onews)
|
|
|
|
dnews := docker.V2S2History{
|
|
|
|
Created: i.created,
|
|
|
|
CreatedBy: i.createdBy,
|
|
|
|
Author: dimage.Author,
|
2018-04-27 22:59:03 +08:00
|
|
|
Comment: i.historyComment,
|
2017-06-29 05:07:58 +08:00
|
|
|
EmptyLayer: false,
|
|
|
|
}
|
|
|
|
dimage.History = append(dimage.History, dnews)
|
2019-01-19 04:39:58 +08:00
|
|
|
appendHistory(i.postEmptyLayers)
|
2018-06-09 00:55:46 +08:00
|
|
|
dimage.Parent = docker.ID(digest.FromString(i.parent))
|
2017-01-27 22:38:32 +08:00
|
|
|
|
2018-01-05 07:05:40 +08:00
|
|
|
// Sanity check that we didn't just create a mismatch between non-empty layers in the
|
|
|
|
// history and the number of diffIDs.
|
|
|
|
expectedDiffIDs := expectedOCIDiffIDs(oimage)
|
|
|
|
if len(oimage.RootFS.DiffIDs) != expectedDiffIDs {
|
|
|
|
return nil, errors.Errorf("internal error: history lists %d non-empty layers, but we have %d layers on disk", expectedDiffIDs, len(oimage.RootFS.DiffIDs))
|
|
|
|
}
|
|
|
|
expectedDiffIDs = expectedDockerDiffIDs(dimage)
|
|
|
|
if len(dimage.RootFS.DiffIDs) != expectedDiffIDs {
|
|
|
|
return nil, errors.Errorf("internal error: history lists %d non-empty layers, but we have %d layers on disk", expectedDiffIDs, len(dimage.RootFS.DiffIDs))
|
|
|
|
}
|
|
|
|
|
2017-06-01 01:44:41 +08:00
|
|
|
// Encode the image configuration blob.
|
2017-05-18 05:01:06 +08:00
|
|
|
oconfig, err := json.Marshal(&oimage)
|
2017-01-27 22:38:32 +08:00
|
|
|
if err != nil {
|
2018-10-03 22:05:46 +08:00
|
|
|
return nil, errors.Wrapf(err, "error encoding %#v as json", oimage)
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
2017-05-18 05:01:06 +08:00
|
|
|
logrus.Debugf("OCIv1 config = %s", oconfig)
|
2017-01-27 22:38:32 +08:00
|
|
|
|
2017-06-01 01:44:41 +08:00
|
|
|
// Add the configuration blob to the manifest.
|
|
|
|
omanifest.Config.Digest = digest.Canonical.FromBytes(oconfig)
|
2017-05-18 05:01:06 +08:00
|
|
|
omanifest.Config.Size = int64(len(oconfig))
|
|
|
|
omanifest.Config.MediaType = v1.MediaTypeImageConfig
|
|
|
|
|
2017-06-01 01:44:41 +08:00
|
|
|
// Encode the manifest.
|
2017-05-18 05:01:06 +08:00
|
|
|
omanifestbytes, err := json.Marshal(&omanifest)
|
|
|
|
if err != nil {
|
2018-10-03 22:05:46 +08:00
|
|
|
return nil, errors.Wrapf(err, "error encoding %#v as json", omanifest)
|
2017-05-18 05:01:06 +08:00
|
|
|
}
|
|
|
|
logrus.Debugf("OCIv1 manifest = %s", omanifestbytes)
|
2017-01-27 00:58:00 +08:00
|
|
|
|
2017-06-01 01:44:41 +08:00
|
|
|
// Encode the image configuration blob.
|
2017-05-18 05:01:06 +08:00
|
|
|
dconfig, err := json.Marshal(&dimage)
|
2017-01-27 00:58:00 +08:00
|
|
|
if err != nil {
|
2018-10-03 22:05:46 +08:00
|
|
|
return nil, errors.Wrapf(err, "error encoding %#v as json", dimage)
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
2017-05-18 05:01:06 +08:00
|
|
|
logrus.Debugf("Docker v2s2 config = %s", dconfig)
|
2017-01-27 00:58:00 +08:00
|
|
|
|
2017-06-01 01:44:41 +08:00
|
|
|
// Add the configuration blob to the manifest.
|
|
|
|
dmanifest.Config.Digest = digest.Canonical.FromBytes(dconfig)
|
2017-05-18 05:01:06 +08:00
|
|
|
dmanifest.Config.Size = int64(len(dconfig))
|
2018-07-19 07:49:56 +08:00
|
|
|
dmanifest.Config.MediaType = manifest.DockerV2Schema2ConfigMediaType
|
2017-05-18 05:01:06 +08:00
|
|
|
|
2017-06-01 01:44:41 +08:00
|
|
|
// Encode the manifest.
|
2017-05-18 05:01:06 +08:00
|
|
|
dmanifestbytes, err := json.Marshal(&dmanifest)
|
|
|
|
if err != nil {
|
2018-10-03 22:05:46 +08:00
|
|
|
return nil, errors.Wrapf(err, "error encoding %#v as json", dmanifest)
|
2017-05-18 05:01:06 +08:00
|
|
|
}
|
|
|
|
logrus.Debugf("Docker v2s2 manifest = %s", dmanifestbytes)
|
|
|
|
|
2017-06-01 01:44:41 +08:00
|
|
|
// Decide which manifest and configuration blobs we'll actually output.
|
2017-05-18 05:01:06 +08:00
|
|
|
var config []byte
|
2018-07-19 07:49:56 +08:00
|
|
|
var imageManifest []byte
|
2017-05-18 05:01:06 +08:00
|
|
|
switch manifestType {
|
|
|
|
case v1.MediaTypeImageManifest:
|
2018-07-19 07:49:56 +08:00
|
|
|
imageManifest = omanifestbytes
|
2017-06-01 01:44:41 +08:00
|
|
|
config = oconfig
|
2018-07-19 07:49:56 +08:00
|
|
|
case manifest.DockerV2Schema2MediaType:
|
|
|
|
imageManifest = dmanifestbytes
|
2017-06-01 01:44:41 +08:00
|
|
|
config = dconfig
|
2017-05-18 05:01:06 +08:00
|
|
|
default:
|
|
|
|
panic("unreachable code: unsupported manifest type")
|
|
|
|
}
|
2017-01-27 00:58:00 +08:00
|
|
|
src = &containerImageSource{
|
2018-10-18 06:06:16 +08:00
|
|
|
path: path,
|
|
|
|
ref: i,
|
|
|
|
store: i.store,
|
|
|
|
containerID: i.containerID,
|
|
|
|
mountLabel: i.mountLabel,
|
|
|
|
layerID: i.layerID,
|
|
|
|
names: i.names,
|
|
|
|
compression: i.compression,
|
|
|
|
config: config,
|
|
|
|
configDigest: digest.Canonical.FromBytes(config),
|
|
|
|
manifest: imageManifest,
|
|
|
|
manifestType: manifestType,
|
|
|
|
exporting: i.exporting,
|
|
|
|
blobDirectory: i.blobDirectory,
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
|
|
|
return src, nil
|
|
|
|
}
|
|
|
|
|
2018-04-12 22:20:36 +08:00
|
|
|
func (i *containerImageRef) NewImageDestination(ctx context.Context, sc *types.SystemContext) (types.ImageDestination, error) {
|
2017-06-03 00:17:27 +08:00
|
|
|
return nil, errors.Errorf("can't write to a container")
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
func (i *containerImageRef) DockerReference() reference.Named {
|
|
|
|
return i.name
|
|
|
|
}
|
|
|
|
|
|
|
|
func (i *containerImageRef) StringWithinTransport() string {
|
2017-06-02 00:09:23 +08:00
|
|
|
if len(i.names) > 0 {
|
|
|
|
return i.names[0]
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
|
2018-04-12 22:20:36 +08:00
|
|
|
func (i *containerImageRef) DeleteImage(context.Context, *types.SystemContext) error {
|
2017-01-27 00:58:00 +08:00
|
|
|
// we were never here
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (i *containerImageRef) PolicyConfigurationIdentity() string {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
|
|
|
|
func (i *containerImageRef) PolicyConfigurationNamespaces() []string {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (i *containerImageRef) Transport() types.ImageTransport {
|
|
|
|
return is.Transport
|
|
|
|
}
|
|
|
|
|
2017-03-22 04:38:50 +08:00
|
|
|
func (i *containerImageSource) Close() error {
|
2017-01-27 00:58:00 +08:00
|
|
|
err := os.RemoveAll(i.path)
|
|
|
|
if err != nil {
|
2018-10-03 22:05:46 +08:00
|
|
|
return errors.Wrapf(err, "error removing layer blob directory %q", i.path)
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
2018-10-03 22:05:46 +08:00
|
|
|
return nil
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
func (i *containerImageSource) Reference() types.ImageReference {
|
|
|
|
return i.ref
|
|
|
|
}
|
|
|
|
|
2017-06-29 05:07:58 +08:00
|
|
|
func (i *containerImageSource) GetSignatures(ctx context.Context, instanceDigest *digest.Digest) ([][]byte, error) {
|
2018-03-08 07:10:06 +08:00
|
|
|
if instanceDigest != nil {
|
|
|
|
return nil, errors.Errorf("containerImageSource does not support manifest lists")
|
2017-06-29 05:07:58 +08:00
|
|
|
}
|
2017-01-27 00:58:00 +08:00
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
|
2018-04-12 22:20:36 +08:00
|
|
|
func (i *containerImageSource) GetManifest(ctx context.Context, instanceDigest *digest.Digest) ([]byte, string, error) {
|
2018-03-08 07:10:06 +08:00
|
|
|
if instanceDigest != nil {
|
|
|
|
return nil, "", errors.Errorf("containerImageSource does not support manifest lists")
|
2017-06-29 05:07:58 +08:00
|
|
|
}
|
|
|
|
return i.manifest, i.manifestType, nil
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
|
|
|
|
2018-04-12 22:20:36 +08:00
|
|
|
func (i *containerImageSource) LayerInfosForCopy(ctx context.Context) ([]types.BlobInfo, error) {
|
2018-02-23 01:12:59 +08:00
|
|
|
return nil, nil
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
|
|
|
|
2018-12-19 18:20:31 +08:00
|
|
|
func (i *containerImageSource) HasThreadSafeGetBlob() bool {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2018-11-23 18:40:49 +08:00
|
|
|
func (i *containerImageSource) GetBlob(ctx context.Context, blob types.BlobInfo, cache types.BlobInfoCache) (reader io.ReadCloser, size int64, err error) {
|
2017-01-27 00:58:00 +08:00
|
|
|
if blob.Digest == i.configDigest {
|
|
|
|
logrus.Debugf("start reading config")
|
|
|
|
reader := bytes.NewReader(i.config)
|
|
|
|
closer := func() error {
|
|
|
|
logrus.Debugf("finished reading config")
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
return ioutils.NewReadCloserWrapper(reader, closer), reader.Size(), nil
|
|
|
|
}
|
2018-10-18 06:06:16 +08:00
|
|
|
var layerFile *os.File
|
|
|
|
for _, path := range []string{i.blobDirectory, i.path} {
|
|
|
|
layerFile, err = os.OpenFile(filepath.Join(path, blob.Digest.String()), os.O_RDONLY, 0600)
|
|
|
|
if err == nil {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
if !os.IsNotExist(err) {
|
|
|
|
logrus.Debugf("error checking for layer %q in %q: %v", blob.Digest.String(), path, err)
|
|
|
|
}
|
|
|
|
}
|
2017-01-27 00:58:00 +08:00
|
|
|
if err != nil {
|
|
|
|
logrus.Debugf("error reading layer %q: %v", blob.Digest.String(), err)
|
2018-10-03 22:05:46 +08:00
|
|
|
return nil, -1, errors.Wrapf(err, "error opening file %q to buffer layer blob", filepath.Join(i.path, blob.Digest.String()))
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
|
|
|
size = -1
|
|
|
|
st, err := layerFile.Stat()
|
|
|
|
if err != nil {
|
|
|
|
logrus.Warnf("error reading size of layer %q: %v", blob.Digest.String(), err)
|
|
|
|
} else {
|
|
|
|
size = st.Size()
|
|
|
|
}
|
|
|
|
logrus.Debugf("reading layer %q", blob.Digest.String())
|
2017-01-27 19:28:41 +08:00
|
|
|
closer := func() error {
|
|
|
|
logrus.Debugf("finished reading layer %q", blob.Digest.String())
|
2018-10-03 22:05:46 +08:00
|
|
|
if err := layerFile.Close(); err != nil {
|
|
|
|
return errors.Wrapf(err, "error closing layer %q after reading", blob.Digest.String())
|
|
|
|
}
|
2017-01-27 19:28:41 +08:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
return ioutils.NewReadCloserWrapper(layerFile, closer), size, nil
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
|
|
|
|
2018-10-18 06:06:16 +08:00
|
|
|
func (b *Builder) makeImageRef(manifestType, parent string, exporting bool, squash bool, blobDirectory string, compress archive.Compression, historyTimestamp *time.Time) (types.ImageReference, error) {
|
2017-01-27 00:58:00 +08:00
|
|
|
var name reference.Named
|
2017-06-29 05:07:58 +08:00
|
|
|
container, err := b.store.Container(b.ContainerID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, errors.Wrapf(err, "error locating container %q", b.ContainerID)
|
|
|
|
}
|
|
|
|
if len(container.Names) > 0 {
|
|
|
|
if parsed, err2 := reference.ParseNamed(container.Names[0]); err2 == nil {
|
2017-06-02 00:09:23 +08:00
|
|
|
name = parsed
|
|
|
|
}
|
|
|
|
}
|
2017-05-18 05:02:40 +08:00
|
|
|
if manifestType == "" {
|
|
|
|
manifestType = OCIv1ImageManifest
|
|
|
|
}
|
2017-05-18 05:01:06 +08:00
|
|
|
oconfig, err := json.Marshal(&b.OCIv1)
|
|
|
|
if err != nil {
|
2018-10-03 22:05:46 +08:00
|
|
|
return nil, errors.Wrapf(err, "error encoding OCI-format image configuration %#v", b.OCIv1)
|
2017-05-18 05:01:06 +08:00
|
|
|
}
|
|
|
|
dconfig, err := json.Marshal(&b.Docker)
|
Maintain multiple working container configs
Maintain the container configuration in multiple formats in the Buildah
object, initializing one based on the other, depending on which format
the source image used for its configuration.
Replace directly manipulated fields in the Buildah object (Annotations,
CreatedBy, OS, Architecture, Maintainer, User, Workdir, Env, Cmd,
Entrypoint, Expose, Labels, and Volumes) with accessor functions which
update both configurations and which read from whichever one we consider
to be authoritative. Drop Args because we weren't using them.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Closes: #102
Approved by: rhatdan
2017-05-16 23:08:52 +08:00
|
|
|
if err != nil {
|
2018-10-03 22:05:46 +08:00
|
|
|
return nil, errors.Wrapf(err, "error encoding docker-format image configuration %#v", b.Docker)
|
Maintain multiple working container configs
Maintain the container configuration in multiple formats in the Buildah
object, initializing one based on the other, depending on which format
the source image used for its configuration.
Replace directly manipulated fields in the Buildah object (Annotations,
CreatedBy, OS, Architecture, Maintainer, User, Workdir, Env, Cmd,
Entrypoint, Expose, Labels, and Volumes) with accessor functions which
update both configurations and which read from whichever one we consider
to be authoritative. Drop Args because we weren't using them.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Closes: #102
Approved by: rhatdan
2017-05-16 23:08:52 +08:00
|
|
|
}
|
2017-06-07 02:11:46 +08:00
|
|
|
created := time.Now().UTC()
|
|
|
|
if historyTimestamp != nil {
|
|
|
|
created = historyTimestamp.UTC()
|
|
|
|
}
|
2018-06-09 00:55:46 +08:00
|
|
|
|
2017-02-11 00:48:15 +08:00
|
|
|
ref := &containerImageRef{
|
2017-05-18 05:02:40 +08:00
|
|
|
store: b.store,
|
|
|
|
compression: compress,
|
|
|
|
name: name,
|
2017-06-29 05:07:58 +08:00
|
|
|
names: container.Names,
|
2018-05-22 05:02:50 +08:00
|
|
|
containerID: container.ID,
|
|
|
|
mountLabel: b.MountLabel,
|
2017-06-29 05:07:58 +08:00
|
|
|
layerID: container.LayerID,
|
2017-05-18 05:02:40 +08:00
|
|
|
oconfig: oconfig,
|
|
|
|
dconfig: dconfig,
|
2017-06-07 02:11:46 +08:00
|
|
|
created: created,
|
2017-05-18 05:02:40 +08:00
|
|
|
createdBy: b.CreatedBy(),
|
2018-04-27 22:59:03 +08:00
|
|
|
historyComment: b.HistoryComment(),
|
2017-05-18 05:02:40 +08:00
|
|
|
annotations: b.Annotations(),
|
|
|
|
preferredManifestType: manifestType,
|
Take a shortcut when writing to local storage
When writing to local storage, take a couple of shortcuts: instead of
recompressing layers to ensure that the values we store in the image
manifest will be correct for content-addressibility, just pretend that
the layer ID is a blob hash value, and that it's a valid layer diffID.
Local storage doesn't generally care if these values are correct, and we
already have to recompute these values when exporting an image, but this
saves us quite a bit of time.
The image library's Copy() routine actually cares about and
sanity-checks these things, so if we're going to take advantage of the
shortcuts, we need to use its higher-level APIs to write a layer, write
the configuration, and write the manifest, then move those items that it
writes to an image with the right set of layers.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Closes: #141
Approved by: rhatdan
2017-06-01 01:56:25 +08:00
|
|
|
exporting: exporting,
|
2018-05-22 05:02:50 +08:00
|
|
|
squash: squash,
|
2018-03-17 05:19:29 +08:00
|
|
|
tarPath: b.tarPath(),
|
2018-06-09 00:55:46 +08:00
|
|
|
parent: parent,
|
2018-10-18 06:06:16 +08:00
|
|
|
blobDirectory: blobDirectory,
|
2019-01-19 04:39:58 +08:00
|
|
|
preEmptyLayers: b.PrependedEmptyLayers,
|
|
|
|
postEmptyLayers: b.AppendedEmptyLayers,
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|
2017-02-11 00:48:15 +08:00
|
|
|
return ref, nil
|
2017-01-27 00:58:00 +08:00
|
|
|
}
|