summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/registry/registry.go3
-rw-r--r--cmd/podman/system/service.go17
-rw-r--r--cmd/podman/system/varlink.go61
3 files changed, 1 insertions, 80 deletions
diff --git a/cmd/podman/registry/registry.go b/cmd/podman/registry/registry.go
index 9c0b290e7..481ed810f 100644
--- a/cmd/podman/registry/registry.go
+++ b/cmd/podman/registry/registry.go
@@ -18,9 +18,6 @@ const DefaultRootAPIPath = "/run/podman/podman.sock"
// DefaultRootAPIAddress is the default address of the REST socket with unix: prefix
const DefaultRootAPIAddress = "unix:" + DefaultRootAPIPath
-// DefaultVarlinkAddress is the default address of the varlink socket
-const DefaultVarlinkAddress = "unix:/run/podman/io.podman"
-
type CliCommand struct {
Mode []entities.EngineMode
Command *cobra.Command
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go
index 78062d135..42482b5d9 100644
--- a/cmd/podman/system/service.go
+++ b/cmd/podman/system/service.go
@@ -38,7 +38,6 @@ Enable a listening service for API access to Podman commands.
srvArgs = struct {
Timeout int64
- Varlink bool
}{}
)
@@ -55,9 +54,6 @@ func init() {
flags.Int64VarP(&srvArgs.Timeout, timeFlagName, "t", 5, "Time until the service session expires in seconds. Use 0 to disable the timeout")
_ = srvCmd.RegisterFlagCompletionFunc(timeFlagName, completion.AutocompleteNone)
- flags.BoolVar(&srvArgs.Varlink, "varlink", false, "Use legacy varlink service instead of REST. Unit of --time changes from seconds to milliseconds.")
-
- _ = flags.MarkDeprecated("varlink", "valink API is deprecated.")
flags.SetNormalizeFunc(aliasTimeoutFlag)
}
@@ -97,11 +93,6 @@ func service(cmd *cobra.Command, args []string) error {
Command: cmd,
}
- if srvArgs.Varlink {
- opts.Timeout = time.Duration(srvArgs.Timeout) * time.Millisecond
- return registry.ContainerEngine().VarlinkService(registry.GetContext(), opts)
- }
-
opts.Timeout = time.Duration(srvArgs.Timeout) * time.Second
return restService(opts, cmd.Flags(), registry.PodmanConfig())
}
@@ -111,8 +102,7 @@ func resolveAPIURI(_url []string) (string, error) {
// 1) User input wins always
// 2) systemd socket activation
// 3) rootless honors XDG_RUNTIME_DIR
- // 4) if varlink -- adapter.DefaultVarlinkAddress
- // 5) lastly adapter.DefaultAPIAddress
+ // 4) lastly adapter.DefaultAPIAddress
if len(_url) == 0 {
if v, found := os.LookupEnv("PODMAN_SOCKET"); found {
@@ -134,16 +124,11 @@ func resolveAPIURI(_url []string) (string, error) {
}
socketName := "podman.sock"
- if srvArgs.Varlink {
- socketName = "io.podman"
- }
socketPath := filepath.Join(xdg, "podman", socketName)
if err := os.MkdirAll(filepath.Dir(socketPath), 0700); err != nil {
return "", err
}
return "unix:" + socketPath, nil
- case srvArgs.Varlink:
- return registry.DefaultVarlinkAddress, nil
default:
if err := os.MkdirAll(filepath.Dir(registry.DefaultRootAPIPath), 0700); err != nil {
return "", err
diff --git a/cmd/podman/system/varlink.go b/cmd/podman/system/varlink.go
deleted file mode 100644
index 363ac9cca..000000000
--- a/cmd/podman/system/varlink.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// +build linux,!remote
-
-package system
-
-import (
- "time"
-
- "github.com/containers/common/pkg/completion"
- "github.com/containers/podman/v2/cmd/podman/registry"
- "github.com/containers/podman/v2/pkg/domain/entities"
- "github.com/spf13/cobra"
-)
-
-var (
- varlinkDescription = `Run varlink interface. Podman varlink listens on the specified unix domain socket for incoming connects.
-
- Tools speaking varlink protocol can remotely manage pods, containers and images.
-`
- varlinkCmd = &cobra.Command{
- Use: "varlink [options] [URI]",
- Args: cobra.MinimumNArgs(1),
- Short: "Run varlink interface",
- Long: varlinkDescription,
- RunE: varlinkE,
- ValidArgsFunction: completion.AutocompleteDefault,
- Deprecated: "Please see 'podman system service' for RESTful APIs",
- Hidden: true,
- Example: `podman varlink unix:/run/podman/io.podman
- podman varlink --time 5000 unix:/run/podman/io.podman`,
- }
- varlinkArgs = struct {
- Timeout int64
- }{}
-)
-
-func init() {
- registry.Commands = append(registry.Commands, registry.CliCommand{
- Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
- Command: varlinkCmd,
- })
- flags := varlinkCmd.Flags()
-
- timeFlagName := "time"
- flags.Int64VarP(&varlinkArgs.Timeout, timeFlagName, "t", 1000, "Time until the varlink session expires in milliseconds. Use 0 to disable the timeout")
- _ = varlinkCmd.RegisterFlagCompletionFunc(timeFlagName, completion.AutocompleteNone)
-
- flags.SetNormalizeFunc(aliasTimeoutFlag)
-}
-
-func varlinkE(cmd *cobra.Command, args []string) error {
- uri := registry.DefaultVarlinkAddress
- if len(args) > 0 {
- uri = args[0]
- }
- opts := entities.ServiceOptions{
- URI: uri,
- Timeout: time.Duration(varlinkArgs.Timeout) * time.Second,
- Command: cmd,
- }
- return registry.ContainerEngine().VarlinkService(registry.GetContext(), opts)
-}