return nicer error

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

LICENSE

@@ -1,20 +1,191 @@
-Copyright (c) 2016 Antonio Murdaca <runcom@redhat.com>
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2016 Antonio Murdaca <runcom@redhat.com>
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Makefile

@@ -2,8 +2,9 @@
 
 export GO15VENDOREXPERIMENT=1
 
-BINDIR=${DESTDIR}/usr/bin/
-MANDIR=${DESTDIR}/usr/share/man
+PREFIX ?= ${DESTDIR}/usr
+INSTALLDIR=${PREFIX}/bin
+MANINSTALLDIR=${PREFIX}/share/man
 
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
 DOCKER_IMAGE := skopeo-dev$(if $(GIT_BRANCH),:$(GIT_BRANCH))
@@ -31,11 +32,11 @@ clean:
 	rm -f skopeo.1
 
 install: install-binary
-	install -m 644 skopeo.1 ${MANDIR}/man1/
+	install -m 644 skopeo.1 ${MANINSTALLDIR}/man1/
 
 install-binary:
-	install -d -m 0755 ${BINDIR}
-	install -m 755 skopeo ${BINDIR}
+	install -d -m 0755 ${INSTALLDIR}
+	install -m 755 skopeo ${INSTALLDIR}
 
 man:
 	go-md2man -in man/skopeo.1.md -out skopeo.1

README.md

@@ -66,19 +66,10 @@ $ skopeo myregistrydomain.com:5000/busybox
 
 # let's try now to fake a non existent Docker's config file
 $ skopeo --docker-cfg="" myregistrydomain.com:5000/busybox
-INFO[0000] Docker cli config file not found: stat : no such file or directory, falling back to --username and --password
-FATA[0000] unable to ping registry endpoint http://myregistrydomain.com:5000/v0/
-v2 ping attempt failed with error: Get http://myregistrydomain.com:5000/v2/: malformed HTTP response "\x15\x03\x01\x00\x02\x02"
- v1 ping attempt failed with error: Get http://myregistrydomain.com:5000/v1/_ping: malformed HTTP response "\x15\x03\x01\x00\x02\x02"
+FATA[0000] Get https://myregistrydomain.com:5000/v2/busybox/manifests/latest: no basic auth credentials
 
-# we can see the cli config isn't found so it looks for --username and --password
-# but because I didn't provide them I can't auth to the registry and I receive the above error
-INFO[0000] Docker cli config file not found: stat : no such file or directory, falling back to --username and --password
-
-# passing --username and --password - we can see that everything goes fine despite an info showing
-# cli config can't be found
+# passing --username and --password - we can see that everything goes fine
 $ skopeo --docker-cfg="" --username=testuser --password=testpassword myregistrydomain.com:5000/busybox
