From 838df4eec4496868e772d5708e00f38bad478718 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 30 Mar 2018 05:49:37 -0400 Subject: Vendor in latest containers/image Some more features. docker-archive generates docker legacy compatible images Do not create $DiffID subdirectories for layers with no configs Ensure the layer IDs in legacy docker/tarfile metadata are unique docker-archive: repeated layers are symlinked in the tar file sysregistries: remove all trailing slashes Improve docker/* error messages Fix failure to make auth directory Create a new slice in Schema1.UpdateLayerInfos Drop unused storageImageDestination.{image,systemContext} Load a *storage.Image only once in storageImageSource Support gzip for docker-archive files Remove .tar extension from blob and config file names ostree, src: support copy of compressed layers ostree: re-pull layer if it misses uncompressed_digest|uncompressed_size image: fix docker schema v1 -> OCI conversion Add /etc/containers/certs.d as default certs directory Signed-off-by: Daniel J Walsh Closes: #569 Approved by: mheon --- test/bin2img/bin2img.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/bin2img') diff --git a/test/bin2img/bin2img.go b/test/bin2img/bin2img.go index b75289458..b5be8615a 100644 --- a/test/bin2img/bin2img.go +++ b/test/bin2img/bin2img.go @@ -154,7 +154,7 @@ func main() { os.Exit(1) } defer img.Close() - layer, err := img.PutBlob(layerBuffer, layerInfo) + layer, err := img.PutBlob(layerBuffer, layerInfo, false) if err != nil { logrus.Errorf("error preparing to write image: %v", err) os.Exit(1) @@ -182,7 +182,7 @@ func main() { Digest: digest.Canonical.FromBytes(cbytes), Size: int64(len(cbytes)), } - configInfo, err = img.PutBlob(bytes.NewBuffer(cbytes), configInfo) + configInfo, err = img.PutBlob(bytes.NewBuffer(cbytes), configInfo, false) if err != nil { logrus.Errorf("error saving configuration: %v", err) os.Exit(1) -- cgit v1.2.3-54-g00ecf