github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2026-02-03 07:48:30 +00:00
Code Issues Projects Releases Wiki Activity

Update implementation to match dependencies

Browse Source 
types.ImageSource.Close() can return an error now, and ParseImageName()
moved to containers/image/transports/alltransports.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai
2017-03-21 16:38:50 -04:00
parent f33ae08da5
commit f0b508598a
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/buildah/commit.go
View File

@@ -3,7 +3,7 @@ package main
import (
"fmt"
"github.com/containers/image/transports"
"github.com/containers/image/transports/alltransports"
"github.com/containers/storage/pkg/archive"
"github.com/projectatomic/buildah"
"github.com/urfave/cli"
@@ -90,7 +90,7 @@ func commitCmd(c *cli.Context) error {
return fmt.Errorf("error reading build container %q: %v", name, err)
}
dest, err := transports.ParseImageName(output)
dest, err := alltransports.ParseImageName(output)
if err != nil {
return fmt.Errorf("error parsing target image name %q: %v", output, err)
}

3
image.go
View File

@@ -255,11 +255,12 @@ func (i *containerImageRef) Transport() types.ImageTransport {
return is.Transport
}
func (i *containerImageSource) Close() {
func (i *containerImageSource) Close() error {
err := os.RemoveAll(i.path)
if err != nil {
logrus.Errorf("error removing %q: %v", i.path, err)
}
return err
}
func (i *containerImageSource) Reference() types.ImageReference {

6
pull.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/containers/image/docker/reference"
"github.com/containers/image/signature"
is "github.com/containers/image/storage"
"github.com/containers/image/transports"
"github.com/containers/image/transports/alltransports"
"github.com/containers/image/types"
"github.com/containers/storage/storage"
)
@@ -21,9 +21,9 @@ func pullImage(store storage.Store, options BuilderOptions, sc *types.SystemCont
spec = options.Registry + spec
}
srcRef, err := transports.ParseImageName(name)
srcRef, err := alltransports.ParseImageName(name)
if err != nil {
srcRef2, err2 := transports.ParseImageName(spec)
srcRef2, err2 := alltransports.ParseImageName(spec)
if err2 != nil {
return fmt.Errorf("error parsing image name %q: %v", spec, err2)
}