From: Reinhard Tartler <siretart@tauware.de>
Date: Wed, 7 Aug 2024 21:32:18 -0400
Subject: Revert "update to docker 27"

This reverts commits
 - e24367aa14b7669d116a2a27ba12c69cbf51612b
 - cf87278e6671568bce138d1405c7e81e34bea044
 - f2606c42302b845d68f65e65c2931cbaa8762f81

Forwarded: Not-needed

This commit needs to be maintained until debian upgrades docker to v28

---
 pkg/api/handlers/compat/containers.go             | 52 ++++++++---------
 pkg/api/handlers/compat/containers_stats_linux.go | 24 ++++----
 pkg/api/handlers/compat/images.go                 | 70 ++++++++++++++++-------
 pkg/api/handlers/compat/images_prune.go           |  3 +-
 pkg/api/handlers/compat/networks.go               | 21 ++++---
 pkg/api/handlers/compat/system.go                 | 11 ++--
 pkg/api/handlers/compat/types.go                  | 25 ++++----
 pkg/api/handlers/compat/volumes.go                | 19 +++---
 pkg/api/handlers/swagger/models.go                |  8 +--
 pkg/api/handlers/swagger/responses.go             | 13 ++---
 pkg/api/handlers/types.go                         | 14 ++---
 11 files changed, 142 insertions(+), 118 deletions(-)

diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index 596248e..cae22a9 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -24,10 +24,10 @@ import (
 	"github.com/containers/podman/v5/pkg/ps"
 	"github.com/containers/podman/v5/pkg/signal"
 	"github.com/containers/podman/v5/pkg/util"
+	"github.com/docker/docker/api/types"
 	dockerBackend "github.com/docker/docker/api/types/backend"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/storage"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-units"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
@@ -347,7 +347,7 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
 		return nil, err
 	}
 
