4 files changed, 53 insertions, 16 deletions

diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index f9e200ff3..3a904ba87 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -103,7 +103,7 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
 		utils.InternalServerError(w, err)
 		return
 	}
-	if _, found := r.URL.Query()["limit"]; found && query.Limit != -1 {
+	if _, found := r.URL.Query()["limit"]; found && query.Limit > 0 {
 		last := query.Limit
 		if len(containers) > last {
 			containers = containers[len(containers)-last:]
@@ -193,6 +193,7 @@ func KillContainer(w http.ResponseWriter, r *http.Request) {
 	err = con.Kill(signal)
 	if err != nil {
 		utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrapf(err, "unable to kill Container %s", name))
+		return
 	}
 
 	// Docker waits for the container to stop if the signal is 0 or
diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go
index 93e4fe540..1d0b4c45d 100644
--- a/pkg/api/handlers/compat/containers_create.go
+++ b/pkg/api/handlers/compat/containers_create.go
@@ -210,7 +210,7 @@ func makeCreateConfig(ctx context.Context, containerConfig *config.Config, input
 		ImageID:           newImage.ID(),
 		BuiltinImgVolumes: nil, // podman
 		ImageVolumeType:   "",  // podman
-		Interactive:       false,
+		Interactive:       input.OpenStdin,
 		// IpcMode:           input.HostConfig.IpcMode,
 		Labels:    input.Labels,
 		LogDriver: input.HostConfig.LogConfig.Type, // is this correct
diff --git a/pkg/api/handlers/compat/containers_logs.go b/pkg/api/handlers/compat/containers_logs.go
index f6d4a518e..d24b7d959 100644
--- a/pkg/api/handlers/compat/containers_logs.go
+++ b/pkg/api/handlers/compat/containers_logs.go
@@ -105,6 +105,18 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) {
 
 	var frame strings.Builder
 	header := make([]byte, 8)
+
+	writeHeader := true
+	// Docker does not write stream headers iff the container has a tty.
+	if !utils.IsLibpodRequest(r) {
+		inspectData, err := ctnr.Inspect(false)
+		if err != nil {
+			utils.InternalServerError(w, errors.Wrapf(err, "Failed to obtain logs for Container '%s'", name))
+			return
+		}
+		writeHeader = !inspectData.Config.Tty
+	}
+
 	for line := range logChannel {
 		if _, found := r.URL.Query()["until"]; found {
 			if line.Time.After(until) {
@@ -138,10 +150,13 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) {
 		}
 		frame.WriteString(line.Msg)
 
-		binary.BigEndian.PutUint32(header[4:], uint32(frame.Len()))
-		if _, err := w.Write(header[0:8]); err != nil {
-			log.Errorf("unable to write log output header: %q", err)
+		if writeHeader {
+			binary.BigEndian.PutUint32(header[4:], uint32(frame.Len()))
+			if _, err := w.Write(header[0:8]); err != nil {
+				log.Errorf("unable to write log output header: %q", err)
+			}
 		}
+
 		if _, err := io.WriteString(w, frame.String()); err != nil {
 			log.Errorf("unable to write frame string: %q", err)
 		}
diff --git a/pkg/api/handlers/compat/containers_stats.go b/pkg/api/handlers/compat/containers_stats.go
index 3d7d49ad3..16bd0518a 100644
--- a/pkg/api/handlers/compat/containers_stats.go
+++ b/pkg/api/handlers/compat/containers_stats.go
@@ -75,32 +75,48 @@ func StatsContainer(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	for ok := true; ok; ok = query.Stream {
+	// Write header and content type.
+	w.WriteHeader(http.StatusOK)
+	w.Header().Add("Content-Type", "application/json")
+	if flusher, ok := w.(http.Flusher); ok {
+		flusher.Flush()
+	}
+
+	// Setup JSON encoder for streaming.
+	coder := json.NewEncoder(w)
+	coder.SetEscapeHTML(true)
+
+streamLabel: // A label to flatten the scope
+	select {
+	case <-r.Context().Done():
+		logrus.Debugf("Client connection (container stats) cancelled")
+
+	default:
 		// Container stats
 		stats, err := ctnr.GetContainerStats(stats)
 		if err != nil {
-			utils.InternalServerError(w, err)
+			logrus.Errorf("Unable to get container stats: %v", err)
 			return
 		}
 		inspect, err := ctnr.Inspect(false)
 		if err != nil {
-			utils.InternalServerError(w, err)
+			logrus.Errorf("Unable to inspect container: %v", err)
 			return
 		}
 		// Cgroup stats
 		cgroupPath, err := ctnr.CGroupPath()
 		if err != nil {
-			utils.InternalServerError(w, err)
+			logrus.Errorf("Unable to get cgroup path of container: %v", err)
 			return
 		}
 		cgroup, err := cgroups.Load(cgroupPath)
 		if err != nil {
-			utils.InternalServerError(w, err)
+			logrus.Errorf("Unable to load cgroup: %v", err)
 			return
 		}
 		cgroupStat, err := cgroup.Stat()
 		if err != nil {
-			utils.InternalServerError(w, err)
+			logrus.Errorf("Unable to get cgroup stats: %v", err)
 			return
 		}
 
@@ -175,11 +191,18 @@ func StatsContainer(w http.ResponseWriter, r *http.Request) {
 			Networks: net,
 		}
 
-		utils.WriteJSON(w, http.StatusOK, s)
+		if err := coder.Encode(s); err != nil {
+			logrus.Errorf("Unable to encode stats: %v", err)
+			return
+		}
 		if flusher, ok := w.(http.Flusher); ok {
 			flusher.Flush()
 		}
 
+		if !query.Stream {
+			return
+		}
+
 		preRead = s.Read
 		bits, err := json.Marshal(s.CPUStats)
 		if err != nil {
@@ -189,10 +212,8 @@ func StatsContainer(w http.ResponseWriter, r *http.Request) {
 			logrus.Errorf("Unable to unmarshal previous stats: %q", err)
 		}
 
-		// Only sleep when we're streaming.
-		if query.Stream {
-			time.Sleep(DefaultStatsPeriod)
-		}
+		time.Sleep(DefaultStatsPeriod)
+		goto streamLabel
 	}
 }