Update packages to match latest code in moby/pkg

Had to vendor in a new version of golang.org/x/net to build Also had to make some changes to drivers to handle archive.Reader -> io.Reader archive.Archive -> io.ReadCloser Also update .gitingore to ignore emacs files, containers-storage.* and generated man pages. Also no longer test travis against golang 1.7, cri-o, moby have also done this. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
containers · Sep 12, 2017 · 5b15548 · 5b15548
1 parent 336b249
commit 5b15548
Show file tree

Hide file tree

Showing 172 changed files with 6,012 additions and 2,336 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,9 @@
-# Docker project generated files to ignore
+# containers/storage project generated files to ignore
 # if you want to ignore files created by your editor/tools,
 # please consider a global .gitignore https://help.github.com/articles/ignoring-files
+*.1
 *.exe
-*.exe~
+*~
 *.orig
 *.test
 .*.swp
@@ -24,3 +25,8 @@ man/man5
 man/man8
 vendor/pkg/
 .vagrant
+containers-storage
+containers-storage.darwin.amd64
+containers-storage.linux.amd64
+containers-storage.linux.386
+containers-storage.linux.arm
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: go
 go:
  - tip
  - 1.8
- - 1.7
 dist: trusty
 sudo: required
 before_install:

diff --git a/drivers/aufs/aufs.go b/drivers/aufs/aufs.go
@@ -25,6 +25,7 @@ package aufs
 import (
  "bufio"
  "fmt"
+ "io"
  "io/ioutil"
  "os"
  "os/exec"
@@ -363,7 +364,7 @@ func (a *Driver) Put(id string) error {
 
 // Diff produces an archive of the changes between the specified
 // layer and its parent layer which may be "".
-func (a *Driver) Diff(id, parent string) (archive.Archive, error) {
+func (a *Driver) Diff(id, parent string) (io.ReadCloser, error) {
  // AUFS doesn't need the parent layer to produce a diff.
  return archive.TarWithOptions(path.Join(a.rootPath(), "diff", id), &archive.TarOptions{
  Compression: archive.Uncompressed,
@@ -394,7 +395,7 @@ func (a *Driver) DiffGetter(id string) (graphdriver.FileGetCloser, error) {
  return fileGetNilCloser{storage.NewPathFileGetter(p)}, nil
 }
 
-func (a *Driver) applyDiff(id string, diff archive.Reader) error {
+func (a *Driver) applyDiff(id string, diff io.Reader) error {
  return chrootarchive.UntarUncompressed(diff, path.Join(a.rootPath(), "diff", id), &archive.TarOptions{
  UIDMaps: a.uidMaps,
  GIDMaps: a.gidMaps,
@@ -412,7 +413,7 @@ func (a *Driver) DiffSize(id, parent string) (size int64, err error) {
 // ApplyDiff extracts the changeset from the given diff into the
 // layer with the specified id and parent, returning the size of the
 // new layer in bytes.
-func (a *Driver) ApplyDiff(id, parent string, diff archive.Reader) (size int64, err error) {
+func (a *Driver) ApplyDiff(id, parent string, diff io.Reader) (size int64, err error) {
  // AUFS doesn't need the parent id to apply the diff.
  if err = a.applyDiff(id, diff); err != nil {
  return

diff --git a/drivers/driver.go b/drivers/driver.go
@@ -2,6 +2,7 @@ package graphdriver
 
 import (
  "fmt"
+ "io"
  "os"
  "path/filepath"
  "strings"
@@ -83,15 +84,15 @@ type Driver interface {
  ProtoDriver
  // Diff produces an archive of the changes between the specified
  // layer and its parent layer which may be "".
- Diff(id, parent string) (archive.Archive, error)
+ Diff(id, parent string) (io.ReadCloser, error)
  // Changes produces a list of changes between the specified layer
  // and its parent layer. If parent is "", then all changes will be ADD changes.
  Changes(id, parent string) ([]archive.Change, error)
  // ApplyDiff extracts the changeset from the given diff into the
  // layer with the specified id and parent, returning the size of the
  // new layer in bytes.
- // The archive.Reader must be an uncompressed stream.
- ApplyDiff(id, parent string, diff archive.Reader) (size int64, err error)
+ // The io.Reader must be an uncompressed stream.
+ ApplyDiff(id, parent string, diff io.Reader) (size int64, err error)
  // DiffSize calculates the changes between the specified id
  // and its parent and returns the size in bytes of the changes
  // relative to its base filesystem directory.

diff --git a/drivers/fsdiff.go b/drivers/fsdiff.go
@@ -1,14 +1,14 @@
 package graphdriver
 
 import (
+ "io"
  "time"
 
- "github.com/sirupsen/logrus"
-
  "github.com/containers/storage/pkg/archive"
  "github.com/containers/storage/pkg/chrootarchive"
  "github.com/containers/storage/pkg/idtools"
  "github.com/containers/storage/pkg/ioutils"
+ "github.com/sirupsen/logrus"
 )
 
 var (
@@ -31,9 +31,9 @@ type NaiveDiffDriver struct {
 // NewNaiveDiffDriver returns a fully functional driver that wraps the
 // given ProtoDriver and adds the capability of the following methods which
 // it may or may not support on its own:
-// Diff(id, parent string) (archive.Archive, error)
+// Diff(id, parent string) (io.ReadCloser, error)
 // Changes(id, parent string) ([]archive.Change, error)
-// ApplyDiff(id, parent string, diff archive.Reader) (size int64, err error)
+// ApplyDiff(id, parent string, diff io.Reader) (size int64, err error)
 // DiffSize(id, parent string) (size int64, err error)
 func NewNaiveDiffDriver(driver ProtoDriver, uidMaps, gidMaps []idtools.IDMap) Driver {
  gdw := &NaiveDiffDriver{
@@ -46,7 +46,7 @@ func NewNaiveDiffDriver(driver ProtoDriver, uidMaps, gidMaps []idtools.IDMap) Dr
 
 // Diff produces an archive of the changes between the specified
 // layer and its parent layer which may be "".
-func (gdw *NaiveDiffDriver) Diff(id, parent string) (arch archive.Archive, err error) {
+func (gdw *NaiveDiffDriver) Diff(id, parent string) (arch io.ReadCloser, err error) {
  layerFs, err := gdw.Get(id, "")
  if err != nil {
  return nil, err
@@ -118,7 +118,7 @@ func (gdw *NaiveDiffDriver) Changes(id, parent string) ([]archive.Change, error)
 // ApplyDiff extracts the changeset from the given diff into the
 // layer with the specified id and parent, returning the size of the
 // new layer in bytes.
-func (gdw *NaiveDiffDriver) ApplyDiff(id, parent string, diff archive.Reader) (size int64, err error) {
+func (gdw *NaiveDiffDriver) ApplyDiff(id, parent string, diff io.Reader) (size int64, err error) {
  // Mount the root filesystem so we can apply the diff/layer.
  layerFs, err := gdw.Get(id, "")
  if err != nil {

diff --git a/drivers/overlay/overlay.go b/drivers/overlay/overlay.go
@@ -5,6 +5,7 @@ package overlay
 import (
  "bufio"
  "fmt"
+ "io"
  "io/ioutil"
  "os"
  "os/exec"
@@ -528,7 +529,7 @@ func (d *Driver) Exists(id string) bool {
 }
 
 // ApplyDiff applies the new layer into a root
-func (d *Driver) ApplyDiff(id string, parent string, diff archive.Reader) (size int64, err error) {
+func (d *Driver) ApplyDiff(id string, parent string, diff io.Reader) (size int64, err error) {
  applyDir := d.getDiffPath(id)
 
  logrus.Debugf("Applying tar in %s", applyDir)
@@ -559,7 +560,7 @@ func (d *Driver) DiffSize(id, parent string) (size int64, err error) {
 
 // Diff produces an archive of the changes between the specified
 // layer and its parent layer which may be "".
-func (d *Driver) Diff(id, parent string) (archive.Archive, error) {
+func (d *Driver) Diff(id, parent string) (io.ReadCloser, error) {
  diffPath := d.getDiffPath(id)
  logrus.Debugf("Tar with options on %s", diffPath)
  return archive.TarWithOptions(diffPath, &archive.TarOptions{

diff --git a/drivers/proxy.go b/drivers/proxy.go
@@ -4,6 +4,7 @@ package graphdriver
 
 import (
  "fmt"
+ "io"
 
  "github.com/containers/storage/pkg/archive"
  "github.com/pkg/errors"
@@ -170,7 +171,7 @@ func (d *graphDriverProxy) Cleanup() error {
  return nil
 }
 
-func (d *graphDriverProxy) Diff(id, parent string) (archive.Archive, error) {
+func (d *graphDriverProxy) Diff(id, parent string) (io.ReadCloser, error) {
  args := &graphDriverRequest{
  ID: id,
  Parent: parent,
@@ -179,7 +180,7 @@ func (d *graphDriverProxy) Diff(id, parent string) (archive.Archive, error) {
  if err != nil {
  return nil, err
  }
- return archive.Archive(body), nil
+ return io.ReadClose(body), nil
 }
 
 func (d *graphDriverProxy) Changes(id, parent string) ([]archive.Change, error) {
@@ -198,7 +199,7 @@ func (d *graphDriverProxy) Changes(id, parent string) ([]archive.Change, error)
  return ret.Changes, nil
 }
 
-func (d *graphDriverProxy) ApplyDiff(id, parent string, diff archive.Reader) (int64, error) {
+func (d *graphDriverProxy) ApplyDiff(id, parent string, diff io.Reader) (int64, error) {
  var ret graphDriverResponse
  if err := d.client.SendFile(fmt.Sprintf("GraphDriver.ApplyDiff?id=%s&parent=%s", id, parent), diff, &ret); err != nil {
  return -1, err

diff --git a/drivers/vfs/driver.go b/drivers/vfs/driver.go
@@ -14,7 +14,7 @@ import (
 
 var (
  // CopyWithTar defines the copy method to use.
- CopyWithTar = chrootarchive.CopyWithTar
+ CopyWithTar = chrootarchive.NewArchiver(nil).CopyWithTar
 )
 
 func init() {

diff --git a/drivers/windows/windows.go b/drivers/windows/windows.go
@@ -300,7 +300,7 @@ func (d *Driver) Cleanup() error {
 // Diff produces an archive of the changes between the specified
 // layer and its parent layer which may be "".
 // The layer should be mounted when calling this function
-func (d *Driver) Diff(id, parent string) (_ archive.Archive, err error) {
+func (d *Driver) Diff(id, parent string) (_ io.ReadCloser, err error) {
  rID, err := d.resolveID(id)
  if err != nil {
  return
@@ -483,7 +483,7 @@ func writeTarFromLayer(r hcsshim.LayerReader, w io.Writer) error {
 }
 
 // exportLayer generates an archive from a layer based on the given ID.
-func (d *Driver) exportLayer(id string, parentLayerPaths []string) (archive.Archive, error) {
+func (d *Driver) exportLayer(id string, parentLayerPaths []string) (io.ReadCloser, error) {
  archive, w := io.Pipe()
  go func() {
  err := winio.RunWithPrivilege(winio.SeBackupPrivilege, func() error {

diff --git a/layers.go b/layers.go
@@ -184,7 +184,7 @@ type LayerStore interface {
  CreateWithFlags(id, parent string, names []string, mountLabel string, options map[string]string, writeable bool, flags map[string]interface{}) (layer *Layer, err error)
 
  // Put combines the functions of CreateWithFlags and ApplyDiff.
- Put(id, parent string, names []string, mountLabel string, options map[string]string, writeable bool, flags map[string]interface{}, diff archive.Reader) (*Layer, int64, error)
+ Put(id, parent string, names []string, mountLabel string, options map[string]string, writeable bool, flags map[string]interface{}, diff io.Reader) (*Layer, int64, error)
 
  // SetNames replaces the list of names associated with a layer with the
  // supplied values.
@@ -206,7 +206,7 @@ type LayerStore interface {
 
  // ApplyDiff reads a tarstream which was created by a previous call to Diff and
  // applies its changes to a specified layer.
- ApplyDiff(to string, diff archive.Reader) (int64, error)
+ ApplyDiff(to string, diff io.Reader) (int64, error)
 }
 
 type layerStore struct {
@@ -463,7 +463,7 @@ func (r *layerStore) Status() ([][2]string, error) {
  return r.driver.Status(), nil
 }
 
-func (r *layerStore) Put(id, parent string, names []string, mountLabel string, options map[string]string, writeable bool, flags map[string]interface{}, diff archive.Reader) (layer *Layer, size int64, err error) {
+func (r *layerStore) Put(id, parent string, names []string, mountLabel string, options map[string]string, writeable bool, flags map[string]interface{}, diff io.Reader) (layer *Layer, size int64, err error) {
  if !r.IsReadWrite() {
  return nil, -1, errors.Wrapf(ErrStoreIsReadOnly, "not allowed to create new layers at %q", r.layerspath())
  }
@@ -900,7 +900,7 @@ func (r *layerStore) DiffSize(from, to string) (size int64, err error) {
  return r.driver.DiffSize(to, from)
 }
 
-func (r *layerStore) ApplyDiff(to string, diff archive.Reader) (size int64, err error) {
+func (r *layerStore) ApplyDiff(to string, diff io.Reader) (size int64, err error) {
  if !r.IsReadWrite() {
  return -1, errors.Wrapf(ErrStoreIsReadOnly, "not allowed to modify layer contents at %q", r.layerspath())
  }

diff --git a/pkg/archive/README.md b/pkg/archive/README.md
@@ -0,0 +1 @@
+This code provides helper functions for dealing with archive files.