From c106ed32ea7613573a2081d47ad2498429ac86f2 Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume@dotcloud.com>
Date: Mon, 17 Jun 2013 15:40:04 -0700
Subject: [PATCH] Move the attach prevention from server to client

---
 commands.go | 4 ++++
 server.go   | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/commands.go b/commands.go
index ce15fd6cf1..4297ac0c11 100644
--- a/commands.go
+++ b/commands.go
@@ -1058,6 +1058,10 @@ func (cli *DockerCli) CmdAttach(args ...string) error {
 		return err
 	}
 
+	if !container.State.Running {
+		return fmt.Errorf("Impossible to attach to a stopped container, start it first")
+	}
+
 	splitStderr := container.Config.Tty
 
 	connections := 1
diff --git a/server.go b/server.go
index 30e3ec6b3a..ece6a93ceb 100644
--- a/server.go
+++ b/server.go
@@ -930,9 +930,6 @@ func (srv *Server) ContainerAttach(name string, logs, stream, stdin, stdout, std
 		if container.State.Ghost {
 			return fmt.Errorf("Impossible to attach to a ghost container")
 		}
-		if !container.State.Running {
-			return fmt.Errorf("Impossible to attach to a stopped container, start it first")
-		}
 
 		var (
 			cStdin           io.ReadCloser