Merge pull request #2 from silenium-dev/feature/podman

add podman support

Author: silenium-dev

examples/podman/main.go

@@ -0,0 +1,51 @@
+package main
+
+import (
+	"context"
+
+	"github.com/docker/docker/api/types/network"
+	"github.com/silenium-dev/docker-wrapper/pkg/client"
+	client2 "github.com/silenium-dev/docker-wrapper/pkg/client/podman/client"
+)
+
+func main() {
+	cli, err := client.NewWithOpts(client.FromEnv, client.WithVersionNegotiation)
+	if err != nil {
+		panic(err)
+	}
+	isPodman, err := cli.SystemIsPodman(context.Background())
+	if err != nil {
+		panic(err)
+	}
+	println("Is Podman:", isPodman)
+	if isPodman {
+		podmanCli, err := client2.FromDocker(context.Background(), cli, nil, nil)
+		if err != nil {
+			panic(err)
+		}
+
+		info, err := podmanCli.SystemInfo(context.Background())
+		if err != nil {
+			panic(err)
+		}
+		println("Rootless:", info.Host.Security.Rootless)
+
+		socket, err := podmanCli.RemoteSocket(context.Background())
+		if err != nil {
+			panic(err)
+		}
+		println("Remote socket:", socket)
+	}
+
+	netResp, err := cli.NetworkCreate(context.Background(), "test_network", network.CreateOptions{})
+	if err != nil {
+		panic(err)
+	}
+	defer cli.NetworkRemove(context.Background(), netResp.ID)
+
+	hostIP, err := cli.SystemHostIPFromContainers(context.Background(), &netResp.ID)
+	if err != nil {
+		panic(err)
+	}
+	println("Host IP from containers:", hostIP.String())
+}

examples/pull/main.go

