2 files changed, 26 insertions, 9 deletions
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index b103e399d..5c76ab4f5 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -321,17 +321,17 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
 
 	stopTimeout := int(l.StopTimeout())
 
-	ports := make(nat.PortSet)
-	for p := range inspect.HostConfig.PortBindings {
-		splitp := strings.SplitN(p, "/", 2)
+	exposedPorts := make(nat.PortSet)
+	for ep := range inspect.HostConfig.PortBindings {
+		splitp := strings.SplitN(ep, "/", 2)
 		if len(splitp) != 2 {
-			return nil, errors.Errorf("PORT/PROTOCOL Format required for %q", p)
+			return nil, errors.Errorf("PORT/PROTOCOL Format required for %q", ep)
 		}
-		port, err := nat.NewPort(splitp[1], splitp[0])
+		exposedPort, err := nat.NewPort(splitp[1], splitp[0])
 		if err != nil {
 			return nil, err
 		}
-		ports[port] = struct{}{}
+		exposedPorts[exposedPort] = struct{}{}
 	}
 
 	config := container.Config{
@@ -341,7 +341,7 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
 		AttachStdin:     inspect.Config.AttachStdin,
 		AttachStdout:    inspect.Config.AttachStdout,
 		AttachStderr:    inspect.Config.AttachStderr,
-		ExposedPorts:    ports,
+		ExposedPorts:    exposedPorts,
 		Tty:             inspect.Config.Tty,
 		OpenStdin:       inspect.Config.OpenStdin,
 		StdinOnce:       inspect.Config.StdinOnce,
@@ -371,6 +371,15 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
 		return nil, err
 	}
 
+	p, err := json.Marshal(inspect.NetworkSettings.Ports)
+	if err != nil {
+		return nil, err
+	}
+	ports := nat.PortMap{}
+	if err := json.Unmarshal(p, &ports); err != nil {
+		return nil, err
+	}
+
 	networkSettingsDefault := types.DefaultNetworkSettings{
 		EndpointID:          "",
 		Gateway:             "",
@@ -382,8 +391,12 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
 		MacAddress:          l.Config().StaticMAC.String(),
 	}
 
+	networkSettingsBase := types.NetworkSettingsBase{
+		Ports: ports,
+	}
+
 	networkSettings := types.NetworkSettings{
-		NetworkSettingsBase:    types.NetworkSettingsBase{},
+		NetworkSettingsBase:    networkSettingsBase,
 		DefaultNetworkSettings: networkSettingsDefault,
 		Networks:               nil,
 	}
diff --git a/pkg/api/handlers/compat/events.go b/pkg/api/handlers/compat/events.go
index 577ddd0a1..fca50c321 100644
--- a/pkg/api/handlers/compat/events.go
+++ b/pkg/api/handlers/compat/events.go
@@ -1,6 +1,7 @@
 package compat
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 
@@ -45,13 +46,15 @@ func GetEvents(w http.ResponseWriter, r *http.Request) {
 		fromStart = true
 	}
 
+	eventCtx, eventCancel := context.WithCancel(r.Context())
 	eventChannel := make(chan *events.Event)
 	go func() {
 		readOpts := events.ReadOptions{FromStart: fromStart, Stream: query.Stream, Filters: libpodFilters, EventChannel: eventChannel, Since: query.Since, Until: query.Until}
-		eventsError = runtime.Events(readOpts)
+		eventsError = runtime.Events(eventCtx, readOpts)
 	}()
 	if eventsError != nil {
 		utils.InternalServerError(w, eventsError)
+		eventCancel()
 		close(eventChannel)
 		return
 	}
@@ -59,6 +62,7 @@ func GetEvents(w http.ResponseWriter, r *http.Request) {
 	// If client disappears we need to stop listening for events
 	go func(done <-chan struct{}) {
 		<-done
+		eventCancel()
 		if _, ok := <-eventChannel; ok {
 			close(eventChannel)
 		}