Merge pull request #2026 from dperny/service-logs-support-tty

Error when attempting to do logs on TTY service
moby · Mar 9, 2017 · 54cfa17 · 54cfa17
2 parents e928827 + 8da4f81
commit 54cfa17
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/agent/exec/dockerapi/adapter.go b/agent/exec/dockerapi/adapter.go
@@ -259,6 +259,11 @@ func (c *containerAdapter) createVolumes(ctx context.Context) error {
 }
 
 func (c *containerAdapter) logs(ctx context.Context, options api.LogSubscriptionOptions) (io.ReadCloser, error) {
+	conf := c.container.config()
+	if conf != nil && conf.Tty {
+		return nil, errors.New("logs not supported on services with TTY")
+	}
+
 	apiOptions := types.ContainerLogsOptions{
 		Follow:     options.Follow,
 		Timestamps: true,