pkg/*/compat: move to new package and attribute types

Signed-off-by: Danish Prakash <[email protected]>

cmd/rootlessport/wsl.go

@@ -12,7 +12,7 @@ import (
 func splitDualStackSpecIfWsl(spec rkport.Spec) []rkport.Spec {
 	specs := []rkport.Spec{spec}
 	protocol := spec.Proto
-	if machine.MachineHostType() != machine.Wsl || strings.HasSuffix(protocol, "4") || strings.HasSuffix(protocol, "6") {
+	if machine.HostType() != machine.Wsl || strings.HasSuffix(protocol, "4") || strings.HasSuffix(protocol, "6") {
 		return specs
 	}
 

pkg/api/handlers/compat/containers.go

@@ -23,6 +23,7 @@ import (
 	"github.com/containers/podman/v4/pkg/signal"
 	"github.com/containers/podman/v4/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/go-connections/nat"
@@ -397,7 +398,7 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
 			NetworkSettings: &networkSettings,
 			Mounts:          mounts,
 		},
-		ContainerCreateConfig: types.ContainerCreateConfig{},
+		ContainerCreateConfig: dockerBackend.ContainerCreateConfig{},
 	}, nil
 }
 

pkg/api/handlers/compat/containers_create.go

@@ -563,7 +563,7 @@ func cliOpts(cc handlers.CreateContainerConfig, rtc *config.Config) (*entities.C
 	}
 
 	if len(cc.HostConfig.RestartPolicy.Name) > 0 {
-		policy := cc.HostConfig.RestartPolicy.Name
+		policy := string(cc.HostConfig.RestartPolicy.Name)
 		// only add restart count on failure
 		if cc.HostConfig.RestartPolicy.IsOnFailure() {
 			policy += fmt.Sprintf(":%d", cc.HostConfig.RestartPolicy.MaximumRetryCount)

pkg/api/handlers/compat/info.go

@@ -20,6 +20,7 @@ import (
 	docker "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/api/types/swarm"
+	dockerSystem "github.com/docker/docker/api/types/system"
 	"github.com/google/uuid"
 	"github.com/opencontainers/selinux/go-selinux"
 	log "github.com/sirupsen/logrus"
@@ -190,13 +191,12 @@ func getSecOpts(sysInfo *sysinfo.SysInfo) []string {
 	return secOpts
 }
 
-func getRuntimes(configInfo *config.Config) map[string]docker.Runtime {
-	runtimes := map[string]docker.Runtime{}
+func getRuntimes(configInfo *config.Config) map[string]dockerSystem.RuntimeWithStatus {
+	runtimes := map[string]dockerSystem.RuntimeWithStatus{}
 	for name, paths := range configInfo.Engine.OCIRuntimes {
-		runtimes[name] = docker.Runtime{
-			Path: paths[0],
-			Args: nil,
-		}
+		runtime := dockerSystem.RuntimeWithStatus{}
+		runtime.Runtime = dockerSystem.Runtime{Path: paths[0], Args: nil}
+		runtimes[name] = runtime
 	}
 	return runtimes
 }