-INFO[0000] Docker cli config file not found: stat : no such file or directory, falling back to --username and --password
 {"Tag":"latest","Digest":"sha256:473bb2189d7b913ed7187a33d11e743fdc2f88931122a44d91a301b64419f092","RepoTags":["latest"],"Comment":"","Created":"2016-01-15T18:06:41.282540103Z","ContainerConfig":{"Hostname":"aded96b43f48","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":["/bin/sh","-c","#(nop) CMD [\"sh\"]"],"Image":"9e77fef7a1c9f989988c06620dabc4020c607885b959a2cbd7c2283c91da3e33","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":null},"DockerVersion":"1.8.3","Author":"","Config":{"Hostname":"aded96b43f48","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":["sh"],"Image":"9e77fef7a1c9f989988c06620dabc4020c607885b959a2cbd7c2283c91da3e33","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":null},"Architecture":"amd64","Os":"linux"}
 ```
 If your cli config is found but it doesn't contain the necessary credentials for the queried registry
@@ -113,6 +104,7 @@ TODO
 -
 - show repo tags via flag or when reference isn't tagged or digested
 - add tests (integration with deployed registries in container - Docker-like)
+- support rkt/appc image spec
 
 NOT TODO
 -
@@ -120,4 +112,4 @@ NOT TODO
 
 License
 -
-MIT
+ASL 2.0

docker/inspect.go

@@ -0,0 +1,293 @@
+package docker
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"strings"
+	"time"
+
+	"github.com/Sirupsen/logrus"
+	"github.com/codegangsta/cli"
+	"github.com/docker/distribution/digest"
+	distreference "github.com/docker/distribution/reference"
+	"github.com/docker/docker/api"
+	"github.com/docker/docker/cliconfig"
+	"github.com/docker/docker/image"
+	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/runcom/skopeo/types"
+	"golang.org/x/net/context"
+)
+
+// fallbackError wraps an error that can possibly allow fallback to a different
+// endpoint.
+type fallbackError struct {
+	// err is the error being wrapped.
+	err error
+	// confirmedV2 is set to true if it was confirmed that the registry
+	// supports the v2 protocol. This is used to limit fallbacks to the v1
+	// protocol.
+	confirmedV2 bool
+}
+
+// Error renders the FallbackError as a string.
+func (f fallbackError) Error() string {
+	return f.err.Error()
+}
+
+type manifestFetcher interface {
+	Fetch(ctx context.Context, ref reference.Named) (*types.ImageInspect, error)
+}
+
+func validateName(name string) error {
+	distref, err := distreference.ParseNamed(name)
+	if err != nil {
+		return err
+	}
+	hostname, _ := distreference.SplitHostname(distref)
+	if hostname == "" {
+		return fmt.Errorf("Please use a fully qualified repository name")
+	}
+	return nil
+}
+
+func GetData(c *cli.Context, name string) (*types.ImageInspect, error) {
+	if err := validateName(name); err != nil {
+		return nil, err
+	}
+	ref, err := reference.ParseNamed(name)
+	if err != nil {
+		return nil, err
+	}
+	repoInfo, err := registry.ParseRepositoryInfo(ref)
+	if err != nil {
+		return nil, err
+	}
+	authConfig, err := getAuthConfig(c, repoInfo.Index)
+	if err != nil {
+		return nil, err
+	}
+	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
+	//}
+
+	endpoints, err := registryService.LookupPullEndpoints(repoInfo)
+	if err != nil {
+		return nil, err
+	}
+
+	var (
+		ctx                    = context.Background()
+		lastErr                error
+		discardNoSupportErrors bool
+		imgInspect             *types.ImageInspect
+		confirmedV2            bool
+	)
+
+	for _, endpoint := range endpoints {
+		// make sure I can reach the registry, same as docker pull does
+		v1endpoint, err := endpoint.ToV1Endpoint(nil)
+		if err != nil {
+			return nil, err
+		}
+		if _, err := v1endpoint.Ping(); err != nil {
+			if strings.Contains(err.Error(), "timeout") {
+				return nil, err
+			}
+			continue
+		}
+
+		if confirmedV2 && endpoint.Version == registry.APIVersion1 {
+			logrus.Debugf("Skipping v1 endpoint %s because v2 registry was detected", endpoint.URL)
+			continue
+		}
+		logrus.Debugf("Trying to fetch image manifest of %s repository from %s %s", repoInfo.Name(), endpoint.URL, endpoint.Version)
+
+		//fetcher, err := newManifestFetcher(endpoint, repoInfo, config)
+		fetcher, err := newManifestFetcher(endpoint, repoInfo, authConfig, registryService)
+		if err != nil {
+			lastErr = err
+			continue
+		}
+
+		if imgInspect, err = fetcher.Fetch(ctx, ref); err != nil {
+			// Was this fetch cancelled? If so, don't try to fall back.
+			fallback := false
+			select {
+			case <-ctx.Done():
+			default:
+				if fallbackErr, ok := err.(fallbackError); ok {
+					fallback = true
+					confirmedV2 = confirmedV2 || fallbackErr.confirmedV2
+					err = fallbackErr.err
+				}
+			}
+			if fallback {
+				if _, ok := err.(registry.ErrNoSupport); !ok {
+					// Because we found an error that's not ErrNoSupport, discard all subsequent ErrNoSupport errors.
+					discardNoSupportErrors = true
+					// save the current error
+					lastErr = err
+				} else if !discardNoSupportErrors {
+					// Save the ErrNoSupport error, because it's either the first error or all encountered errors
+					// were also ErrNoSupport errors.
+					lastErr = err
+				}
+				continue
+			}
+			logrus.Debugf("Not continuing with error: %v", err)
+			return nil, err
+		}
+
+		return imgInspect, nil
+	}
+
+	if lastErr == nil {
+		lastErr = fmt.Errorf("no endpoints found for %s", ref.String())
+	}
+
+	return nil, lastErr
+}
+
+func newManifestFetcher(endpoint registry.APIEndpoint, repoInfo *registry.RepositoryInfo, authConfig engineTypes.AuthConfig, registryService *registry.Service) (manifestFetcher, error) {
+	switch endpoint.Version {
+	case registry.APIVersion2:
+		return &v2ManifestFetcher{
+			endpoint:   endpoint,
+			authConfig: authConfig,
+			service:    registryService,
+			repoInfo:   repoInfo,
+		}, nil
+	case registry.APIVersion1:
+		return &v1ManifestFetcher{
+			endpoint:   endpoint,
+			authConfig: authConfig,
+			service:    registryService,
+			repoInfo:   repoInfo,
+		}, nil
+	}
+	return nil, fmt.Errorf("unknown version %d for registry %s", endpoint.Version, endpoint.URL)
+}
+
+func getAuthConfig(c *cli.Context, index *registryTypes.IndexInfo) (engineTypes.AuthConfig, error) {
+	var (
+		username      = c.GlobalString("username")
+		password      = c.GlobalString("password")
+		cfg           = c.GlobalString("docker-cfg")
+		defAuthConfig = engineTypes.AuthConfig{
+			Username: c.GlobalString("username"),
+			Password: c.GlobalString("password"),
+			Email:    "stub@example.com",
+		}
+	)
+
+	// TODO(runcom): implement this to opt-in for docker-cfg, no need to make this
+	// work by default with docker's conf
+	//useDockerConf := c.GlobalString("use-docker-cfg")
+
+	if username != "" && password != "" {
+		return defAuthConfig, nil
+	}
+
+	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
+	}
+	authConfig := registry.ResolveAuthConfig(confFile.AuthConfigs, index)
+	logrus.Debugf("authConfig for %s: %v", index.Name, authConfig)
+
+	return authConfig, nil
+}
+
+func validateRepoName(name string) error {
+	if name == "" {
+		return fmt.Errorf("Repository name can't be empty")
+	}
+	if name == api.NoBaseImageSpecifier {
+		return fmt.Errorf("'%s' is a reserved name", api.NoBaseImageSpecifier)
+	}
+	return nil
+}
+
+func makeImageInspect(img *image.Image, tag string, dgst digest.Digest, tagList []string) *types.ImageInspect {
+	var digest string
+	if err := dgst.Validate(); err == nil {
+		digest = dgst.String()
+	}
+	return &types.ImageInspect{
+		Tag:             tag,
+		Digest:          digest,
+		RepoTags:        tagList,
+		Comment:         img.Comment,
+		Created:         img.Created.Format(time.RFC3339Nano),
+		ContainerConfig: &img.ContainerConfig,
+		DockerVersion:   img.DockerVersion,
+		Author:          img.Author,
+		Config:          img.Config,
+		Architecture:    img.Architecture,
+		Os:              img.OS,
+	}
+}
+
+func makeRawConfigFromV1Config(imageJSON []byte, rootfs *image.RootFS, history []image.History) (map[string]*json.RawMessage, error) {
+	var dver struct {
+		DockerVersion string `json:"docker_version"`
+	}
+
+	if err := json.Unmarshal(imageJSON, &dver); err != nil {
+		return nil, err
+	}
+
+	useFallback := versionPkg.Version(dver.DockerVersion).LessThan("1.8.3")
+
+	if useFallback {
+		var v1Image image.V1Image
+		err := json.Unmarshal(imageJSON, &v1Image)
+		if err != nil {
+			return nil, err
+		}
+		imageJSON, err = json.Marshal(v1Image)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	var c map[string]*json.RawMessage
+	if err := json.Unmarshal(imageJSON, &c); err != nil {
+		return nil, err
+	}
+
+	c["rootfs"] = rawJSON(rootfs)
+	c["history"] = rawJSON(history)
+
+	return c, nil
+}
+
+func rawJSON(value interface{}) *json.RawMessage {
+	jsonval, err := json.Marshal(value)
+	if err != nil {
+		return nil
+	}
+	return (*json.RawMessage)(&jsonval)
+}

docker/inspect_v1.go

@@ -1,4 +1,4 @@
-package main
+package docker
 
 import (
 	"encoding/json"
@@ -13,7 +13,8 @@ import (
 	"github.com/docker/docker/image/v1"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
-	"github.com/docker/engine-api/types"
+	engineTypes "github.com/docker/engine-api/types"
+	"github.com/runcom/skopeo/types"
 	"golang.org/x/net/context"
 )
 
@@ -23,14 +24,14 @@ type v1ManifestFetcher struct {
 	repo        distribution.Repository
 	confirmedV2 bool
 	// wrap in a config?
-	authConfig types.AuthConfig
+	authConfig engineTypes.AuthConfig
 	service    *registry.Service
 	session    *registry.Session
 }
 
-func (mf *v1ManifestFetcher) Fetch(ctx context.Context, ref reference.Named) (*imageInspect, error) {
+func (mf *v1ManifestFetcher) Fetch(ctx context.Context, ref reference.Named) (*types.ImageInspect, error) {
 	var (
-		imgInspect *imageInspect
+		imgInspect *types.ImageInspect
 	)
 	if _, isCanonical := ref.(reference.Canonical); isCanonical {
 		// Allowing fallback, because HTTPS v1 is before HTTP v2
@@ -65,7 +66,7 @@ func (mf *v1ManifestFetcher) Fetch(ctx context.Context, ref reference.Named) (*i
 	return imgInspect, nil
 }
 
-func (mf *v1ManifestFetcher) fetchWithSession(ctx context.Context, ref reference.Named) (*imageInspect, error) {
+func (mf *v1ManifestFetcher) fetchWithSession(ctx context.Context, ref reference.Named) (*types.ImageInspect, error) {
 	repoData, err := mf.session.GetRepositoryData(mf.repoInfo)
 	if err != nil {
 		if strings.Contains(err.Error(), "HTTP code: 404") {

docker/inspect_v2.go

@@ -1,4 +1,4 @@
-package main
+package docker
 
 import (
 	"encoding/json"
@@ -19,7 +19,8 @@ import (
 	"github.com/docker/docker/image/v1"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
-	"github.com/docker/engine-api/types"
+	engineTypes "github.com/docker/engine-api/types"
+	"github.com/runcom/skopeo/types"
 	"golang.org/x/net/context"
 )
 
@@ -29,13 +30,13 @@ type v2ManifestFetcher struct {
 	repo        distribution.Repository
 	confirmedV2 bool
 	// wrap in a config?
-	authConfig types.AuthConfig
+	authConfig engineTypes.AuthConfig
 	service    *registry.Service
 }
 
-func (mf *v2ManifestFetcher) Fetch(ctx context.Context, ref reference.Named) (*imageInspect, error) {
+func (mf *v2ManifestFetcher) Fetch(ctx context.Context, ref reference.Named) (*types.ImageInspect, error) {
 	var (
-		imgInspect *imageInspect
+		imgInspect *types.ImageInspect
 		err        error
 	)
 
@@ -58,7 +59,7 @@ func (mf *v2ManifestFetcher) Fetch(ctx context.Context, ref reference.Named) (*i
 	return imgInspect, err
 }
 
-func (mf *v2ManifestFetcher) fetchWithRepository(ctx context.Context, ref reference.Named) (*imageInspect, error) {
+func (mf *v2ManifestFetcher) fetchWithRepository(ctx context.Context, ref reference.Named) (*types.ImageInspect, error) {
 	var (
 		manifest    distribution.Manifest
 		tagOrDigest string // Used for logging/progress only

inspect.go

@@ -1,303 +1,35 @@
 package main
 
 import (
-	"encoding/json"
 	"fmt"
-	"os"
-	"strings"
-	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/codegangsta/cli"
-	"github.com/docker/distribution/digest"
-	distreference "github.com/docker/distribution/reference"
-	"github.com/docker/docker/api"
-	"github.com/docker/docker/cliconfig"
-	"github.com/docker/docker/image"
-	versionPkg "github.com/docker/docker/pkg/version"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	types "github.com/docker/engine-api/types"
-	containerTypes "github.com/docker/engine-api/types/container"
-	registryTypes "github.com/docker/engine-api/types/registry"
-	"golang.org/x/net/context"
+	"github.com/runcom/skopeo/docker"
+	"github.com/runcom/skopeo/types"
 )
 
-// fallbackError wraps an error that can possibly allow fallback to a different
-// endpoint.
-type fallbackError struct {
-	// err is the error being wrapped.
-	err error
-	// confirmedV2 is set to true if it was confirmed that the registry
-	// supports the v2 protocol. This is used to limit fallbacks to the v1
-	// protocol.
-	confirmedV2 bool
-}
+const (
+	imgTypeDocker = "docker"
+	imgTypeAppc   = "appc"
+)
 
-// Error renders the FallbackError as a string.
-func (f fallbackError) Error() string {
-	return f.err.Error()
-}
-
-type manifestFetcher interface {
-	Fetch(ctx context.Context, ref reference.Named) (*imageInspect, error)
-}
-
-type imageInspect struct {
-	Tag             string
-	Digest          string
-	RepoTags        []string
-	Comment         string
-	Created         string
-	ContainerConfig *containerTypes.Config
-	DockerVersion   string
-	Author          string
-	Config          *containerTypes.Config
-	Architecture    string
-	Os              string
-}
-
-func validateName(name string) error {
-	distref, err := distreference.ParseNamed(name)
-	if err != nil {
-		return err
-	}
-	hostname, _ := distreference.SplitHostname(distref)
-	if hostname == "" {
-		return fmt.Errorf("Please use a fully qualified repository name")
-	}
-	return nil
-}
-
-func inspect(c *cli.Context) (*imageInspect, error) {
-	name := c.Args().First()
-	if err := validateName(name); err != nil {
-		return nil, err
-	}
-	ref, err := reference.ParseNamed(name)
-	if err != nil {
-		return nil, err
-	}
-	imgInspect, err := getData(c, ref)
-	if err != nil {
-		return nil, err
+func inspect(c *cli.Context) (*types.ImageInspect, error) {
+	var (
+		imgInspect *types.ImageInspect
+		err        error
+		name       = c.Args().First()
+		imgType    = c.GlobalString("img-type")
+	)
+	switch imgType {
+	case imgTypeDocker:
+		imgInspect, err = docker.GetData(c, name)
+		if err != nil {
+			return nil, err
+		}
+	case imgTypeAppc:
+		return nil, fmt.Errorf("sorry, not implemented yet")
+	default:
+		return nil, fmt.Errorf("%s image type is invalid, please use either 'docker' or 'appc'", imgType)
 	}
 	return imgInspect, nil
 }
-
-func getData(c *cli.Context, ref reference.Named) (*imageInspect, error) {
-	repoInfo, err := registry.ParseRepositoryInfo(ref)
-	if err != nil {
-		return nil, err
-	}
-	authConfig, err := getAuthConfig(c, repoInfo.Index)
-	if err != nil {
-		return nil, err
-	}
-	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
-	//}
-
-	endpoints, err := registryService.LookupPullEndpoints(repoInfo)
-	if err != nil {
-		return nil, err
-	}
-
-	var (
-		ctx                    = context.Background()
-		lastErr                error
-		discardNoSupportErrors bool
-		imgInspect             *imageInspect
-		confirmedV2            bool
-	)
-
-	for _, endpoint := range endpoints {
-		// make sure I can reach the registry, same as docker pull does
-		v1endpoint, err := endpoint.ToV1Endpoint(nil)
-		if err != nil {
-			return nil, err
-		}
-		if _, err := v1endpoint.Ping(); err != nil {
-			if strings.Contains(err.Error(), "timeout") {
-				return nil, err
-			}
-			continue
-		}
-
-		if confirmedV2 && endpoint.Version == registry.APIVersion1 {
-			logrus.Debugf("Skipping v1 endpoint %s because v2 registry was detected", endpoint.URL)
-			continue
-		}
-		logrus.Debugf("Trying to fetch image manifest of %s repository from %s %s", repoInfo.Name(), endpoint.URL, endpoint.Version)
-
-		//fetcher, err := newManifestFetcher(endpoint, repoInfo, config)
-		fetcher, err := newManifestFetcher(endpoint, repoInfo, authConfig, registryService)
-		if err != nil {
-			lastErr = err
-			continue
-		}
-
-		if imgInspect, err = fetcher.Fetch(ctx, ref); err != nil {
-			// Was this fetch cancelled? If so, don't try to fall back.
-			fallback := false
-			select {
-			case <-ctx.Done():
-			default:
-				if fallbackErr, ok := err.(fallbackError); ok {
-					fallback = true
-					confirmedV2 = confirmedV2 || fallbackErr.confirmedV2
-					err = fallbackErr.err
-				}
-			}
-			if fallback {
-				if _, ok := err.(registry.ErrNoSupport); !ok {
-					// Because we found an error that's not ErrNoSupport, discard all subsequent ErrNoSupport errors.
-					discardNoSupportErrors = true
-					// save the current error
-					lastErr = err
-				} else if !discardNoSupportErrors {
-					// Save the ErrNoSupport error, because it's either the first error or all encountered errors
-					// were also ErrNoSupport errors.
-					lastErr = err
-				}
-				continue
-			}
-			logrus.Debugf("Not continuing with error: %v", err)
-			return nil, err
-		}
-
-		return imgInspect, nil
-	}
-
-	if lastErr == nil {
-		lastErr = fmt.Errorf("no endpoints found for %s", ref.String())
-	}
-
-	return nil, lastErr
-}
-
-func newManifestFetcher(endpoint registry.APIEndpoint, repoInfo *registry.RepositoryInfo, authConfig types.AuthConfig, registryService *registry.Service) (manifestFetcher, error) {
-	switch endpoint.Version {
-	case registry.APIVersion2:
-		return &v2ManifestFetcher{
-			endpoint:   endpoint,
-			authConfig: authConfig,
-			service:    registryService,
-			repoInfo:   repoInfo,
-		}, nil
-	case registry.APIVersion1:
-		return &v1ManifestFetcher{
-			endpoint:   endpoint,
-			authConfig: authConfig,
-			service:    registryService,
-			repoInfo:   repoInfo,
-		}, nil
-	}
-	return nil, fmt.Errorf("unknown version %d for registry %s", endpoint.Version, endpoint.URL)
-}
-
-func getAuthConfig(c *cli.Context, index *registryTypes.IndexInfo) (types.AuthConfig, error) {
-	var (
-		username = c.GlobalString("username")
-		password = c.GlobalString("password")
-		cfg      = c.GlobalString("docker-cfg")
-	)
-	if _, err := os.Stat(cfg); err != nil {
-		logrus.Infof("Docker cli config file %q not found: %v, falling back to --username and --password if needed", cfg, err)
-		return types.AuthConfig{
-			Username: username,
-			Password: password,
-			Email:    "stub@example.com",
-		}, nil
-	}
-	confFile, err := cliconfig.Load(cfg)
-	if err != nil {
-		return types.AuthConfig{}, err
-	}
-	authConfig := registry.ResolveAuthConfig(confFile.AuthConfigs, index)
-	logrus.Debugf("authConfig for %s: %v", index.Name, authConfig)
-
-	return authConfig, nil
-}
-
-func validateRepoName(name string) error {
-	if name == "" {
-		return fmt.Errorf("Repository name can't be empty")
-	}
-	if name == api.NoBaseImageSpecifier {
-		return fmt.Errorf("'%s' is a reserved name", api.NoBaseImageSpecifier)
-	}
-	return nil
-}
-
-func makeImageInspect(img *image.Image, tag string, dgst digest.Digest, tagList []string) *imageInspect {
-	var digest string
-	if err := dgst.Validate(); err == nil {
-		digest = dgst.String()
-	}
-	return &imageInspect{
-		Tag:             tag,
-		Digest:          digest,
-		RepoTags:        tagList,
-		Comment:         img.Comment,
-		Created:         img.Created.Format(time.RFC3339Nano),
-		ContainerConfig: &img.ContainerConfig,
-		DockerVersion:   img.DockerVersion,
-		Author:          img.Author,
-		Config:          img.Config,
-		Architecture:    img.Architecture,
-		Os:              img.OS,
-	}
-}
-
-func makeRawConfigFromV1Config(imageJSON []byte, rootfs *image.RootFS, history []image.History) (map[string]*json.RawMessage, error) {
-	var dver struct {
-		DockerVersion string `json:"docker_version"`
-	}
-
-	if err := json.Unmarshal(imageJSON, &dver); err != nil {
-		return nil, err
-	}
-
-	useFallback := versionPkg.Version(dver.DockerVersion).LessThan("1.8.3")
-
-	if useFallback {
-		var v1Image image.V1Image
-		err := json.Unmarshal(imageJSON, &v1Image)
-		if err != nil {
-			return nil, err
-		}
-		imageJSON, err = json.Marshal(v1Image)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	var c map[string]*json.RawMessage
-	if err := json.Unmarshal(imageJSON, &c); err != nil {
-		return nil, err
-	}
-
-	c["rootfs"] = rawJSON(rootfs)
-	c["history"] = rawJSON(history)
-
-	return c, nil
-}
-
-func rawJSON(value interface{}) *json.RawMessage {
-	jsonval, err := json.Marshal(value)
-	if err != nil {
-		return nil
-	}
-	return (*json.RawMessage)(&jsonval)
-}

integration/check_test.go

@@ -84,11 +84,7 @@ func (s *SkopeoSuite) TestVersion(c *check.C) {
 func (s *SkopeoSuite) TestCanAuthToPrivateRegistryV2WithoutDockerCfg(c *check.C) {
 	out, err := exec.Command(skopeoBinary, "--docker-cfg=''", "--username="+s.regV2WithAuth.username, "--password="+s.regV2WithAuth.password, fmt.Sprintf("%s/busybox:latest", s.regV2WithAuth.url)).CombinedOutput()
 	c.Assert(err, check.NotNil, check.Commentf(string(out)))
-	wanted := "falling back to --username and --password if needed"
-	if !strings.Contains(string(out), wanted) {
-		c.Fatalf("wanted %s, got %s", wanted, string(out))
-	}
-	wanted = "Error: image busybox not found"
+	wanted := "Error: image busybox not found"
 	if !strings.Contains(string(out), wanted) {
 		c.Fatalf("wanted %s, got %s", wanted, string(out))
 	}
@@ -97,11 +93,7 @@ func (s *SkopeoSuite) TestCanAuthToPrivateRegistryV2WithoutDockerCfg(c *check.C)
 func (s *SkopeoSuite) TestNeedAuthToPrivateRegistryV2WithoutDockerCfg(c *check.C) {
 	out, err := exec.Command(skopeoBinary, "--docker-cfg=''", fmt.Sprintf("%s/busybox:latest", s.regV2WithAuth.url)).CombinedOutput()
 	c.Assert(err, check.NotNil, check.Commentf(string(out)))
-	wanted := "falling back to --username and --password if needed"
-	if !strings.Contains(string(out), wanted) {
-		c.Fatalf("wanted %s, got %s", wanted, string(out))
-	}
-	wanted = "no basic auth credentials"
+	wanted := "no basic auth credentials"
 	if !strings.Contains(string(out), wanted) {
 		c.Fatalf("wanted %s, got %s", wanted, string(out))
 	}

main.go

@@ -11,7 +11,7 @@ import (
 )
 
 const (
-	version = "0.1.3"
+	version = "0.1.5-dev"
 	usage   = "inspect images on a registry"
 )
 
@@ -52,6 +52,11 @@ 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") {

skopeo.spec

@@ -1,241 +0,0 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 0
-%global with_bundled 1
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 0
-%else
-%global with_devel 0
-%global with_bundled 1
-%global with_debug 1
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package   %{nil}
-%endif
-
-%global provider        github
-%global provider_tld    com
-%global project         runcom
-%global repo            skopeo
-# https://github.com/runcom/skopeo
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path     %{provider_prefix}
-%global commit          572a6b6f537d71f7cabfdcfe185c6d7cb4367272
-%global shortcommit     %(c=%{commit}; echo ${c:0:7})
-
-Name:           skopeo
-Version:        0.1.3
-Release:        0.1.git%{shortcommit}%{?dist}
-Summary:        Inspect Docker images and repositories on registries
-License:        MIT
-URL:            https://%{provider_prefix}
-Source0:        https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch:  %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary:       %{summary}
-BuildArch:     noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang >= 1.5
-BuildRequires: golang-github-cpuguy83-go-md2man
-BuildRequires: golang(github.com/Azure/go-ansiterm/winterm)
-BuildRequires: golang(github.com/Sirupsen/logrus)
-BuildRequires: golang(github.com/docker/distribution)
-BuildRequires: golang(github.com/docker/distribution/context)
-BuildRequires: golang(github.com/docker/distribution/digest)
-BuildRequires: golang(github.com/docker/distribution/manifest)
-BuildRequires: golang(github.com/docker/distribution/manifest/manifestlist)
-BuildRequires: golang(github.com/docker/distribution/manifest/schema1)
-BuildRequires: golang(github.com/docker/distribution/manifest/schema2)
-BuildRequires: golang(github.com/docker/distribution/reference)
-BuildRequires: golang(github.com/docker/distribution/registry/api/errcode)
-BuildRequires: golang(github.com/docker/distribution/registry/api/v2)
-BuildRequires: golang(github.com/docker/distribution/registry/client)
-BuildRequires: golang(github.com/docker/distribution/registry/client/auth)
-BuildRequires: golang(github.com/docker/distribution/registry/client/transport)
-BuildRequires: golang(github.com/docker/distribution/registry/storage/cache)
-BuildRequires: golang(github.com/docker/distribution/registry/storage/cache/memory)
-BuildRequires: golang(github.com/docker/distribution/uuid)
-BuildRequires: golang(github.com/docker/docker/api)
-BuildRequires: golang(github.com/docker/docker/daemon/graphdriver)
-BuildRequires: golang(github.com/docker/docker/distribution/metadata)
-BuildRequires: golang(github.com/docker/docker/distribution/xfer)
-BuildRequires: golang(github.com/docker/docker/dockerversion)
-BuildRequires: golang(github.com/docker/docker/image)
-BuildRequires: golang(github.com/docker/docker/image/v1)
-BuildRequires: golang(github.com/docker/docker/layer)
-BuildRequires: golang(github.com/docker/docker/opts)
-BuildRequires: golang(github.com/docker/docker/pkg/archive)
-BuildRequires: golang(github.com/docker/docker/pkg/chrootarchive)
-BuildRequires: golang(github.com/docker/docker/pkg/fileutils)
-BuildRequires: golang(github.com/docker/docker/pkg/homedir)
-BuildRequires: golang(github.com/docker/docker/pkg/httputils)
-BuildRequires: golang(github.com/docker/docker/pkg/idtools)
-BuildRequires: golang(github.com/docker/docker/pkg/ioutils)
-BuildRequires: golang(github.com/docker/docker/pkg/jsonlog)
-BuildRequires: golang(github.com/docker/docker/pkg/jsonmessage)
-BuildRequires: golang(github.com/docker/docker/pkg/longpath)
-BuildRequires: golang(github.com/docker/docker/pkg/mflag)
-BuildRequires: golang(github.com/docker/docker/pkg/parsers/kernel)
-BuildRequires: golang(github.com/docker/docker/pkg/plugins)
-BuildRequires: golang(github.com/docker/docker/pkg/pools)
-BuildRequires: golang(github.com/docker/docker/pkg/progress)
-BuildRequires: golang(github.com/docker/docker/pkg/promise)
-BuildRequires: golang(github.com/docker/docker/pkg/random)
-BuildRequires: golang(github.com/docker/docker/pkg/reexec)
-BuildRequires: golang(github.com/docker/docker/pkg/stringid)
-BuildRequires: golang(github.com/docker/docker/pkg/system)
-BuildRequires: golang(github.com/docker/docker/pkg/tarsum)
-BuildRequires: golang(github.com/docker/docker/pkg/term)
-BuildRequires: golang(github.com/docker/docker/pkg/term/windows)
-BuildRequires: golang(github.com/docker/docker/pkg/useragent)
-BuildRequires: golang(github.com/docker/docker/pkg/version)
-BuildRequires: golang(github.com/docker/docker/reference)
-BuildRequires: golang(github.com/docker/docker/registry)
-BuildRequires: golang(github.com/docker/engine-api/types)
-BuildRequires: golang(github.com/docker/engine-api/types/blkiodev)
-BuildRequires: golang(github.com/docker/engine-api/types/container)
-BuildRequires: golang(github.com/docker/engine-api/types/filters)
-BuildRequires: golang(github.com/docker/engine-api/types/image)
-BuildRequires: golang(github.com/docker/engine-api/types/network)
-BuildRequires: golang(github.com/docker/engine-api/types/registry)
-BuildRequires: golang(github.com/docker/engine-api/types/strslice)
-BuildRequires: golang(github.com/docker/go-connections/nat)
-BuildRequires: golang(github.com/docker/go-connections/tlsconfig)
-BuildRequires: golang(github.com/docker/go-units)
-BuildRequires: golang(github.com/docker/libtrust)
-BuildRequires: golang(github.com/gorilla/context)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/opencontainers/runc/libcontainer/user)
-BuildRequires: golang(github.com/vbatts/tar-split/archive/tar)
-BuildRequires: golang(github.com/vbatts/tar-split/tar/asm)
-BuildRequires: golang(github.com/vbatts/tar-split/tar/storage)
-BuildRequires: golang(golang.org/x/net/context)
-%endif
-
-%if 0%{?with_bundled}
-BuildRequires: golang >= 1.5
-BuildRequires: golang-github-cpuguy83-go-md2man
-%endif
-
-%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary:         Unit tests for %{name} package
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires:        %{name}-devel = %{version}-%{release}
-
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
-
-%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
-mkdir -p ./_build/src/github.com/runcom
-ln -s $(pwd) ./_build/src/github.com/runcom/skopeo
-export GOPATH=$(pwd)/_build:%{gopath}
-export GO15VENDOREXPERIMENT=1
-cd $(pwd)/_build/src/github.com/runcom/skopeo && %gobuild -o skopeo .
-
-%install
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-make DESTDIR=%{buildroot} install
-
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
-    echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
-    install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
-    cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
-    echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
-    echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
-    install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
-    cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
-    echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
-
-%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%gotest %{import_path}/integration
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%doc README.md
-%endif
-
-%files
-%{_bindir}/skopeo
-%{_mandir}/man1/skopeo.1*
-%doc README.md LICENSE
-
-%changelog
-#
-# TODO(runcom): change the commit has below!!!!
-#
-* Thu Jan 28 2016 Antonio Murdaca <amurdaca@redhat.com> - 0.1.3-0.1.git572a6b6
-- First package for Fedora

types/types.go

@@ -0,0 +1,19 @@
+package types
+
+import (
+	containerTypes "github.com/docker/engine-api/types/container"
+)
+
+type ImageInspect struct {
+	Tag             string
+	Digest          string
+	RepoTags        []string
+	Comment         string
+	Created         string
+	ContainerConfig *containerTypes.Config
+	DockerVersion   string
+	Author          string
+	Config          *containerTypes.Config
+	Architecture    string
+	Os              string
+}