From 64dc8039e95ab10648e773aec89513f48a5d17f8 Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Wed, 2 May 2018 11:01:31 -0500
Subject: remove options from create/run that we cannot support

Signed-off-by: baude <bbaude@redhat.com>

Closes: #711
Approved by: rhatdan
---
 cmd/podman/common.go    | 16 ----------------
 completions/bash/podman |  4 ----
 docs/podman-create.1.md | 14 +++++---------
 docs/podman-run.1.md    | 14 +++++---------
 4 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index 9ee99bebc..68d22b629 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -216,14 +216,6 @@ var createFlags = []cli.Flag{
 		Name:  "interactive, i",
 		Usage: "Keep STDIN open even if not attached",
 	},
-	cli.StringFlag{
-		Name:  "ip",
-		Usage: "Container IPv4 address (e.g. 172.23.0.9)",
-	},
-	cli.StringFlag{
-		Name:  "ip6",
-		Usage: "Container IPv6 address (e.g. 2001:db8::1b99)",
-	},
 	cli.StringFlag{
 		Name:  "ipc",
 		Usage: "IPC Namespace to use",
@@ -240,10 +232,6 @@ var createFlags = []cli.Flag{
 		Name:  "label-file",
 		Usage: "Read in a line delimited file of labels (default [])",
 	},
-	cli.StringSliceFlag{
-		Name:  "link-local-ip",
-		Usage: "Container IPv4/IPv6 link-local addresses (default [])",
-	},
 	cli.StringFlag{
 		Name:  "log-driver",
 		Usage: "Logging driver for the container",
@@ -287,10 +275,6 @@ var createFlags = []cli.Flag{
 		Usage: "Connect a container to a network",
 		Value: "bridge",
 	},
-	cli.StringSliceFlag{
-		Name:  "network-alias",
-		Usage: "Add network-scoped alias for the container (default [])",
-	},
 	cli.BoolFlag{
 		Name:  "oom-kill-disable",
 		Usage: "Disable OOM Killer",
diff --git a/completions/bash/podman b/completions/bash/podman
index 4c9be0ab2..d9b3442c1 100644
--- a/completions/bash/podman
+++ b/completions/bash/podman
@@ -1076,13 +1076,10 @@ _podman_container_run() {
 		--hostname -h
 		--image-volume
 		--init-path
-		--ip
-		--ip6
 		--ipc
 		--kernel-memory
 		--label-file
 		--label -l
-		--link-local-ip
 		--log-driver
 		--log-opt
 		--mac-address
@@ -1092,7 +1089,6 @@ _podman_container_run() {
 		--memory-reservation
 		--name
 		--network
-		--network-alias
 		--oom-score-adj
 		--pid
 		--pids-limit
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md
index 2a8ccfa33..457f54edd 100644
--- a/docs/podman-create.1.md
+++ b/docs/podman-create.1.md
@@ -231,15 +231,11 @@ inside of the container.
 **-i**, **--interactive**=*true*|*false*
    Keep STDIN open even if not attached. The default is *false*.
 
-**--ip**=""
-   Sets the container's interface IPv4 address (e.g. 172.23.0.9)
-
-   It can only be used in conjunction with **--network** for user-defined networks
-
 **--ip6**=""
-   Sets the container's interface IPv6 address (e.g. 2001:db8::1b99)
+   Not implemented
 
-   It can only be used in conjunction with **--network** for user-defined networks
+**--ip**=""
+   Not implemented
 
 **--ipc**=""
    Default is to create a private IPC namespace (POSIX SysV IPC) for the container
@@ -262,7 +258,7 @@ millions of trillions.
    Read in a line delimited file of labels
 
 **--link-local-ip**=[]
-   Add one or more link-local IPv4/IPv6 addresses to the container's interface
+   Not implemented
 
 **--log-driver**="*json-file*"
   Logging driver for the container. Default is defined by daemon `--log-driver` flag.
@@ -332,7 +328,7 @@ This works for both background and foreground containers.
 			       '<network-name>|<network-id>': connect to a user-defined network
 
 **--network-alias**=[]
-   Add network-scoped alias for the container
+    Not implemented
 
 **--oom-kill-disable**=*true*|*false*
    Whether to disable OOM Killer for the container or not.
diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md
index 31ddd446e..a198fd9d4 100644
--- a/docs/podman-run.1.md
+++ b/docs/podman-run.1.md
@@ -238,15 +238,11 @@ inside of the container.
 
    When set to true, keep stdin open even if not attached. The default is false.
 
-**--ip**=""
-   Sets the container's interface IPv4 address (e.g. 172.23.0.9)
-
-   It can only be used in conjunction with **--network** for user-defined networks
-
 **--ip6**=""
-   Sets the container's interface IPv6 address (e.g. 2001:db8::1b99)
+    Not implemented
 
-   It can only be used in conjunction with **--network** for user-defined networks
+**--ip**=""
+    Not implemented
 
 **--ipc**=""
    Default is to create a private IPC namespace (POSIX SysV IPC) for the container
@@ -269,7 +265,7 @@ millions of trillions.
    Read in a line delimited file of labels
 
 **--link-local-ip**=[]
-   Add one or more link-local IPv4/IPv6 addresses to the container's interface
+   Not implemented
 
 **--log-driver**="*json-file*"
   Logging driver for the container. Default is defined by daemon `--log-driver` flag.
@@ -341,7 +337,7 @@ This works for both background and foreground containers.
 			       '<network-name>|<network-id>': connect to a user-defined network
 
 **--network-alias**=[]
-   Add network-scoped alias for the container
+    Not implemented
 
 **--oom-kill-disable**=*true*|*false*
    Whether to disable OOM Killer for the container or not.
-- 
cgit v1.2.3-54-g00ecf