summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd/podman/create.go2
-rw-r--r--cmd/podman/parse.go15
-rw-r--r--completions/bash/podman1
-rw-r--r--docs/podman-create.1.md11
-rw-r--r--docs/podman-run.1.md11
5 files changed, 0 insertions, 40 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index 83115c527..d592d5a8d 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -114,7 +114,6 @@ type createConfig struct {
SigProxy bool //sig-proxy
StopSignal syscall.Signal // stop-signal
StopTimeout uint // stop-timeout
- StorageOpts []string //storage-opt
Sysctl map[string]string //sysctl
Tmpfs []string // tmpfs
Tty bool //tty
@@ -626,7 +625,6 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string,
SigProxy: c.Bool("sig-proxy"),
StopSignal: stopSignal,
StopTimeout: c.Uint("stop-timeout"),
- StorageOpts: c.StringSlice("storage-opt"),
Sysctl: sysctl,
Tmpfs: c.StringSlice("tmpfs"),
Tty: tty,
diff --git a/cmd/podman/parse.go b/cmd/podman/parse.go
index bb45d08c4..33988a3b6 100644
--- a/cmd/podman/parse.go
+++ b/cmd/podman/parse.go
@@ -696,21 +696,6 @@ func parseSecurityOpts(securityOpts []string) ([]string, error) { //nolint
return securityOpts, nil
}
-// parses storage options per container into a map
-// for storage-opt flag
-func parseStorageOpts(storageOpts []string) (map[string]string, error) { //nolint
- m := make(map[string]string)
- for _, option := range storageOpts {
- if strings.Contains(option, "=") {
- opt := strings.SplitN(option, "=", 2)
- m[opt[0]] = opt[1]
- } else {
- return nil, errors.Errorf("invalid storage option %q", option)
- }
- }
- return m, nil
-}
-
// convertKVStringsToMap converts ["key=value"] to {"key":"value"}
func convertKVStringsToMap(values []string) map[string]string {
result := make(map[string]string, len(values))
diff --git a/completions/bash/podman b/completions/bash/podman
index 8447ab436..b1a19f255 100644
--- a/completions/bash/podman
+++ b/completions/bash/podman
@@ -1079,7 +1079,6 @@ _podman_container_run() {
--shm-size
--stop-signal
--stop-timeout
- --storage-opt
--tmpfs
--sysctl
--ulimit
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md
index bf2f8b4c2..10a790f4a 100644
--- a/docs/podman-create.1.md
+++ b/docs/podman-create.1.md
@@ -422,17 +422,6 @@ incompatible with any restart policy other than `none`.
**--stop-timeout**=*10*
Timeout (in seconds) to stop a container. Default is 10.
-**--storage-opt**=[]
- Storage driver options per container
-
- $ podman create -it --storage-opt size=120G fedora /bin/bash
-
- This (size) will allow to set the container rootfs size to 120G at creation time.
- This option is only available for the `devicemapper`, `btrfs`, `overlay2` and `zfs` graph drivers.
- For the `devicemapper`, `btrfs` and `zfs` storage drivers, user cannot pass a size less than the Default BaseFS Size.
- For the `overlay2` storage driver, the size option is only available if the backing fs is `xfs` and mounted with the `pquota` mount option.
- Under these conditions, user can pass any size less then the backing fs size.
-
**--sysctl**=SYSCTL
Configure namespaced kernel parameters at runtime
diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md
index 416e83a97..8a36bf425 100644
--- a/docs/podman-run.1.md
+++ b/docs/podman-run.1.md
@@ -420,17 +420,6 @@ incompatible with any restart policy other than `none`.
**--stop-timeout**=*10*
Timeout (in seconds) to stop a container. Default is 10.
-**--storage-opt**=[]
- Storage driver options per container
-
- $ podman run -it --storage-opt size=120G fedora /bin/bash
-
- This (size) will allow to set the container rootfs size to 120G at creation time.
- This option is only available for the `devicemapper`, `btrfs`, `overlay2` and `zfs` graph drivers.
- For the `devicemapper`, `btrfs` and `zfs` storage drivers, user cannot pass a size less than the Default BaseFS Size.
- For the `overlay2` storage driver, the size option is only available if the backing fs is `xfs` and mounted with the `pquota` mount option.
- Under these conditions, user can pass any size less then the backing fs size.
-
**--sysctl**=SYSCTL
Configure namespaced kernel parameters at runtime