Skip to content

Commit

Permalink
Don't validate platform-dep tmpfs opts on client
Browse files Browse the repository at this point in the history
Daemon still does validation and errors out on incorrect options.

Fixes an issue where non-Linux clients attempting to pass tmpfs options
on `docker run` to a Linux daemon will incorrectly error out.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
  • Loading branch information
cpuguy83 committed Nov 15, 2016
1 parent a27e51e commit b9b8d8b
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions runconfig/opts/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
networktypes "github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/strslice"
"github.com/docker/docker/opts"
"github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/signal"
"github.com/docker/go-connections/nat"
units "github.com/docker/go-units"
Expand Down Expand Up @@ -378,9 +377,6 @@ func Parse(flags *pflag.FlagSet, copts *ContainerOptions) (*container.Config, *c
tmpfs := make(map[string]string)
for _, t := range copts.tmpfs.GetAll() {
if arr := strings.SplitN(t, ":", 2); len(arr) > 1 {
if _, _, err := mount.ParseTmpfsOptions(arr[1]); err != nil {
return nil, nil, nil, err
}
tmpfs[arr[0]] = arr[1]
} else {
tmpfs[arr[0]] = ""
Expand Down

0 comments on commit b9b8d8b

Please sign in to comment.