From bc5835ba2ddbfebf83017e1f48e004852c5329d6 Mon Sep 17 00:00:00 2001
From: Stephen J Day <stephen.day@docker.com>
Date: Thu, 6 Aug 2015 17:03:05 -0700
Subject: [PATCH] Remove dist tool from distribution

We are headed in a different direction. The dist tool analog will not be a part
of this repository.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
---
 Makefile         |  6 +-----
 README.md        |  1 -
 cmd/dist/list.go | 14 --------------
 cmd/dist/main.go | 21 ---------------------
 cmd/dist/pull.go | 21 ---------------------
 cmd/dist/push.go | 21 ---------------------
 docs/building.md |  1 -
 7 files changed, 1 insertion(+), 84 deletions(-)
 delete mode 100644 cmd/dist/list.go
 delete mode 100644 cmd/dist/main.go
 delete mode 100644 cmd/dist/pull.go
 delete mode 100644 cmd/dist/push.go

diff --git a/Makefile b/Makefile
index 0a8d77ae..b9dbf66a 100644
--- a/Makefile
+++ b/Makefile
@@ -32,10 +32,6 @@ ${PREFIX}/bin/registry-api-descriptor-template: version/version.go $(shell find
 	@echo "+ $@"
 	@go build -o $@ ${GO_LDFLAGS} ${GO_GCFLAGS} ./cmd/registry-api-descriptor-template
 
-${PREFIX}/bin/dist: version/version.go $(shell find . -type f -name '*.go')
-	@echo "+ $@"
-	@go build -o $@ ${GO_LDFLAGS} ${GO_GCFLAGS} ./cmd/dist
-
 docs/spec/api.md: docs/spec/api.md.tmpl ${PREFIX}/bin/registry-api-descriptor-template
 	./bin/registry-api-descriptor-template $< > $@
 
@@ -66,7 +62,7 @@ test-full:
 	@echo "+ $@"
 	@go test ./...
 
-binaries: ${PREFIX}/bin/registry ${PREFIX}/bin/registry-api-descriptor-template ${PREFIX}/bin/dist
+binaries: ${PREFIX}/bin/registry ${PREFIX}/bin/registry-api-descriptor-template
 	@echo "+ $@"
 
 clean:
diff --git a/README.md b/README.md
index ce215887..f7521669 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,6 @@ This repository contains the following components:
 |--------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **registry**       | An implementation of the [Docker Registry HTTP API V2](docs/spec/api.md) for use with docker 1.6+.                                                                                                  |
 | **libraries**      | A rich set of libraries for interacting with,distribution components. Please see [godoc](http://godoc.org/github.com/docker/distribution) for details. **Note**: These libraries are **unstable**. |
-| **dist**           | An _experimental_ tool to provide distribution, oriented functionality without the `docker` daemon.                                                                                                |
 | **specifications** | _Distribution_ related specifications are available in [docs/spec](docs/spec)                                                                                                                        |
 | **documentation**  | Docker's full documentation set is available at [docs.docker.com](http://docs.docker.com). This repository [contains the subset](docs/index.md) related just to the registry.                                                                                                                                          |
 
diff --git a/cmd/dist/list.go b/cmd/dist/list.go
deleted file mode 100644
index e540d4d8..00000000
--- a/cmd/dist/list.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package main
-
-import "github.com/codegangsta/cli"
-
-var (
-	commandList = cli.Command{
-		Name:   "images",
-		Usage:  "List available images",
-		Action: imageList,
-	}
-)
-
-func imageList(c *cli.Context) {
-}
diff --git a/cmd/dist/main.go b/cmd/dist/main.go
deleted file mode 100644
index 34a2b514..00000000
--- a/cmd/dist/main.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"github.com/codegangsta/cli"
-)
-
-func main() {
-	app := cli.NewApp()
-	app.Name = "dist"
-	app.Usage = "Package and ship Docker content"
-
-	app.Action = commandList.Action
-	app.Commands = []cli.Command{
-		commandList,
-		commandPull,
-		commandPush,
-	}
-	app.Run(os.Args)
-}
diff --git a/cmd/dist/pull.go b/cmd/dist/pull.go
deleted file mode 100644
index 8f96129c..00000000
--- a/cmd/dist/pull.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package main
-
-import "github.com/codegangsta/cli"
-
-var (
-	commandPull = cli.Command{
-		Name:   "pull",
-		Usage:  "Pull and verify an image from a registry",
-		Action: imagePull,
-		Flags: []cli.Flag{
-			cli.StringFlag{
-				Name:  "r,registry",
-				Value: "hub.docker.io",
-				Usage: "Registry to use (e.g.: localhost:5000)",
-			},
-		},
-	}
-)
-
-func imagePull(c *cli.Context) {
-}
diff --git a/cmd/dist/push.go b/cmd/dist/push.go
deleted file mode 100644
index c39922aa..00000000
--- a/cmd/dist/push.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package main
-
-import "github.com/codegangsta/cli"
-
-var (
-	commandPush = cli.Command{
-		Name:   "push",
-		Usage:  "Push an image to a registry",
-		Action: imagePush,
-		Flags: []cli.Flag{
-			cli.StringFlag{
-				Name:  "r,registry",
-				Value: "hub.docker.io",
-				Usage: "Registry to use (e.g.: localhost:5000)",
-			},
-		},
-	}
-)
-
-func imagePush(*cli.Context) {
-}
diff --git a/docs/building.md b/docs/building.md
index b54322c8..18c42b92 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -99,7 +99,6 @@ ok    github.com/docker/distribution/registry/auth/silly  0.011s
 ...
 + /Users/sday/go/src/github.com/docker/distribution/bin/registry
 + /Users/sday/go/src/github.com/docker/distribution/bin/registry-api-descriptor-template
-+ /Users/sday/go/src/github.com/docker/distribution/bin/dist
 + binaries
 ```