-	ports := []container.Port{}
+	ports := []types.Port{}
 	for portKey, bindings := range inspect.NetworkSettings.Ports {
 		portNum, proto, ok := strings.Cut(portKey, "/")
 		if !ok {
@@ -361,7 +361,7 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
 
 		if len(bindings) == 0 {
 			// Exposed but not published
-			ports = append(ports, container.Port{
+			ports = append(ports, types.Port{
 				PrivatePort: uint16(containerPort),
 				Type:        proto,
 			})
@@ -372,7 +372,7 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
 					return nil, fmt.Errorf("invalid HostPort: %v", err)
 				}
 
-				ports = append(ports, container.Port{
+				ports = append(ports, types.Port{
 					IP:          b.HostIP,
 					PrivatePort: uint16(containerPort),
 					PublicPort:  uint16(hostPortInt),
@@ -386,7 +386,7 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
 	if err != nil {
 		return nil, err
 	}
-	networkSettings := container.NetworkSettingsSummary{}
+	networkSettings := types.SummaryNetworkSettings{}
 	if err := json.Unmarshal(n, &networkSettings); err != nil {
 		return nil, err
 	}
@@ -395,13 +395,13 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
 	if err != nil {
 		return nil, err
 	}
-	mounts := []container.MountPoint{}
+	mounts := []types.MountPoint{}
 	if err := json.Unmarshal(m, &mounts); err != nil {
 		return nil, err
 	}
 
 	return &handlers.Container{
-		Container: container.Summary{
+		Container: types.Container{
 			ID:         l.ID(),
 			Names:      []string{fmt.Sprintf("/%s", l.Name())},
 			Image:      imageName,
@@ -414,13 +414,10 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
 			Labels:     l.Labels(),
 			State:      stateStr,
 			Status:     status,
-			// FIXME: this seems broken, the field is never shown in the API output.
 			HostConfig: struct {
-				NetworkMode string            `json:",omitempty"`
-				Annotations map[string]string `json:",omitempty"`
+				NetworkMode string `json:",omitempty"`
 			}{
-				NetworkMode: "host",
-				// TODO: add annotations here for >= v1.46
+				"host",
 			},
 			NetworkSettings: &networkSettings,
 			Mounts:          mounts,
@@ -429,7 +426,7 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
 	}, nil
 }
 
-func convertSecondaryIPPrefixLen(input *define.InspectNetworkSettings, output *container.NetworkSettings) {
+func convertSecondaryIPPrefixLen(input *define.InspectNetworkSettings, output *types.NetworkSettings) {
 	for index, ip := range input.SecondaryIPAddresses {
 		output.SecondaryIPAddresses[index].PrefixLen = ip.PrefixLength
 	}
@@ -438,7 +435,7 @@ func convertSecondaryIPPrefixLen(input *define.InspectNetworkSettings, output *c
 	}
 }
 
-func LibpodToContainerJSON(l *libpod.Container, sz bool) (*container.InspectResponse, error) {
+func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON, error) {
 	imageID, imageName := l.Image()
 	inspect, err := l.Inspect(sz)
 	if err != nil {
@@ -453,7 +450,7 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*container.InspectResp
 	if err != nil {
 		return nil, err
 	}
-	state := container.State{}
+	state := types.ContainerState{}
 	if err := json.Unmarshal(i, &state); err != nil {
 		return nil, err
 	}
@@ -480,14 +477,14 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*container.InspectResp
 	}
 
 	if l.HasHealthCheck() && state.Status != "created" {
-		state.Health = &container.Health{}
+		state.Health = &types.Health{}
 		if inspect.State.Health != nil {
 			state.Health.Status = inspect.State.Health.Status
 			state.Health.FailingStreak = inspect.State.Health.FailingStreak
 			log := inspect.State.Health.Log
 
 			for _, item := range log {
-				res := &container.HealthcheckResult{}
+				res := &types.HealthcheckResult{}
 				s, err := time.Parse(time.RFC3339Nano, item.Start)
 				if err != nil {
 					return nil, err
@@ -530,13 +527,16 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*container.InspectResp
 	if hc.LogConfig.Type == define.KubernetesLogging {
 		hc.LogConfig.Type = define.JSONLogging
 	}
-
-	graphDriver := storage.DriverData{
-		Name: inspect.GraphDriver.Name,
-		Data: inspect.GraphDriver.Data,
+	g, err := json.Marshal(inspect.GraphDriver)
+	if err != nil {
+		return nil, err
+	}
+	graphDriver := types.GraphDriverData{}
+	if err := json.Unmarshal(g, &graphDriver); err != nil {
+		return nil, err
 	}
 
-	cb := container.ContainerJSONBase{
+	cb := types.ContainerJSONBase{
 		ID:              l.ID(),
 		Created:         l.CreatedTime().UTC().Format(time.RFC3339Nano), // Docker uses UTC
 		Path:            inspect.Path,
@@ -624,7 +624,7 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*container.InspectResp
 	if err != nil {
 		return nil, err
 	}
-	mounts := []container.MountPoint{}
+	mounts := []types.MountPoint{}
 	if err := json.Unmarshal(m, &mounts); err != nil {
 		return nil, err
 	}
@@ -643,7 +643,7 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*container.InspectResp
 		return nil, err
 	}
 
-	networkSettings := container.NetworkSettings{}
+	networkSettings := types.NetworkSettings{}
 	if err := json.Unmarshal(n, &networkSettings); err != nil {
 		return nil, err
 	}
@@ -655,7 +655,7 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*container.InspectResp
 		networkSettings.Networks = map[string]*network.EndpointSettings{}
 	}
 
-	c := container.InspectResponse{
+	c := types.ContainerJSON{
 		ContainerJSONBase: &cb,
 		Mounts:            mounts,
 		Config:            &config,
@@ -834,6 +834,6 @@ func UpdateContainer(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	responseStruct := container.UpdateResponse{}
+	responseStruct := container.ContainerUpdateOKBody{}
 	utils.WriteResponse(w, http.StatusOK, responseStruct)
 }
diff --git a/pkg/api/handlers/compat/containers_stats_linux.go b/pkg/api/handlers/compat/containers_stats_linux.go
index e08e2bb..c09d0e0 100644
--- a/pkg/api/handlers/compat/containers_stats_linux.go
+++ b/pkg/api/handlers/compat/containers_stats_linux.go
@@ -14,8 +14,8 @@ import (
 	"github.com/containers/podman/v5/pkg/api/handlers/utils"
 	api "github.com/containers/podman/v5/pkg/api/types"
 	"github.com/containers/storage/pkg/system"
-	"github.com/docker/docker/api/types/container"
 	runccgroups "github.com/opencontainers/cgroups"
+	docker "github.com/docker/docker/api/types"
 	"github.com/sirupsen/logrus"
 )
 
@@ -69,7 +69,7 @@ func StatsContainer(w http.ResponseWriter, r *http.Request) {
 		preRead = time.Now()
 		systemUsage, _ := cgroups.SystemCPUUsage()
 		preCPUStats = CPUStats{
-			CPUUsage: container.CPUUsage{
+			CPUUsage: docker.CPUUsage{
 				TotalUsage:        stats.CPUNano,
 				PercpuUsage:       stats.PerCPU,
 				UsageInKernelmode: stats.CPUSystemNano,
@@ -78,7 +78,7 @@ func StatsContainer(w http.ResponseWriter, r *http.Request) {
 			CPU:            stats.CPU,
 			SystemUsage:    systemUsage,
 			OnlineCPUs:     0,
-			ThrottlingData: container.ThrottlingData{},
+			ThrottlingData: docker.ThrottlingData{},
 		}
 	}
 	onlineCPUs, err := libpod.GetOnlineCPUs(ctnr)
@@ -121,9 +121,9 @@ streamLabel: // A label to flatten the scope
 			return
 		}
 
-		net := make(map[string]container.NetworkStats)
+		net := make(map[string]docker.NetworkStats)
 		for netName, netStats := range stats.Network {
-			net[netName] = container.NetworkStats{
+			net[netName] = docker.NetworkStats{
 				RxBytes:    netStats.RxBytes,
 				RxPackets:  netStats.RxPackets,
 				RxErrors:   netStats.RxErrors,
@@ -158,11 +158,11 @@ streamLabel: // A label to flatten the scope
 			Stats: Stats{
 				Read:    time.Now(),
 				PreRead: preRead,
-				PidsStats: container.PidsStats{
+				PidsStats: docker.PidsStats{
 					Current: cgroupStat.PidsStats.Current,
 					Limit:   0,
 				},
-				BlkioStats: container.BlkioStats{
+				BlkioStats: docker.BlkioStats{
 					IoServiceBytesRecursive: toBlkioStatEntry(cgroupStat.BlkioStats.IoServiceBytesRecursive),
 					IoServicedRecursive:     nil,
 					IoQueuedRecursive:       nil,
@@ -173,7 +173,7 @@ streamLabel: // A label to flatten the scope
 					SectorsRecursive:        nil,
 				},
 				CPUStats: CPUStats{
-					CPUUsage: container.CPUUsage{
+					CPUUsage: docker.CPUUsage{
 						TotalUsage:        cgroupStat.CpuStats.CpuUsage.TotalUsage,
 						PercpuUsage:       cgroupStat.CpuStats.CpuUsage.PercpuUsage,
 						UsageInKernelmode: cgroupStat.CpuStats.CpuUsage.UsageInKernelmode,
@@ -182,14 +182,14 @@ streamLabel: // A label to flatten the scope
 					CPU:         stats.CPU,
 					SystemUsage: systemUsage,
 					OnlineCPUs:  uint32(onlineCPUs),
-					ThrottlingData: container.ThrottlingData{
+					ThrottlingData: docker.ThrottlingData{
 						Periods:          0,
 						ThrottledPeriods: 0,
 						ThrottledTime:    0,
 					},
 				},
 				PreCPUStats: preCPUStats,
-				MemoryStats: container.MemoryStats{
+				MemoryStats: docker.MemoryStats{
 					Usage:             cgroupStat.MemoryStats.Usage.Usage,
 					MaxUsage:          cgroupStat.MemoryStats.Usage.MaxUsage,
 					Stats:             nil,
@@ -238,8 +238,8 @@ streamLabel: // A label to flatten the scope
 	}
 }
 
-func toBlkioStatEntry(entries []runccgroups.BlkioStatEntry) []container.BlkioStatEntry {
-	results := make([]container.BlkioStatEntry, len(entries))
+func toBlkioStatEntry(entries []runccgroups.BlkioStatEntry) []docker.BlkioStatEntry {
+	results := make([]docker.BlkioStatEntry, len(entries))
 	for i, e := range entries {
 		bits, err := json.Marshal(e)
 		if err != nil {
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go
index e9fdab5..520aae3 100644
--- a/pkg/api/handlers/compat/images.go
+++ b/pkg/api/handlers/compat/images.go
@@ -26,12 +26,11 @@ import (
 	"github.com/containers/podman/v5/pkg/domain/infra/abi"
 	"github.com/containers/podman/v5/pkg/util"
 	"github.com/containers/storage"
+	docker "github.com/docker/docker/api/types"
 	dockerContainer "github.com/docker/docker/api/types/container"
 	dockerImage "github.com/docker/docker/api/types/image"
-	dockerStorage "github.com/docker/docker/api/types/storage"
-	dockerSpec "github.com/moby/docker-image-spec/specs-go/v1"
+	"github.com/docker/go-connections/nat"
 	"github.com/opencontainers/go-digest"
-	imageSpec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/sirupsen/logrus"
 )
 
@@ -355,23 +354,25 @@ func imageDataToImageInspect(ctx context.Context, l *libimage.Image, r *http.Req
 	if err != nil {
 		return nil, err
 	}
+	ports, err := portsToPortSet(info.Config.ExposedPorts)
+	if err != nil {
+		return nil, err
+	}
 
 	// TODO: many fields in Config still need wiring
-	config := dockerSpec.DockerOCIImageConfig{
-		ImageConfig: imageSpec.ImageConfig{
-			User:         info.User,
-			ExposedPorts: info.Config.ExposedPorts,
-			Env:          info.Config.Env,
-			Cmd:          info.Config.Cmd,
-			Volumes:      info.Config.Volumes,
-			WorkingDir:   info.Config.WorkingDir,
-			Entrypoint:   info.Config.Entrypoint,
-			Labels:       info.Labels,
-			StopSignal:   info.Config.StopSignal,
-		},
-	}
-
-	rootfs := dockerImage.RootFS{}
+	config := dockerContainer.Config{
+		User:         info.User,
+		ExposedPorts: ports,
+		Env:          info.Config.Env,
+		Cmd:          info.Config.Cmd,
+		Volumes:      info.Config.Volumes,
+		WorkingDir:   info.Config.WorkingDir,
+		Entrypoint:   info.Config.Entrypoint,
+		Labels:       info.Labels,
+		StopSignal:   info.Config.StopSignal,
+	}
+
+	rootfs := docker.RootFS{}
 	if info.RootFS != nil {
 		rootfs.Type = info.RootFS.Type
 		rootfs.Layers = make([]string, 0, len(info.RootFS.Layers))
@@ -380,7 +381,7 @@ func imageDataToImageInspect(ctx context.Context, l *libimage.Image, r *http.Req
 		}
 	}
 
-	graphDriver := dockerStorage.DriverData{
+	graphDriver := docker.GraphDriverData{
 		Name: info.GraphDriver.Name,
 		Data: info.GraphDriver.Data,
 	}
@@ -389,7 +390,7 @@ func imageDataToImageInspect(ctx context.Context, l *libimage.Image, r *http.Req
 	cc.Hostname = info.ID[0:11] // short ID is the hostname
 	cc.Volumes = info.Config.Volumes
 
-	dockerImageInspect := dockerImage.InspectResponse{
+	dockerImageInspect := docker.ImageInspect{
 		Architecture:    info.Architecture,
 		Author:          info.Author,
 		Comment:         info.Comment,
@@ -415,7 +416,34 @@ func imageDataToImageInspect(ctx context.Context, l *libimage.Image, r *http.Req
 		dockerImageInspect.VirtualSize = info.VirtualSize
 	}
 
-	return &handlers.ImageInspect{InspectResponse: dockerImageInspect}, nil
+	return &handlers.ImageInspect{ImageInspect: dockerImageInspect}, nil
+}
+
+// portsToPortSet converts libpod's exposed ports to docker's structs
+func portsToPortSet(input map[string]struct{}) (nat.PortSet, error) {
+	ports := make(nat.PortSet)
+	for k := range input {
+		proto, port := nat.SplitProtoPort(k)
+		switch proto {
+		// See the OCI image spec for details:
+		// https://github.com/opencontainers/image-spec/blob/e562b04403929d582d449ae5386ff79dd7961a11/config.md#properties
+		case "tcp", "":
+			p, err := nat.NewPort("tcp", port)
+			if err != nil {
+				return nil, fmt.Errorf("unable to create tcp port from %s: %w", k, err)
+			}
+			ports[p] = struct{}{}
+		case "udp":
+			p, err := nat.NewPort("udp", port)
+			if err != nil {
+				return nil, fmt.Errorf("unable to create tcp port from %s: %w", k, err)
+			}
+			ports[p] = struct{}{}
+		default:
+			return nil, fmt.Errorf("invalid port proto %q in %q", proto, k)
+		}
+	}
+	return ports, nil
 }
 
 func GetImages(w http.ResponseWriter, r *http.Request) {
diff --git a/pkg/api/handlers/compat/images_prune.go b/pkg/api/handlers/compat/images_prune.go
index 282fa1b..ecae67e 100644
--- a/pkg/api/handlers/compat/images_prune.go
+++ b/pkg/api/handlers/compat/images_prune.go
@@ -15,6 +15,7 @@ import (
 	"github.com/containers/podman/v5/pkg/domain/entities"
 	"github.com/containers/podman/v5/pkg/domain/infra/abi"
 	"github.com/containers/podman/v5/pkg/util"
+	"github.com/docker/docker/api/types"
 	dockerImage "github.com/docker/docker/api/types/image"
 )
 
@@ -66,7 +67,7 @@ func PruneImages(w http.ResponseWriter, r *http.Request) {
 	}
 
 	payload := handlers.ImagesPruneReport{
-		PruneReport: dockerImage.PruneReport{
+		ImagesPruneReport: types.ImagesPruneReport{
 			ImagesDeleted:  idr,
 			SpaceReclaimed: reclaimedSpace,
 		},
diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go
index a2e88ca..31774b4 100644
--- a/pkg/api/handlers/compat/networks.go
+++ b/pkg/api/handlers/compat/networks.go
@@ -19,6 +19,7 @@ import (
 	"github.com/containers/podman/v5/pkg/domain/entities"
 	"github.com/containers/podman/v5/pkg/domain/infra/abi"
 	"github.com/containers/podman/v5/pkg/util"
+	"github.com/docker/docker/api/types"
 
 	dockerNetwork "github.com/docker/docker/api/types/network"
 	"github.com/sirupsen/logrus"
@@ -68,8 +69,8 @@ func InspectNetwork(w http.ResponseWriter, r *http.Request) {
 	utils.WriteResponse(w, http.StatusOK, report)
 }
 
-func convertLibpodNetworktoDockerNetwork(runtime *libpod.Runtime, statuses []abi.ContainerNetStatus, network *nettypes.Network, changeDefaultName bool) *dockerNetwork.Inspect {
-	containerEndpoints := make(map[string]dockerNetwork.EndpointResource, len(statuses))
+func convertLibpodNetworktoDockerNetwork(runtime *libpod.Runtime, statuses []abi.ContainerNetStatus, network *nettypes.Network, changeDefaultName bool) *types.NetworkResource {
+	containerEndpoints := make(map[string]types.EndpointResource, len(statuses))
 	for _, st := range statuses {
 		if netData, ok := st.Status[network.Name]; ok {
 			ipv4Address := ""
@@ -88,7 +89,7 @@ func convertLibpodNetworktoDockerNetwork(runtime *libpod.Runtime, statuses []abi
 				macAddr = dev.MacAddress.String()
 				break
 			}
-			containerEndpoint := dockerNetwork.EndpointResource{
+			containerEndpoint := types.EndpointResource{
 				Name:        st.Name,
 				MacAddress:  macAddr,
 				IPv4Address: ipv4Address,
@@ -127,7 +128,7 @@ func convertLibpodNetworktoDockerNetwork(runtime *libpod.Runtime, statuses []abi
 	// https://github.com/containers/podman/issues/15580
 	delete(options, nettypes.IsolateOption)
 
-	report := dockerNetwork.Inspect{
+	report := types.NetworkResource{
 		Name:       name,
 		ID:         network.ID,
 		Driver:     network.Driver,
@@ -172,7 +173,7 @@ func ListNetworks(w http.ResponseWriter, r *http.Request) {
 		utils.InternalServerError(w, err)
 		return
 	}
-	reports := make([]*dockerNetwork.Summary, 0, len(nets))
+	reports := make([]*types.NetworkResource, 0, len(nets))
 	for _, net := range nets {
 		report := convertLibpodNetworktoDockerNetwork(runtime, statuses, &net, true)
 		reports = append(reports, report)
@@ -182,7 +183,7 @@ func ListNetworks(w http.ResponseWriter, r *http.Request) {
 
 func CreateNetwork(w http.ResponseWriter, r *http.Request) {
 	var (
-		networkCreate   dockerNetwork.CreateRequest
+		networkCreate   types.NetworkCreateRequest
 		network         nettypes.Network
 		responseWarning string
 	)
@@ -199,9 +200,7 @@ func CreateNetwork(w http.ResponseWriter, r *http.Request) {
 	network.Driver = networkCreate.Driver
 	network.Labels = networkCreate.Labels
 	network.Internal = networkCreate.Internal
-	if networkCreate.EnableIPv6 != nil {
-		network.IPv6Enabled = *networkCreate.EnableIPv6
-	}
+	network.IPv6Enabled = networkCreate.EnableIPv6
 
 	network.Options = make(map[string]string)
 
@@ -360,7 +359,7 @@ func RemoveNetwork(w http.ResponseWriter, r *http.Request) {
 func Connect(w http.ResponseWriter, r *http.Request) {
 	runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime)
 
-	var netConnect dockerNetwork.ConnectOptions
+	var netConnect types.NetworkConnect
 	if err := json.NewDecoder(r.Body).Decode(&netConnect); err != nil {
 		utils.Error(w, http.StatusInternalServerError, fmt.Errorf("Decode(): %w", err))
 		return
@@ -442,7 +441,7 @@ func Connect(w http.ResponseWriter, r *http.Request) {
 func Disconnect(w http.ResponseWriter, r *http.Request) {
 	runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime)
 
-	var netDisconnect dockerNetwork.DisconnectOptions
+	var netDisconnect types.NetworkDisconnect
 	if err := json.NewDecoder(r.Body).Decode(&netDisconnect); err != nil {
 		utils.Error(w, http.StatusInternalServerError, fmt.Errorf("Decode(): %w", err))
 		return
diff --git a/pkg/api/handlers/compat/system.go b/pkg/api/handlers/compat/system.go
index b839272..f832b95 100644
--- a/pkg/api/handlers/compat/system.go
+++ b/pkg/api/handlers/compat/system.go
@@ -14,8 +14,6 @@ import (
 	"github.com/containers/podman/v5/pkg/domain/entities"
 	"github.com/containers/podman/v5/pkg/domain/infra/abi"
 	docker "github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/build"
-	"github.com/docker/docker/api/types/container"
 	dockerImage "github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/volume"
 )
@@ -51,9 +49,9 @@ func GetDiskUsage(w http.ResponseWriter, r *http.Request) {
 		imgs[i] = &t
 	}
 
-	ctnrs := make([]*container.Summary, len(df.Containers))
+	ctnrs := make([]*docker.Container, len(df.Containers))
 	for i, o := range df.Containers {
-		t := container.Summary{
+		t := docker.Container{
 			ID:         o.ContainerID,
 			Names:      []string{o.Names},
 			Image:      o.Image,
@@ -67,8 +65,7 @@ func GetDiskUsage(w http.ResponseWriter, r *http.Request) {
 			State:      o.Status,
 			Status:     o.Status,
 			HostConfig: struct {
-				NetworkMode string            `json:",omitempty"`
-				Annotations map[string]string `json:",omitempty"`
+				NetworkMode string `json:",omitempty"`
 			}{},
 			NetworkSettings: nil,
 			Mounts:          nil,
@@ -103,6 +100,6 @@ func GetDiskUsage(w http.ResponseWriter, r *http.Request) {
 		Images:     imgs,
 		Containers: ctnrs,
 		Volumes:    vols,
-		BuildCache: []*build.CacheRecord{},
+		BuildCache: []*docker.BuildCache{},
 	}})
 }
diff --git a/pkg/api/handlers/compat/types.go b/pkg/api/handlers/compat/types.go
index 2402fe7..764e141 100644
--- a/pkg/api/handlers/compat/types.go
+++ b/pkg/api/handlers/compat/types.go
@@ -5,13 +5,13 @@ package compat
 import (
 	"time"
 
-	"github.com/docker/docker/api/types/container"
+	docker "github.com/docker/docker/api/types"
 )
 
 // CPUStats aggregates and wraps all CPU related info of container
 type CPUStats struct {
 	// CPU Usage. Linux and Windows.
-	CPUUsage container.CPUUsage `json:"cpu_usage"`
+	CPUUsage docker.CPUUsage `json:"cpu_usage"`
 
 	// System Usage. Linux only.
 	SystemUsage uint64 `json:"system_cpu_usage,omitempty"`
@@ -23,7 +23,7 @@ type CPUStats struct {
 	CPU float64 `json:"cpu"`
 
 	// Throttling Data. Linux only.
-	ThrottlingData container.ThrottlingData `json:"throttling_data,omitempty"`
+	ThrottlingData docker.ThrottlingData `json:"throttling_data,omitempty"`
 }
 
 // Stats is Ultimate struct aggregating all types of stats of one container
@@ -33,17 +33,17 @@ type Stats struct {
 	PreRead time.Time `json:"preread"`
 
 	// Linux specific stats, not populated on Windows.
-	PidsStats  container.PidsStats  `json:"pids_stats,omitempty"`
-	BlkioStats container.BlkioStats `json:"blkio_stats,omitempty"`
+	PidsStats  docker.PidsStats  `json:"pids_stats,omitempty"`
+	BlkioStats docker.BlkioStats `json:"blkio_stats,omitempty"`
 
 	// Windows specific stats, not populated on Linux.
-	NumProcs     uint32                 `json:"num_procs"`
-	StorageStats container.StorageStats `json:"storage_stats,omitempty"`
+	NumProcs     uint32              `json:"num_procs"`
+	StorageStats docker.StorageStats `json:"storage_stats,omitempty"`
 
 	// Shared stats
-	CPUStats    CPUStats              `json:"cpu_stats,omitempty"`
-	PreCPUStats CPUStats              `json:"precpu_stats,omitempty"` // "Pre"="Previous"
-	MemoryStats container.MemoryStats `json:"memory_stats,omitempty"`
+	CPUStats    CPUStats           `json:"cpu_stats,omitempty"`
+	PreCPUStats CPUStats           `json:"precpu_stats,omitempty"` // "Pre"="Previous"
+	MemoryStats docker.MemoryStats `json:"memory_stats,omitempty"`
 }
 
 type StatsJSON struct {
@@ -53,7 +53,7 @@ type StatsJSON struct {
 	ID   string `json:"Id,omitempty"`
 
 	// Networks request version >=1.21
-	Networks map[string]container.NetworkStats `json:"networks,omitempty"`
+	Networks map[string]docker.NetworkStats `json:"networks,omitempty"`
 }
 
 // DockerStatsJSON is the same as StatsJSON except for the lowercase
@@ -64,6 +64,7 @@ type DockerStatsJSON struct {
 
 	Name string `json:"name,omitempty"`
 	ID   string `json:"id,omitempty"`
+
 	// Networks request version >=1.21
-	Networks map[string]container.NetworkStats `json:"networks,omitempty"`
+	Networks map[string]docker.NetworkStats `json:"networks,omitempty"`
 }
diff --git a/pkg/api/handlers/compat/volumes.go b/pkg/api/handlers/compat/volumes.go
index 46756a4..37eff3a 100644
--- a/pkg/api/handlers/compat/volumes.go
+++ b/pkg/api/handlers/compat/volumes.go
@@ -19,7 +19,8 @@ import (
 	"github.com/containers/podman/v5/pkg/domain/filters"
 	"github.com/containers/podman/v5/pkg/domain/infra/abi/parse"
 	"github.com/containers/podman/v5/pkg/util"
-	"github.com/docker/docker/api/types/volume"
+	docker_api_types "github.com/docker/docker/api/types"
+	docker_api_types_volume "github.com/docker/docker/api/types/volume"
 )
 
 func ListVolumes(w http.ResponseWriter, r *http.Request) {
@@ -56,7 +57,7 @@ func ListVolumes(w http.ResponseWriter, r *http.Request) {
 		utils.InternalServerError(w, err)
 		return
 	}
-	volumeConfigs := make([]*volume.Volume, 0, len(vols))
+	volumeConfigs := make([]*docker_api_types_volume.Volume, 0, len(vols))
 	for _, v := range vols {
 		mp, err := v.MountPoint()
 		if err != nil {
@@ -66,7 +67,7 @@ func ListVolumes(w http.ResponseWriter, r *http.Request) {
 			utils.InternalServerError(w, err)
 			return
 		}
-		config := volume.Volume{
+		config := docker_api_types_volume.Volume{
 			Name:       v.Name(),
 			Driver:     v.Driver(),
 			Mountpoint: mp,
@@ -77,7 +78,7 @@ func ListVolumes(w http.ResponseWriter, r *http.Request) {
 		}
 		volumeConfigs = append(volumeConfigs, &config)
 	}
-	response := volume.ListResponse{
+	response := docker_api_types_volume.ListResponse{
 		Volumes:  volumeConfigs,
 		Warnings: []string{},
 	}
@@ -98,7 +99,7 @@ func CreateVolume(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	// decode params from body
-	input := volume.CreateOptions{}
+	input := docker_api_types_volume.CreateOptions{}
 	if err := json.NewDecoder(r.Body).Decode(&input); err != nil {
 		utils.Error(w, http.StatusInternalServerError, fmt.Errorf("Decode(): %w", err))
 		return
@@ -125,7 +126,7 @@ func CreateVolume(w http.ResponseWriter, r *http.Request) {
 			utils.InternalServerError(w, err)
 			return
 		}
-		response := volume.Volume{
+		response := docker_api_types_volume.Volume{
 			CreatedAt:  existingVolume.CreatedTime().Format(time.RFC3339),
 			Driver:     existingVolume.Driver(),
 			Labels:     existingVolume.Labels(),
@@ -170,7 +171,7 @@ func CreateVolume(w http.ResponseWriter, r *http.Request) {
 		utils.InternalServerError(w, err)
 		return
 	}
-	volResponse := volume.Volume{
+	volResponse := docker_api_types_volume.Volume{
 		Name:       config.Name,
 		Driver:     config.Driver,
 		Mountpoint: mp,
@@ -200,7 +201,7 @@ func InspectVolume(w http.ResponseWriter, r *http.Request) {
 		utils.InternalServerError(w, err)
 		return
 	}
-	volResponse := volume.Volume{
+	volResponse := docker_api_types_volume.Volume{
 		Name:       vol.Name(),
 		Driver:     vol.Driver(),
 		Mountpoint: mp,
@@ -311,7 +312,7 @@ func PruneVolumes(w http.ResponseWriter, r *http.Request) {
 	}
 
 	payload := handlers.VolumesPruneReport{
-		PruneReport: volume.PruneReport{
+		VolumesPruneReport: docker_api_types.VolumesPruneReport{
 			VolumesDeleted: prunedIds,
 			SpaceReclaimed: reclaimedSpace,
 		},
diff --git a/pkg/api/handlers/swagger/models.go b/pkg/api/handlers/swagger/models.go
index 4438b94..1d71eb7 100644
--- a/pkg/api/handlers/swagger/models.go
+++ b/pkg/api/handlers/swagger/models.go
@@ -5,8 +5,8 @@ package swagger
 
 import (
 	"github.com/containers/podman/v5/pkg/domain/entities"
+	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/network"
 )
 
 // Details for creating a volume
@@ -34,15 +34,15 @@ type volumeCreate struct {
 
 // Network create
 // swagger:model
-type networkCreate network.CreateRequest
+type networkCreate types.NetworkCreateRequest
 
 // Network connect
 // swagger:model
-type networkConnectRequest network.ConnectOptions
+type networkConnectRequest types.NetworkConnect
 
 // Network disconnect
 // swagger:model
-type networkDisconnectRequest network.DisconnectOptions
+type networkDisconnectRequest types.NetworkDisconnect
 
 // Network connect
 // swagger:model
diff --git a/pkg/api/handlers/swagger/responses.go b/pkg/api/handlers/swagger/responses.go
index cd4804f..53e488b 100644
--- a/pkg/api/handlers/swagger/responses.go
+++ b/pkg/api/handlers/swagger/responses.go
@@ -13,8 +13,7 @@ import (
 	"github.com/containers/podman/v5/pkg/inspect"
 	"github.com/docker/docker/api/types/container"
 	dockerImage "github.com/docker/docker/api/types/image"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/volume"
+	dockerVolume "github.com/docker/docker/api/types/volume"
 )
 
 // Image Tree
@@ -251,21 +250,21 @@ type containersList struct {
 // swagger:response
 type volumeInspect struct {
 	// in:body
-	Body volume.Volume
+	Body dockerVolume.Volume
 }
 
 // Volume prune
 // swagger:response
 type volumePruneResponse struct {
 	// in:body
-	Body volume.PruneReport
+	Body dockerAPI.VolumesPruneReport
 }
 
 // Volume List
 // swagger:response
 type volumeList struct {
 	// in:body
-	Body volume.ListResponse
+	Body dockerVolume.ListResponse
 }
 
 // Volume list
@@ -350,14 +349,14 @@ type containerWaitResponse struct {
 // swagger:response
 type networkInspectCompat struct {
 	// in:body
-	Body network.Inspect
+	Body dockerAPI.NetworkResource
 }
 
 // Network list
 // swagger:response
 type networkListCompat struct {
 	// in:body
-	Body []network.Summary
+	Body []dockerAPI.NetworkResource
 }
 
 // List Containers
diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go
index 2d85470..f6a81cc 100644
--- a/pkg/api/handlers/types.go
+++ b/pkg/api/handlers/types.go
@@ -6,11 +6,9 @@ import (
 	docker "github.com/docker/docker/api/types"
 	dockerBackend "github.com/docker/docker/api/types/backend"
 	dockerContainer "github.com/docker/docker/api/types/container"
-	dockerImage "github.com/docker/docker/api/types/image"
 	dockerNetwork "github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/api/types/system"
-	"github.com/docker/docker/api/types/volume"
 	"github.com/opencontainers/runtime-spec/specs-go"
 )
 
@@ -19,7 +17,7 @@ type AuthConfig struct {
 }
 
 type ImageInspect struct {
-	dockerImage.InspectResponse
+	docker.ImageInspect
 	// Container is for backwards compat but is basically unused
 	Container string
 }
@@ -47,7 +45,7 @@ type LibpodImagesResolveReport struct {
 }
 
 type ContainersPruneReport struct {
-	dockerContainer.PruneReport
+	docker.ContainersPruneReport
 }
 
 type ContainersPruneReportLibpod struct {
@@ -105,11 +103,11 @@ type DiskUsage struct {
 }
 
 type VolumesPruneReport struct {
-	volume.PruneReport
+	docker.VolumesPruneReport
 }
 
 type ImagesPruneReport struct {
-	dockerImage.PruneReport
+	docker.ImagesPruneReport
 }
 
 type BuildCachePruneReport struct {
@@ -117,7 +115,7 @@ type BuildCachePruneReport struct {
 }
 
 type NetworkPruneReport struct {
-	dockerNetwork.PruneReport
+	docker.NetworksPruneReport
 }
 
 type ConfigCreateResponse struct {
@@ -170,7 +168,7 @@ type HistoryResponse struct {
 }
 
 type ExecCreateConfig struct {
-	dockerContainer.ExecOptions
+	docker.ExecConfig
 }
 
 type ExecStartConfig struct {