@@ -2,23 +2,24 @@ package main
 
 import (
 	"context"
+	"time"
+
 	"github.com/distribution/reference"
 	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/registry"
 	client2 "github.com/docker/docker/client"
 	"github.com/silenium-dev/docker-wrapper/pkg/client"
 	"github.com/silenium-dev/docker-wrapper/pkg/client/auth"
 	"go.uber.org/zap"
-	"time"
 )
 
 func main() {
 	logger := zap.Must(zap.NewDevelopment()).Sugar()
-	authProvider, err := auth.NewDefaultProvider()
+	authProvider, err := auth.NewDefaultAuthProvider()
 	if err != nil {
 		panic(err)
 	}
-	override := auth.NewOverridingProvider(
+	override := auth.NewOverridingAuthProvider(
 		authProvider, map[string]registry.AuthConfig{},
 		auth.WithSugaredLogger(logger.With(zap.String("component", "auth-provider"))),
 	).WithOverride("quay.io", registry.AuthConfig{})
@@ -37,18 +38,20 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	stateChan, err := cli.ImagePullWithState(context.Background(), ref, image.PullOptions{})
+	id, manifest, stateChan, err := cli.ImagePullWithState(context.Background(), ref, image.PullOptions{})
 	if err != nil {
 		panic(err)
 	}
+	logger.Infof("Image ID: %s\n", id.String())
+	logger.Infof("Manifest digest: %s\n", manifest.Config.Digest.String())
 	for state := range stateChan {
 		print("\033[2J")
 		logger.Infof("%s", state.Status())
 		for idx, l := range state.Layers() {
 			logger.Infof("%02d [%s]: %s", idx, l.Id(), l.Status())
 		}
 	}
-	digest, err := cli.ImagePull(context.Background(), ref, image.PullOptions{})
+	digest, err := cli.ImagePullSimple(context.Background(), ref, image.PullOptions{})
 	if err != nil {
 		panic(err)
 	}

examples/state_test/main.go

@@ -0,0 +1,45 @@
+package main
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/distribution/reference"
+	"github.com/docker/docker/api/types/image"
+	"github.com/silenium-dev/docker-wrapper/pkg/client"
+	"github.com/silenium-dev/docker-wrapper/pkg/client/pull/events"
+)
+
+func main() {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	cli, _ := client.NewWithOpts(client.FromEnv, client.WithVersionNegotiation)
+	ref, _ := reference.ParseNormalizedNamed("localstack/localstack:3")
+	id, manifest, eventChan, err := cli.ImagePullWithEvents(ctx, ref, image.PullOptions{})
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println("Pulling:", id.String(), manifest.MediaType)
+	layerTracker := map[string][]events.PullEvent{}
+	var tracker []events.PullEvent
+	for event := range eventChan {
+		if le, ok := event.(events.LayerEvent); ok {
+			layerTracker[le.LayerId()] = append(layerTracker[le.LayerId()], event)
+		} else {
+			tracker = append(tracker, event)
+		}
+	}
+	fmt.Println("\nPull Events:")
+	for _, pullEvent := range tracker {
+		fmt.Printf("  %s\n", pullEvent.String())
+	}
+	fmt.Println("\nLayer Events:")
+	for _, layer := range manifest.Layers {
+		fmt.Printf("Layer %s:\n", layer.Digest.String())
+		layerEvents := layerTracker[layer.Digest.Hex[:12]]
+		for _, event := range layerEvents {
+			fmt.Printf("  %s\n", event.String())
+		}
+	}
+}

go.mod

@@ -1,54 +1,78 @@
 module github.com/silenium-dev/docker-wrapper
 
-go 1.24
+go 1.24.0
+
+toolchain go1.24.5
 
 require (
+	github.com/BurntSushi/toml v1.5.0
+	github.com/Microsoft/go-winio v0.6.2
+	github.com/blang/semver/v4 v4.0.0
 	github.com/containerd/errdefs v1.0.0
-	github.com/containerd/platforms v0.2.1
+	github.com/containerd/platforms v1.0.0-rc.1
+	github.com/containers/common v0.64.1
+	github.com/containers/podman/v5 v5.5.2
+	github.com/containers/storage v1.59.1
 	github.com/cpuguy83/dockercfg v0.3.2
 	github.com/distribution/reference v0.6.0
-	github.com/docker/docker v28.3.2+incompatible
+	github.com/docker/docker v28.3.3+incompatible
 	github.com/docker/go-units v0.5.0
 	github.com/google/go-containerregistry v0.20.6
+	github.com/hashicorp/go-multierror v1.1.1
+	github.com/kevinburke/ssh_config v1.2.0
+	github.com/moby/sys/capability v0.4.0
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.1.1
+	github.com/opencontainers/runtime-spec v1.2.1
+	github.com/opencontainers/selinux v1.12.0
+	github.com/pkg/sftp v1.13.9
+	github.com/sirupsen/logrus v1.9.3
+	github.com/skeema/knownhosts v1.3.1
+	github.com/stretchr/testify v1.10.0
 	go.uber.org/zap v1.27.0
+	golang.org/x/crypto v0.40.0
+	golang.org/x/net v0.42.0
+	golang.org/x/sys v0.34.0
+	golang.org/x/term v0.33.0
+	k8s.io/apimachinery v0.33.3
+	tags.cncf.io/container-device-interface v1.0.1
 )
 
 require (
-	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/containerd/errdefs/pkg v0.3.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/stargz-snapshotter/estargz v0.17.0 // indirect
-	github.com/docker/cli v28.3.2+incompatible // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/docker/cli v28.3.3+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.9.3 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/kr/fs v0.1.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
-	github.com/moby/sys/sequential v0.6.0 // indirect
-	github.com/moby/term v0.5.2 // indirect
+	github.com/moby/sys/mountinfo v0.7.2 // indirect
+	github.com/moby/sys/user v0.4.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/vbatts/tar-split v0.12.1 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
 	go.opentelemetry.io/otel v1.37.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
 	go.opentelemetry.io/otel/metric v1.37.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.37.0 // indirect
 	go.opentelemetry.io/otel/trace v1.37.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.7.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/sys v0.34.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
-	google.golang.org/protobuf v1.36.6 // indirect
-	gotest.tools/v3 v3.5.2 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )