erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-08-05 08:25:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Switch common, storage and image to monorepo.

Browse source 
Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
This commit is contained in:
Jan Kaluza 2025-09-01 10:52:33 +02:00
parent dedeb24e9f
commit a98154a978
1258 changed files with 3187 additions and 3716 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/podman-mac-helper/install.go
View file

@ -14,8 +14,8 @@ import (
"syscall"
"text/template"
"github.com/containers/storage/pkg/fileutils"
"github.com/spf13/cobra"
"go.podman.io/storage/pkg/fileutils"
)
const (

2
cmd/podman-mac-helper/uninstall.go
View file

@ -10,8 +10,8 @@ import (
"os/exec"
"path/filepath"
"github.com/containers/storage/pkg/fileutils"
"github.com/spf13/cobra"
"go.podman.io/storage/pkg/fileutils"
)
var uninstallCmd = &cobra.Command{

2
cmd/podman-testing/create.go
View file

@ -5,10 +5,10 @@ package main
import (
"fmt"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/internal/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman-testing/data.go
View file

@ -6,10 +6,10 @@ import (
"errors"
"os"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/internal/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman-testing/layer.go
View file

@ -6,10 +6,10 @@ import (
"errors"
"os"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/internal/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

8
cmd/podman-testing/main.go
View file

@ -10,16 +10,16 @@ import (
"os/exec"
"syscall"
"github.com/containers/common/pkg/config"
_ "github.com/containers/podman/v5/cmd/podman/completion"
ientities "github.com/containers/podman/v5/internal/domain/entities"
"github.com/containers/podman/v5/internal/domain/infra"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/storage"
"github.com/containers/storage/pkg/reexec"
"github.com/containers/storage/pkg/unshare"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/config"
"go.podman.io/storage"
"go.podman.io/storage/pkg/reexec"
"go.podman.io/storage/pkg/unshare"
)
var (

2
cmd/podman-testing/remove.go
View file

@ -5,10 +5,10 @@ package main
import (
"fmt"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/internal/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

4
cmd/podman-testing/store_supported.go
View file

@ -7,8 +7,8 @@ import (
"os"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/storage"
"github.com/containers/storage/types"
"go.podman.io/storage"
"go.podman.io/storage/types"
)
var (

2
cmd/podman/artifact/add.go
View file

@ -4,12 +4,12 @@ import (
"fmt"
"path/filepath"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/domain/utils"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman/artifact/extract.go
View file

@ -1,11 +1,11 @@
package artifact
import (
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

6
cmd/podman/artifact/list.go
View file

@ -4,15 +4,15 @@ import (
"fmt"
"os"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/report"
"github.com/containers/image/v5/docker/reference"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/docker/go-units"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/report"
"go.podman.io/image/v5/docker/reference"
)
var (

6
cmd/podman/artifact/pull.go
View file

@ -5,14 +5,14 @@ import (
"os"
"github.com/containers/buildah/pkg/cli"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/util"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"go.podman.io/image/v5/types"
)
// pullOptionsWrapper wraps entities.ImagePullOptions and prevents leaking

6
cmd/podman/artifact/push.go
View file

@ -5,14 +5,14 @@ import (
"os"
"github.com/containers/buildah/pkg/cli"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/util"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"go.podman.io/image/v5/types"
)
// pushOptionsWrapper wraps entities.ImagepushOptions and prevents leaking

8
cmd/podman/auto-update.go
View file

@ -5,15 +5,15 @@ import (
"fmt"
"os"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/report"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/errorhandling"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/report"
"go.podman.io/image/v5/types"
)
type cliAutoUpdateOptions struct {

10
cmd/podman/common/build.go
View file

@ -15,11 +15,6 @@ import (
buildahCLI "github.com/containers/buildah/pkg/cli"
"github.com/containers/buildah/pkg/parse"
buildahUtil "github.com/containers/buildah/pkg/util"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/config"
"github.com/containers/image/v5/docker/reference"
"github.com/containers/image/v5/types"
encconfig "github.com/containers/ocicrypt/config"
enchelpers "github.com/containers/ocicrypt/helpers"
"github.com/containers/podman/v5/cmd/podman/registry"
@ -29,6 +24,11 @@ import (
"github.com/openshift/imagebuilder"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/config"
"go.podman.io/image/v5/docker/reference"
"go.podman.io/image/v5/types"
)
// BuildFlagsWrapper are local to cmd/ as the build code is using Buildah-internal

12
cmd/podman/common/completion.go
View file

@ -12,12 +12,6 @@ import (
"strings"
"unicode"
libimageDefine "github.com/containers/common/libimage/define"
"github.com/containers/common/libnetwork/types"
"github.com/containers/common/pkg/config"
"github.com/containers/common/pkg/ssh"
"github.com/containers/image/v5/pkg/sysregistriesv2"
imageTypes "github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/libpod/define"
"github.com/containers/podman/v5/libpod/events"
@ -28,6 +22,12 @@ import (
"github.com/containers/podman/v5/pkg/util"
securejoin "github.com/cyphar/filepath-securejoin"
"github.com/spf13/cobra"
libimageDefine "go.podman.io/common/libimage/define"
"go.podman.io/common/libnetwork/types"
"go.podman.io/common/pkg/config"
"go.podman.io/common/pkg/ssh"
"go.podman.io/image/v5/pkg/sysregistriesv2"
imageTypes "go.podman.io/image/v5/types"
)
var (

8
cmd/podman/common/create.go
View file

@ -4,14 +4,14 @@ import (
"errors"
"time"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
commonFlag "github.com/containers/common/pkg/flag"
"github.com/containers/image/v5/manifest"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/libpod/define"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
commonFlag "go.podman.io/common/pkg/flag"
"go.podman.io/image/v5/manifest"
)
const sizeWithUnitFormat = "(format: `<number>[<unit>]`, where unit = b (bytes), k (kibibytes), m (mebibytes), or g (gibibytes))"

4
cmd/podman/common/netflags.go
View file

@ -5,8 +5,6 @@ import (
"fmt"
"net"
"github.com/containers/common/libnetwork/types"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/parse"
"github.com/containers/podman/v5/libpod/define"
"github.com/containers/podman/v5/pkg/domain/entities"
@ -14,6 +12,8 @@ import (
"github.com/containers/podman/v5/pkg/specgenutil"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"go.podman.io/common/libnetwork/types"
"go.podman.io/common/pkg/completion"
)
func DefineNetFlags(cmd *cobra.Command) {

2
cmd/podman/common/registries.go
View file

@ -3,7 +3,7 @@ package common
import (
"os"
"github.com/containers/image/v5/types"
"go.podman.io/image/v5/types"
)
// SetRegistriesConfPath sets the registries.conf path for the specified context.

10
cmd/podman/common/sign.go
View file

@ -4,14 +4,14 @@ import (
"fmt"
"os"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/ssh"
"github.com/containers/image/v5/pkg/cli"
"github.com/containers/image/v5/pkg/cli/sigstore"
"github.com/containers/image/v5/signature/signer"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/ssh"
"go.podman.io/image/v5/pkg/cli"
"go.podman.io/image/v5/pkg/cli/sigstore"
"go.podman.io/image/v5/signature/signer"
)
// SigningCLIOnlyOptions contains signing-related CLI options.

2
cmd/podman/completion/completion.go
View file

@ -6,9 +6,9 @@ import (
"os"
"strings"
commonComp "github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/spf13/cobra"
commonComp "go.podman.io/common/pkg/completion"
)
const (

4
cmd/podman/containers/checkpoint.go
View file

@ -7,7 +7,6 @@ import (
"strings"
"time"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
@ -15,8 +14,9 @@ import (
"github.com/containers/podman/v5/pkg/criu"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/rootless"
"github.com/containers/storage/pkg/archive"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/storage/pkg/archive"
)
var (

2
cmd/podman/containers/cleanup.go
View file

@ -4,7 +4,6 @@ import (
"errors"
"fmt"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
@ -12,6 +11,7 @@ import (
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman/containers/commit.go
View file

@ -6,11 +6,11 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

4
cmd/podman/containers/cp.go
View file

@ -18,10 +18,10 @@ import (
"github.com/containers/podman/v5/pkg/copy"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/errorhandling"
"github.com/containers/storage/pkg/archive"
"github.com/containers/storage/pkg/idtools"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/storage/pkg/archive"
"go.podman.io/storage/pkg/idtools"
)
var (

8
cmd/podman/containers/create.go
View file

@ -10,10 +10,6 @@ import (
"strings"
"github.com/containers/buildah/pkg/cli"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/config"
"github.com/containers/image/v5/transports/alltransports"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
@ -24,6 +20,10 @@ import (
"github.com/containers/podman/v5/pkg/util"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/config"
"go.podman.io/image/v5/transports/alltransports"
"go.podman.io/image/v5/types"
"golang.org/x/term"
)

2
cmd/podman/containers/exec.go
View file

@ -9,7 +9,6 @@ import (
"strings"
"time"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/validate"
@ -18,6 +17,7 @@ import (
envLib "github.com/containers/podman/v5/pkg/env"
"github.com/containers/podman/v5/pkg/rootless"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman/containers/export.go
View file

@ -6,12 +6,12 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/parse"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"golang.org/x/term"
)

2
cmd/podman/containers/kill.go
View file

@ -7,7 +7,6 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
@ -15,6 +14,7 @@ import (
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/signal"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman/containers/list.go
View file

@ -1,10 +1,10 @@
package containers
import (
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman/containers/logs.go
View file

@ -5,7 +5,6 @@ import (
"fmt"
"os"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
@ -13,6 +12,7 @@ import (
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/util"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
// logsOptionsWrapper wraps entities.LogsOptions and prevents leaking

2
cmd/podman/containers/mount.go
View file

@ -5,13 +5,13 @@ import (
"fmt"
"os"
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/report"
)
var (

2
cmd/podman/containers/pause.go
View file

@ -6,13 +6,13 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman/containers/prune.go
View file

@ -7,7 +7,6 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/parse"
"github.com/containers/podman/v5/cmd/podman/registry"
@ -15,6 +14,7 @@ import (
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

6
cmd/podman/containers/ps.go
View file

@ -10,9 +10,6 @@ import (
"strings"
"time"
"github.com/containers/common/libnetwork/types"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
@ -21,6 +18,9 @@ import (
"github.com/docker/go-units"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/libnetwork/types"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/report"
)
var (

2
cmd/podman/containers/ps_test.go
View file

@ -3,8 +3,8 @@ package containers
import (
"testing"
"github.com/containers/common/libnetwork/types"
"github.com/stretchr/testify/assert"
"go.podman.io/common/libnetwork/types"
)
func Test_portsToString(t *testing.T) {

2
cmd/podman/containers/restart.go
View file

@ -6,13 +6,13 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman/containers/restore.go
View file

@ -5,7 +5,6 @@ import (
"fmt"
"time"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
@ -13,6 +12,7 @@ import (
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/rootless"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman/containers/rm.go
View file

@ -7,7 +7,6 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
@ -16,6 +15,7 @@ import (
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

4
cmd/podman/containers/run.go
View file

@ -6,8 +6,6 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
@ -18,6 +16,8 @@ import (
"github.com/containers/podman/v5/pkg/specgenutil"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"golang.org/x/term"
)

6
cmd/podman/containers/runlabel.go
View file

@ -4,14 +4,14 @@ import (
"context"
"strings"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"go.podman.io/image/v5/types"
)
// runlabelOptionsWrapper allows for combining API-only with CLI-only options

4
cmd/podman/containers/stats.go
View file

@ -6,8 +6,6 @@ import (
"os"
"strconv"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
putils "github.com/containers/podman/v5/cmd/podman/utils"
@ -16,6 +14,8 @@ import (
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/docker/go-units"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/report"
)
var (

2
cmd/podman/containers/stop.go
View file

@ -7,13 +7,13 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman/containers/top.go
View file

@ -7,7 +7,6 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/validate"
@ -15,6 +14,7 @@ import (
"github.com/containers/podman/v5/pkg/util"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"go.podman.io/common/pkg/report"
)
var (

4
cmd/podman/containers/unpause.go
View file

@ -7,8 +7,6 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/cgroups"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
@ -16,6 +14,8 @@ import (
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/rootless"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/cgroups"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman/containers/wait.go
View file

@ -6,13 +6,13 @@ import (
"fmt"
"time"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

4
cmd/podman/diff/diff.go
View file

@ -6,11 +6,11 @@ import (
"fmt"
"os"
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/storage/pkg/archive"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/report"
"go.podman.io/storage/pkg/archive"
)
func Diff(_ *cobra.Command, args []string, options entities.DiffOptions) error {

2
cmd/podman/farm/build.go
View file

@ -6,13 +6,13 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
"github.com/containers/podman/v5/pkg/farm"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
type buildOptions struct {

4
cmd/podman/farm/create.go
View file

@ -4,11 +4,11 @@ import (
"fmt"
"slices"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/config"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/config"
)
var (

6
cmd/podman/farm/list.go
View file

@ -5,13 +5,13 @@ import (
"os"
"sort"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/config"
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/config"
"go.podman.io/common/pkg/report"
)
var (

2
cmd/podman/farm/remove.go
View file

@ -4,12 +4,12 @@ import (
"errors"
"fmt"
"github.com/containers/common/pkg/config"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/config"
)
var (

4
cmd/podman/farm/update.go
View file

@ -5,12 +5,12 @@ import (
"fmt"
"slices"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/config"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/config"
)
var (

2
cmd/podman/generate/spec.go
View file

@ -4,12 +4,12 @@ import (
"fmt"
"os"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

4
cmd/podman/generate/systemd.go
View file

@ -7,8 +7,6 @@ import (
"os"
"path/filepath"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
@ -17,6 +15,8 @@ import (
systemDefine "github.com/containers/podman/v5/pkg/systemd/define"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/report"
)
const (

2
cmd/podman/images/history.go
View file

@ -5,13 +5,13 @@ import (
"os"
"time"
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/docker/go-units"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/report"
)
var (

2
cmd/podman/images/import.go
View file

@ -8,13 +8,13 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/parse"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/hashicorp/go-multierror"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

4
cmd/podman/images/list.go
View file

@ -10,14 +10,14 @@ import (
"time"
"unicode"
"github.com/containers/common/pkg/report"
"github.com/containers/image/v5/docker/reference"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/docker/go-units"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/report"
"go.podman.io/image/v5/docker/reference"
)
type listFlagType struct {

6
cmd/podman/images/load.go
View file

@ -8,14 +8,14 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/download"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/util"
"github.com/containers/storage/pkg/fileutils"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/download"
"go.podman.io/storage/pkg/fileutils"
"golang.org/x/term"
)

2
cmd/podman/images/mount.go
View file

@ -5,11 +5,11 @@ import (
"fmt"
"os"
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/report"
)
var (

2
cmd/podman/images/prune.go
View file

@ -6,7 +6,6 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/parse"
"github.com/containers/podman/v5/cmd/podman/registry"
@ -14,6 +13,7 @@ import (
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

8
cmd/podman/images/pull.go
View file

@ -7,16 +7,16 @@ import (
"strings"
"github.com/containers/buildah/pkg/cli"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/config"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/util"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/config"
"go.podman.io/image/v5/types"
)
// pullOptionsWrapper wraps entities.ImagePullOptions and prevents leaking

6
cmd/podman/images/push.go
View file

@ -5,14 +5,14 @@ import (
"os"
"github.com/containers/buildah/pkg/cli"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/util"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"go.podman.io/image/v5/types"
)
// pushOptionsWrapper wraps entities.ImagepushOptions and prevents leaking

2
cmd/podman/images/save.go
View file

@ -8,13 +8,13 @@ import (
"slices"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/parse"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/libpod/define"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"golang.org/x/term"
)

2
cmd/podman/images/scp.go
View file

@ -4,11 +4,11 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/ssh"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/ssh"
)
var (

8
cmd/podman/images/search.go
View file

@ -6,15 +6,15 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/report"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/util"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/report"
"go.podman.io/image/v5/types"
)
// searchOptionsWrapper wraps entities.ImagePullOptions and prevents leaking

6
cmd/podman/images/sign.go
View file

@ -3,13 +3,13 @@ package images
import (
"errors"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/storage/pkg/fileutils"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"go.podman.io/storage/pkg/fileutils"
)
var (

2
cmd/podman/images/trust_set.go
View file

@ -6,11 +6,11 @@ import (
"regexp"
"slices"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman/images/trust_show.go
View file

@ -4,11 +4,11 @@ import (
"fmt"
"os"
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/report"
)
var (

2
cmd/podman/images/version.go
View file

@ -4,10 +4,10 @@ import (
"fmt"
"github.com/containers/buildah/define"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman/inspect/inspect.go
View file

@ -8,13 +8,13 @@ import (
"regexp"
"strings"
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/report"
)
// AddInspectFlagSet takes a command and adds the inspect flags and returns an

2
cmd/podman/kube/apply.go
View file

@ -6,12 +6,12 @@ import (
"io"
"os"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

4
cmd/podman/kube/generate.go
View file

@ -5,14 +5,14 @@ import (
"io"
"os"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/generate"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/storage/pkg/fileutils"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/storage/pkg/fileutils"
)
var (

6
cmd/podman/kube/play.go
View file

@ -13,9 +13,6 @@ import (
"syscall"
buildahParse "github.com/containers/buildah/pkg/parse"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/parse"
"github.com/containers/podman/v5/cmd/podman/registry"
@ -27,6 +24,9 @@ import (
"github.com/containers/podman/v5/pkg/errorhandling"
"github.com/containers/podman/v5/pkg/util"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"go.podman.io/image/v5/types"
)
// playKubeOptionsWrapper allows for separating CLI-only fields from API-only

6
cmd/podman/login.go
View file

@ -6,13 +6,13 @@ import (
"fmt"
"os"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"go.podman.io/image/v5/types"
)
type loginOptionsWrapper struct {

6
cmd/podman/logout.go
View file

@ -3,12 +3,12 @@ package main
import (
"os"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"go.podman.io/image/v5/types"
)
var (

2
cmd/podman/machine/client9p.go
View file

@ -10,11 +10,11 @@ import (
"strconv"
"time"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/mdlayher/vsock"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

4
cmd/podman/machine/info.go
View file

@ -7,8 +7,6 @@ import (
"os"
"runtime"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/validate"
@ -18,6 +16,8 @@ import (
"github.com/containers/podman/v5/pkg/machine/env"
"github.com/containers/podman/v5/pkg/machine/vmconfigs"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/report"
"gopkg.in/yaml.v3"
)

6
cmd/podman/machine/init.go
View file

@ -7,9 +7,6 @@ import (
"fmt"
"os"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/strongunits"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/registry"
ldefine "github.com/containers/podman/v5/libpod/define"
"github.com/containers/podman/v5/libpod/events"
@ -19,6 +16,9 @@ import (
"github.com/shirou/gopsutil/v4/mem"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/strongunits"
"go.podman.io/image/v5/types"
)
var (

2
cmd/podman/machine/inspect.go
View file

@ -5,7 +5,6 @@ package machine
import (
"os"
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
@ -13,6 +12,7 @@ import (
"github.com/containers/podman/v5/pkg/machine/env"
"github.com/containers/podman/v5/pkg/machine/vmconfigs"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/report"
)
var (

6
cmd/podman/machine/list.go
View file

@ -10,9 +10,6 @@ import (
"strings"
"time"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/config"
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/validate"
@ -23,6 +20,9 @@ import (
"github.com/containers/podman/v5/pkg/machine/vmconfigs"
"github.com/docker/go-units"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/config"
"go.podman.io/common/pkg/report"
)
var (

2
cmd/podman/machine/os/manager.go
View file

@ -8,12 +8,12 @@ import (
"os"
"strings"
machineconfig "github.com/containers/common/pkg/machine"
"github.com/containers/podman/v5/pkg/machine/define"
"github.com/containers/podman/v5/pkg/machine/env"
pkgOS "github.com/containers/podman/v5/pkg/machine/os"
"github.com/containers/podman/v5/pkg/machine/provider"
"github.com/containers/podman/v5/pkg/machine/vmconfigs"
machineconfig "go.podman.io/common/pkg/machine"
)
type ManagerOpts struct {

2
cmd/podman/machine/reset.go
View file

@ -9,7 +9,6 @@ import (
"strings"
"text/tabwriter"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/validate"
"github.com/containers/podman/v5/pkg/machine"
@ -17,6 +16,7 @@ import (
"github.com/containers/podman/v5/pkg/machine/shim"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman/machine/server9p.go
View file

@ -8,12 +8,12 @@ import (
"strings"
"time"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/fileserver"
psutil "github.com/shirou/gopsutil/v4/process"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

4
cmd/podman/machine/set.go
View file

@ -3,14 +3,14 @@
package machine
import (
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/strongunits"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/machine/define"
"github.com/containers/podman/v5/pkg/machine/env"
"github.com/containers/podman/v5/pkg/machine/shim"
"github.com/containers/podman/v5/pkg/machine/vmconfigs"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/strongunits"
)
var (

2
cmd/podman/machine/ssh.go
View file

@ -8,12 +8,12 @@ import (
"github.com/containers/podman/v5/pkg/machine/define"
"github.com/containers/podman/v5/pkg/machine/env"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
"github.com/containers/podman/v5/pkg/machine"
"github.com/containers/podman/v5/pkg/machine/vmconfigs"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman/main.go
View file

@ -30,9 +30,9 @@ import (
"github.com/containers/podman/v5/pkg/logiface"
"github.com/containers/podman/v5/pkg/rootless"
"github.com/containers/podman/v5/pkg/terminal"
"github.com/containers/storage/pkg/reexec"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/storage/pkg/reexec"
"golang.org/x/term"
)

6
cmd/podman/manifest/add.go
View file

@ -7,15 +7,15 @@ import (
"os"
"strings"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/util"
imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"go.podman.io/image/v5/types"
)
// manifestAddOptsWrapper wraps entities.ManifestAddOptions and prevents

2
cmd/podman/manifest/annotate.go
View file

@ -5,11 +5,11 @@ import (
"fmt"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
// manifestAnnotateOptsWrapper wraps entities.ManifestAnnotateOptions and

4
cmd/podman/manifest/create.go
View file

@ -5,12 +5,12 @@ import (
"fmt"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/image/v5/types"
)
// manifestCreateOptsWrapper wraps entities.ManifestCreateOptions and prevents leaking

6
cmd/podman/manifest/inspect.go
View file

@ -4,13 +4,13 @@ import (
"encoding/json"
"fmt"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"go.podman.io/image/v5/types"
)
var (

6
cmd/podman/manifest/push.go
View file

@ -5,15 +5,15 @@ import (
"fmt"
"os"
"github.com/containers/common/pkg/auth"
"github.com/containers/common/pkg/completion"
"github.com/containers/image/v5/types"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/util"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/auth"
"go.podman.io/common/pkg/completion"
"go.podman.io/image/v5/types"
)
// manifestPushOptsWrapper wraps entities.ManifestPushOptions and prevents leaking

4
cmd/podman/networks/connect.go
View file

@ -3,12 +3,12 @@ package network
import (
"net"
"github.com/containers/common/libnetwork/types"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/libnetwork/types"
"go.podman.io/common/pkg/completion"
)
var (

6
cmd/podman/networks/create.go
View file

@ -7,15 +7,15 @@ import (
"strconv"
"strings"
"github.com/containers/common/libnetwork/types"
"github.com/containers/common/libnetwork/util"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/parse"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/libnetwork/types"
"go.podman.io/common/libnetwork/util"
"go.podman.io/common/pkg/completion"
)
var (

6
cmd/podman/networks/list.go
View file

@ -6,9 +6,6 @@ import (
"sort"
"strings"
"github.com/containers/common/libnetwork/types"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/parse"
"github.com/containers/podman/v5/cmd/podman/registry"
@ -16,6 +13,9 @@ import (
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"go.podman.io/common/libnetwork/types"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/report"
)
var (

2
cmd/podman/networks/rm.go
View file

@ -5,7 +5,6 @@ import (
"fmt"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/cmd/podman/utils"
@ -13,6 +12,7 @@ import (
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"go.podman.io/common/pkg/completion"
)
var (

2
cmd/podman/networks/update.go
View file

@ -3,11 +3,11 @@ package network
import (
"fmt"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

4
cmd/podman/parse/net.go
View file

@ -10,8 +10,8 @@ import (
"os"
"strings"
"github.com/containers/common/libnetwork/etchosts"
"github.com/containers/storage/pkg/regexp"
"go.podman.io/common/libnetwork/etchosts"
"go.podman.io/storage/pkg/regexp"
)
const (

2
cmd/podman/parse/net_test.go
View file

@ -9,8 +9,8 @@ import (
"os"
"testing"
"github.com/containers/common/libnetwork/etchosts"
"github.com/stretchr/testify/assert"
"go.podman.io/common/libnetwork/etchosts"
)
var (

2
cmd/podman/pods/clone.go
View file

@ -4,12 +4,12 @@ import (
"context"
"fmt"
"github.com/containers/common/pkg/completion"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/registry"
"github.com/containers/podman/v5/libpod/define"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
)
var (

6
cmd/podman/pods/create.go
View file

@ -9,8 +9,6 @@ import (
"strconv"
"strings"
"github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/sysinfo"
"github.com/containers/podman/v5/cmd/podman/common"
"github.com/containers/podman/v5/cmd/podman/containers"
"github.com/containers/podman/v5/cmd/podman/parse"
@ -21,9 +19,11 @@ import (
"github.com/containers/podman/v5/pkg/specgen"
"github.com/containers/podman/v5/pkg/specgenutil"
"github.com/containers/podman/v5/pkg/util"
"github.com/containers/storage/pkg/parsers"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.podman.io/common/pkg/completion"
"go.podman.io/common/pkg/sysinfo"
"go.podman.io/storage/pkg/parsers"
)
var (

Some files were not shown because too many files have changed in this diff Show more