support insecure registries

Signed-off-by: Antonio Murdaca <runcom@redhat.com>

docker/inspect.go

@@ -3,8 +3,6 @@ package docker
 import (
 	"encoding/json"
 	"fmt"
-	"os"
-	"path/filepath"
 	"strings"
 	"time"
 
@@ -15,12 +13,12 @@ import (
 	"github.com/docker/docker/api"
 	"github.com/docker/docker/cliconfig"
 	"github.com/docker/docker/image"
+	"github.com/docker/docker/opts"
 	versionPkg "github.com/docker/docker/pkg/version"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
 	engineTypes "github.com/docker/engine-api/types"
 	registryTypes "github.com/docker/engine-api/types/registry"
-	"github.com/opencontainers/runc/libcontainer/user"
 	"github.com/runcom/skopeo/types"
 	"golang.org/x/net/context"
 )
@@ -76,21 +74,21 @@ func GetData(c *cli.Context, name string) (*types.ImageInspect, error) {
 	if err := validateRepoName(repoInfo.Name()); err != nil {
 		return nil, err
 	}
-	//options := &registry.Options{}
-	//options.Mirrors = opts.NewListOpts(nil)
-	//options.InsecureRegistries = opts.NewListOpts(nil)
-	//options.InsecureRegistries.Set("0.0.0.0/0")
-	//registryService := registry.NewService(options)
-	registryService := registry.NewService(nil)
-	//// TODO(runcom): hacky, provide a way of passing tls cert (flag?) to be used to lookup
-	//for _, ic := range registryService.Config.IndexConfigs {
-	//ic.Secure = false
-	//}
+	options := &registry.Options{}
+	options.Mirrors = opts.NewListOpts(nil)
+	options.InsecureRegistries = opts.NewListOpts(nil)
+	options.InsecureRegistries.Set("0.0.0.0/0")
+	registryService := registry.NewService(options)
+	// TODO(runcom): hacky, provide a way of passing tls cert (flag?) to be used to lookup
+	for _, ic := range registryService.Config.IndexConfigs {
+		ic.Secure = false
+	}
 
 	endpoints, err := registryService.LookupPullEndpoints(repoInfo)
 	if err != nil {
 		return nil, err
 	}
+	logrus.Debugf("endpoints: %v", endpoints)
 
 	var (
 		ctx                    = context.Background()
@@ -197,6 +195,11 @@ func getAuthConfig(c *cli.Context, index *registryTypes.IndexInfo) (engineTypes.
 		}
 	)
 
+	//
+	// FINAL TODO(runcom): avoid returning empty config! just fallthrough and return
+	// the first useful authconfig
+	//
+
 	// TODO(runcom): ??? atomic needs this
 	// TODO(runcom): implement this to opt-in for docker-cfg, no need to make this
 	// work by default with docker's conf
@@ -206,23 +209,6 @@ func getAuthConfig(c *cli.Context, index *registryTypes.IndexInfo) (engineTypes.
 		return defAuthConfig, nil
 	}
 
-	sudoUserEnv := os.Getenv("SUDO_USER")
-	if sudoUserEnv != "" {
-		sudoUser, err := user.LookupUser(sudoUserEnv)
-		if err != nil {
-			return engineTypes.AuthConfig{}, err
-		}
-		// override the given docker conf file if called with sudo
-		cfg = filepath.Join(sudoUser.Home, ".docker")
-	}
-
-	if _, err := os.Stat(cfg); err != nil {
-		logrus.Debugf("Docker cli config file %q not found: %v, falling back to --username and --password if needed", cfg, err)
-		if os.IsNotExist(err) {
-			return defAuthConfig, nil
-		}
-		return engineTypes.AuthConfig{}, nil
-	}
 	confFile, err := cliconfig.Load(cfg)
 	if err != nil {
 		return engineTypes.AuthConfig{}, err

hack/vendor.sh

@@ -13,7 +13,7 @@ clone git github.com/gorilla/context master
 clone git golang.org/x/net master https://github.com/golang/net.git
 clone git github.com/go-check/check v1
 
-clone git github.com/docker/docker v1.10.1
+clone git github.com/docker/docker v1.10.2
 clone git github.com/docker/engine-api v0.2.3
 clone git github.com/docker/distribution 0f2d99b13ae0cfbcf118eff103e6e680b726b47e
 

inspect.go

@@ -2,34 +2,54 @@ package main
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/codegangsta/cli"
 	"github.com/runcom/skopeo/docker"
 	"github.com/runcom/skopeo/types"
 )
 
+type imgKind int
+
 const (
-	imgTypeDocker = "docker"
-	imgTypeAppc   = "appc"
+	imgTypeDocker = "docker://"
+	imgTypeAppc   = "appc://"
+
+	kindUnknown = iota
+	kindDocker
+	kindAppc
 )
 
+func getImgType(img string) imgKind {
+	if strings.HasPrefix(img, imgTypeDocker) {
+		return kindDocker
+	}
+	if strings.HasPrefix(img, imgTypeAppc) {
+		return kindAppc
+	}
+	// TODO(runcom): v2 will support this
+	//return kindUnknown
+	return kindDocker
+}
+
 func inspect(c *cli.Context) (*types.ImageInspect, error) {
 	var (
 		imgInspect *types.ImageInspect
 		err        error
 		name       = c.Args().First()
-		imgType    = c.GlobalString("img-type")
+		kind       = getImgType(name)
 	)
-	switch imgType {
-	case imgTypeDocker:
-		imgInspect, err = docker.GetData(c, name)
+
+	switch kind {
+	case kindDocker:
+		imgInspect, err = docker.GetData(c, strings.Replace(name, imgTypeDocker, "", -1))
 		if err != nil {
 			return nil, err
 		}
-	case imgTypeAppc:
-		return nil, fmt.Errorf("sorry, not implemented yet")
+	case kindAppc:
+		return nil, fmt.Errorf("not implemented yet")
 	default:
-		return nil, fmt.Errorf("%s image type is invalid, please use either 'docker' or 'appc'", imgType)
+		return nil, fmt.Errorf("%s image is invalid, please use either 'docker://' or 'appc://'", name)
 	}
 	return imgInspect, nil
 }

main.go

@@ -52,11 +52,6 @@ func main() {
 			Value: cliconfig.ConfigDir(),
 			Usage: "Docker's cli config for auth",
 		},
-		cli.StringFlag{
-			Name:  "img-type",
-			Value: imgTypeDocker,
-			Usage: "Either docker or appc",
-		},
 	}
 	app.Before = func(c *cli.Context) error {
 		if c.GlobalBool("debug") {

vendor/github.com/docker/docker/layer/layer_store.go

@@ -498,18 +498,21 @@ func (ls *layerStore) ReleaseRWLayer(l RWLayer) ([]Metadata, error) {
 
 	if err := ls.driver.Remove(m.mountID); err != nil {
 		logrus.Errorf("Error removing mounted layer %s: %s", m.name, err)
+		m.retakeReference(l)
 		return nil, err
 	}
 
 	if m.initID != "" {
 		if err := ls.driver.Remove(m.initID); err != nil {
 			logrus.Errorf("Error removing init layer %s: %s", m.name, err)
+			m.retakeReference(l)
 			return nil, err
 		}
 	}
 
 	if err := ls.store.RemoveMount(m.name); err != nil {
 		logrus.Errorf("Error removing mount metadata: %s: %s", m.name, err)
+		m.retakeReference(l)
 		return nil, err
 	}
 

vendor/github.com/docker/docker/layer/migration.go

@@ -127,6 +127,7 @@ func (ls *layerStore) checksumForGraphIDNoTarsplit(id, parent, newTarDataPath st
 	}
 	defer f.Close()
 	mfz := gzip.NewWriter(f)
+	defer mfz.Close()
 	metaPacker := storage.NewJSONPacker(mfz)
 
 	packerCounter := &packSizeCounter{metaPacker, &size}

vendor/github.com/docker/docker/layer/mounted_layer.go

@@ -96,6 +96,13 @@ func (ml *mountedLayer) deleteReference(ref RWLayer) error {
 	return nil
 }
 
+func (ml *mountedLayer) retakeReference(r RWLayer) {
+	if ref, ok := r.(*referencedRWLayer); ok {
+		ref.activityCount = 0
+		ml.references[ref] = ref
+	}
+}
+
 type referencedRWLayer struct {
 	*mountedLayer