diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/common.go | 4 | ||||
| -rw-r--r-- | cmd/podman/port.go | 49 | ||||
| -rw-r--r-- | cmd/podman/shared/create.go | 5 | ||||
| -rw-r--r-- | cmd/podman/shared/intermediate.go | 1 |
4 files changed, 30 insertions, 29 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index 6fa2b3c71..4eeb09d42 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -396,6 +396,10 @@ func getCreateFlags(c *cliconfig.PodmanCommand) { "Assign a name to the container", ) createFlags.Bool( + "no-healthcheck", false, + "Disable healthchecks on container", + ) + createFlags.Bool( "oom-kill-disable", false, "Disable OOM Killer", ) diff --git a/cmd/podman/port.go b/cmd/podman/port.go index eef3d4b1d..4bb79a3a2 100644 --- a/cmd/podman/port.go +++ b/cmd/podman/port.go @@ -7,6 +7,7 @@ import ( "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/pkg/adapter" + "github.com/docker/go-connections/nat" "github.com/pkg/errors" "github.com/spf13/cobra" ) @@ -16,7 +17,7 @@ var ( portDescription = `List port mappings for the CONTAINER, or lookup the public-facing port that is NAT-ed to the PRIVATE_PORT ` _portCommand = &cobra.Command{ - Use: "port [flags] CONTAINER", + Use: "port [flags] CONTAINER [PORT]", Short: "List port mappings or a specific mapping for the container", Long: portDescription, RunE: func(cmd *cobra.Command, args []string) error { @@ -48,8 +49,8 @@ func init() { func portCmd(c *cliconfig.PortValues) error { var ( - userProto string - userPort int + userPort nat.Port + err error ) args := c.InputArgs @@ -70,25 +71,19 @@ func portCmd(c *cliconfig.PortValues) error { if len(args) == 1 && c.Latest { port = args[0] } - if port != "" { + if len(port) > 0 { fields := strings.Split(port, "/") - // User supplied at least port - var err error - // User supplied port and protocol - if len(fields) == 2 { - userProto = fields[1] - } - if len(fields) >= 1 { - p := fields[0] - userPort, err = strconv.Atoi(p) - if err != nil { - return errors.Wrapf(err, "unable to format port") - } - } - // Format is incorrect if len(fields) > 2 || len(fields) < 1 { return errors.Errorf("port formats are port/protocol. '%s' is invalid", port) } + if len(fields) == 1 { + fields = append(fields, "tcp") + } + + userPort, err = nat.NewPort(fields[1], fields[0]) + if err != nil { + return err + } } runtime, err := adapter.GetRuntime(getContext(), &c.PodmanCommand) @@ -96,7 +91,6 @@ func portCmd(c *cliconfig.PortValues) error { return errors.Wrapf(err, "could not get runtime") } defer runtime.DeferredShutdown(false) - containers, err := runtime.Port(c) if err != nil { return err @@ -122,17 +116,18 @@ func portCmd(c *cliconfig.PortValues) error { fmt.Printf("%d/%s -> %s:%d\n", v.ContainerPort, v.Protocol, hostIP, v.HostPort) continue } - // We have a match on ports - if v.ContainerPort == int32(userPort) { - if userProto == "" || userProto == v.Protocol { - fmt.Printf("%s:%d\n", hostIP, v.HostPort) - found = true - break - } + containerPort, err := nat.NewPort(v.Protocol, strconv.Itoa(int(v.ContainerPort))) + if err != nil { + return err + } + if containerPort == userPort { + fmt.Printf("%s:%d\n", hostIP, v.HostPort) + found = true + break } } if !found && port != "" { - return errors.Errorf("failed to find published port '%d'", userPort) + return errors.Errorf("failed to find published port %q", port) } } diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go index 5b244699c..0814eeba3 100644 --- a/cmd/podman/shared/create.go +++ b/cmd/podman/shared/create.go @@ -120,12 +120,13 @@ func CreateContainer(ctx context.Context, c *GenericCLIResults, runtime *libpod. imageName = newImage.ID() } - // if the user disabled the healthcheck with "none", we skip adding it + // if the user disabled the healthcheck with "none" or the no-healthcheck + // options is provided, we skip adding it healthCheckCommandInput := c.String("healthcheck-command") // the user didn't disable the healthcheck but did pass in a healthcheck command // now we need to make a healthcheck from the commandline input - if healthCheckCommandInput != "none" { + if healthCheckCommandInput != "none" && !c.Bool("no-healthcheck") { if len(healthCheckCommandInput) > 0 { healthCheck, err = makeHealthCheckFromCli(c) if err != nil { diff --git a/cmd/podman/shared/intermediate.go b/cmd/podman/shared/intermediate.go index ee212234f..e76750042 100644 --- a/cmd/podman/shared/intermediate.go +++ b/cmd/podman/shared/intermediate.go @@ -425,6 +425,7 @@ func NewIntermediateLayer(c *cliconfig.PodmanCommand, remote bool) GenericCLIRes m["memory-swappiness"] = newCRInt64(c, "memory-swappiness") m["name"] = newCRString(c, "name") m["network"] = newCRString(c, "network") + m["no-healthcheck"] = newCRBool(c, "no-healthcheck") m["no-hosts"] = newCRBool(c, "no-hosts") m["oom-kill-disable"] = newCRBool(c, "oom-kill-disable") m["oom-score-adj"] = newCRInt(c, "oom-score-adj") |