summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-04-30 15:22:50 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-05-01 21:47:34 +0000
commit970eaf003328cab69aa4ccaa78cf908f5a87fff0 (patch)
tree6145d0643bee8140ea4798ff9c46c4216e4f5642 /cmd
parente98ad5751d12b6ef052803b30fd397101952294e (diff)
downloadpodman-970eaf003328cab69aa4ccaa78cf908f5a87fff0.tar.gz
podman-970eaf003328cab69aa4ccaa78cf908f5a87fff0.tar.bz2
podman-970eaf003328cab69aa4ccaa78cf908f5a87fff0.zip
podman should assign a host port to -p when omitted
If the user does not provide a host port when adding -p to create/run, podman should inject an available random port. podman run -p 80 .... podman should assign a random port to the host and expose the container port 80 to it Signed-off-by: baude <bbaude@redhat.com> Closes: #703 Approved by: rhatdan
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/create.go43
1 files changed, 32 insertions, 11 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index 856fbfa83..54a542ee5 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -371,26 +371,47 @@ func exposedPorts(c *cli.Context, imageExposedPorts map[string]struct{}) (map[na
if err != nil {
return nil, err
}
- l, err := net.Listen("tcp", ":0")
+ rp, err := getRandomPort()
if err != nil {
- return nil, errors.Wrapf(err, "unable to get free port")
- }
- defer l.Close()
- _, randomPort, err := net.SplitHostPort(l.Addr().String())
- if err != nil {
- return nil, errors.Wrapf(err, "unable to determine free port")
+ return nil, err
}
- rp, err := strconv.Atoi(randomPort)
+ logrus.Debug(fmt.Sprintf("Using random host port %d with container port %d", rp, p.Int()))
+ portBindings[p] = CreatePortBinding(rp, "")
+ }
+ }
+
+ // We need to see if any host ports are not populated and if so, we need to assign a
+ // random port to them.
+ for k, pb := range portBindings {
+ if pb[0].HostPort == "" {
+ hostPort, err := getRandomPort()
if err != nil {
- return nil, errors.Wrapf(err, "unable to convert random port to int")
+ return nil, err
}
- logrus.Debug(fmt.Sprintf("Using random host port %s with container port %d", randomPort, p.Int()))
- portBindings[p] = CreatePortBinding(rp, "")
+ logrus.Debug(fmt.Sprintf("Using random host port %d with container port %s", hostPort, k.Port()))
+ pb[0].HostPort = strconv.Itoa(hostPort)
}
}
return portBindings, nil
}
+func getRandomPort() (int, error) {
+ l, err := net.Listen("tcp", ":0")
+ if err != nil {
+ return 0, errors.Wrapf(err, "unable to get free port")
+ }
+ defer l.Close()
+ _, randomPort, err := net.SplitHostPort(l.Addr().String())
+ if err != nil {
+ return 0, errors.Wrapf(err, "unable to determine free port")
+ }
+ rp, err := strconv.Atoi(randomPort)
+ if err != nil {
+ return 0, errors.Wrapf(err, "unable to convert random port to int")
+ }
+ return rp, nil
+}
+
// Parses CLI options related to container creation into a config which can be
// parsed into an OCI runtime spec
func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string, data *inspect.ImageData) (*createConfig, error) {