Fix validation

Signed-off-by: Derek McGowan <derek@mcgstyle.net>

api/types/container/container_wait.go

@@ -7,6 +7,14 @@ package container
 // See hack/generate-swagger-api.sh
 // ----------------------------------------------------------------------------
 
+// ContainerWaitOKBodyError container waiting error, if any
+// swagger:model ContainerWaitOKBodyError
+type ContainerWaitOKBodyError struct {
+
+	// Details of an error
+	Message string `json:"Message,omitempty"`
+}
+
 // ContainerWaitOKBody OK response to ContainerWait operation
 // swagger:model ContainerWaitOKBody
 type ContainerWaitOKBody struct {
@@ -19,11 +27,3 @@ type ContainerWaitOKBody struct {
 	// Required: true
 	StatusCode int64 `json:"StatusCode"`
 }
-
-// ContainerWaitOKBodyError container waiting error, if any
-// swagger:model ContainerWaitOKBodyError
-type ContainerWaitOKBodyError struct {
-
-	// Details of an error
-	Message string `json:"Message,omitempty"`
-}

builder/dockerfile/imagecontext.go

@@ -130,7 +130,8 @@ type containerdImage struct {
 	config        *container.Config
 }
 
-func NewContainerdImage(desc ocispec.Descriptor, client *containerd.Client, config *container.Config) *containerdImage {
+// NewContainerdImage returns a containerd image given a container config
+func NewContainerdImage(desc ocispec.Descriptor, client *containerd.Client, config *container.Config) builder.Image {
 	return &containerdImage{desc: desc, containerdCli: client, config: config}
 }
 

daemon/images/image_prune.go

@@ -9,16 +9,16 @@ import (
 	"github.com/pkg/errors"
 )
 
-var imagesAcceptedFilters = map[string]bool{
-	"dangling": true,
-	"label":    true,
-	"label!":   true,
-	"until":    true,
-}
+//var imagesAcceptedFilters = map[string]bool{
+//	"dangling": true,
+//	"label":    true,
+//	"label!":   true,
+//	"until":    true,
+//}
 
 // errPruneRunning is returned when a prune request is received while
 // one is in progress
-var errPruneRunning = errdefs.Conflict(errors.New("a prune operation is already running"))
+//var errPruneRunning = errdefs.Conflict(errors.New("a prune operation is already running"))
 
 // ImagesPrune removes unused images
 func (i *ImageService) ImagesPrune(ctx context.Context, pruneFilters filters.Args) (*types.ImagesPruneReport, error) {

daemon/migration.go

@@ -23,6 +23,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
+// Migrate migrates the given root directory to containerd
 func (d *Daemon) Migrate(ctx context.Context, root string) error {
 	if d.containerdCli == nil {
 		return errors.New("unable to migrate without containerd")
@@ -138,8 +139,8 @@ type DistributionServices struct {
 
 // DistributionServices returns services controlling daemon storage
 // TODO(containerd): Remove this
-func (daemon *Daemon) DistributionServices() (DistributionServices, error) {
-	ls, err := daemon.imageService.GetLayerStore(platforms.DefaultSpec())
+func (d *Daemon) DistributionServices() (DistributionServices, error) {
+	ls, err := d.imageService.GetLayerStore(platforms.DefaultSpec())
 	if err != nil {
 		return DistributionServices{}, err
 	}

image/fs.go

@@ -178,6 +178,7 @@ func (s *fs) DeleteMetadata(dgst digest.Digest, key string) error {
 	return os.RemoveAll(filepath.Join(s.metadataDir(dgst), key))
 }
 
+// MigrateImageStore migrates the given image store to containerd content store
 func MigrateImageStore(ctx context.Context, from StoreBackend, to content.Store, labelParent string) error {
 	print(`Migrating image store `)
 	num := 0

reference/store.go

@@ -39,6 +39,7 @@ type Store interface {
 // RefWalkFunc is a callback function type used by WalkableStore.Walk
 type RefWalkFunc func(a reference.Named) error
 
+// WalkableStore represents a walkable reference store
 type WalkableStore interface {
 	Store
 	Walk(f RefWalkFunc) error