@@ -14,9 +14,6 @@ import (

 	"github.com/docker/docker/api/types/backend"

 	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/builder"

-	"github.com/docker/docker/builder/dockerfile/instructions"

-	"github.com/docker/docker/builder/dockerfile/parser"

-	"github.com/docker/docker/builder/dockerfile/shell"

 	"github.com/docker/docker/builder/fscache"

 	"github.com/docker/docker/builder/remotecontext"

 	"github.com/docker/docker/errdefs"

@@ -24,6 +21,9 @@ import (

 	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/stringid"

 	"github.com/docker/docker/pkg/system"

+	"github.com/moby/buildkit/frontend/dockerfile/instructions"

+	"github.com/moby/buildkit/frontend/dockerfile/parser"

+	"github.com/moby/buildkit/frontend/dockerfile/shell"

 	"github.com/moby/buildkit/session"

 	"github.com/pkg/errors"

 	"github.com/sirupsen/logrus"

deleted file mode 100644

@@ -1,46 +0,0 @@

-// Package command contains the set of Dockerfile commands.

-package command // import "github.com/docker/docker/builder/dockerfile/command"

-

-// Define constants for the command strings

-const (

-	Add         = "add"

-	Arg         = "arg"

-	Cmd         = "cmd"

-	Copy        = "copy"

-	Entrypoint  = "entrypoint"

-	Env         = "env"

-	Expose      = "expose"

-	From        = "from"

-	Healthcheck = "healthcheck"

-	Label       = "label"

-	Maintainer  = "maintainer"

-	Onbuild     = "onbuild"

-	Run         = "run"

-	Shell       = "shell"

-	StopSignal  = "stopsignal"

-	User        = "user"

-	Volume      = "volume"

-	Workdir     = "workdir"

-)

-

-// Commands is list of all Dockerfile commands

-var Commands = map[string]struct{}{

-	Add:         {},

-	Arg:         {},

-	Cmd:         {},

-	Copy:        {},

-	Entrypoint:  {},

-	Env:         {},

-	Expose:      {},

-	From:        {},

-	Healthcheck: {},

-	Label:       {},

-	Maintainer:  {},

-	Onbuild:     {},

-	Run:         {},

-	Shell:       {},

-	StopSignal:  {},

-	User:        {},

-	Volume:      {},

-	Workdir:     {},

-}

@@ -18,15 +18,15 @@ import (

 	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/strslice"

 	"github.com/docker/docker/builder"

-	"github.com/docker/docker/builder/dockerfile/instructions"

-	"github.com/docker/docker/builder/dockerfile/parser"

-	"github.com/docker/docker/builder/dockerfile/shell"

 	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/pkg/jsonmessage"

 	"github.com/docker/docker/pkg/signal"

 	"github.com/docker/docker/pkg/system"

 	"github.com/docker/go-connections/nat"

+	"github.com/moby/buildkit/frontend/dockerfile/instructions"

+	"github.com/moby/buildkit/frontend/dockerfile/parser"

+	"github.com/moby/buildkit/frontend/dockerfile/shell"

 	"github.com/pkg/errors"

 	"github.com/sirupsen/logrus"

 )

@@ -11,13 +11,13 @@ import (

 	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/strslice"

 	"github.com/docker/docker/builder"

-	"github.com/docker/docker/builder/dockerfile/instructions"

-	"github.com/docker/docker/builder/dockerfile/shell"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/pkg/system"

 	"github.com/docker/go-connections/nat"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

+	"github.com/moby/buildkit/frontend/dockerfile/instructions"

+	"github.com/moby/buildkit/frontend/dockerfile/shell"

 )

 func newBuilderWithMockBackend() *Builder {

@@ -27,11 +27,11 @@ import (

 	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/builder"

-	"github.com/docker/docker/builder/dockerfile/instructions"

-	"github.com/docker/docker/builder/dockerfile/shell"

 	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/system"

 	"github.com/docker/docker/runconfig/opts"

+	"github.com/moby/buildkit/frontend/dockerfile/instructions"

+	"github.com/moby/buildkit/frontend/dockerfile/shell"

 	"github.com/pkg/errors"

 )

@@ -4,13 +4,13 @@ import (

 	"os"

 	"testing"

-	"github.com/docker/docker/builder/dockerfile/instructions"

 	"github.com/docker/docker/builder/remotecontext"

 	"github.com/docker/docker/pkg/archive"

 	"github.com/docker/docker/pkg/reexec"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

 	"github.com/gotestyourself/gotestyourself/skip"

+	"github.com/moby/buildkit/frontend/dockerfile/instructions"

 )

 type dispatchTestCase struct {

deleted file mode 100644

@@ -1,183 +0,0 @@

-package instructions // import "github.com/docker/docker/builder/dockerfile/instructions"

-

-import (

-	"fmt"

-	"strings"

-)

-

-// FlagType is the type of the build flag

-type FlagType int

-

-const (

-	boolType FlagType = iota

-	stringType

-)

-

-// BFlags contains all flags information for the builder

-type BFlags struct {

-	Args  []string // actual flags/args from cmd line

-	flags map[string]*Flag

-	used  map[string]*Flag

-	Err   error

-}

-

-// Flag contains all information for a flag

-type Flag struct {

-	bf       *BFlags

-	name     string

-	flagType FlagType

-	Value    string

-}

-

-// NewBFlags returns the new BFlags struct

-func NewBFlags() *BFlags {

-	return &BFlags{

-		flags: make(map[string]*Flag),

-		used:  make(map[string]*Flag),

-	}

-}

-

-// NewBFlagsWithArgs returns the new BFlags struct with Args set to args

-func NewBFlagsWithArgs(args []string) *BFlags {

-	flags := NewBFlags()

-	flags.Args = args

-	return flags

-}

-

-// AddBool adds a bool flag to BFlags

-// Note, any error will be generated when Parse() is called (see Parse).

-func (bf *BFlags) AddBool(name string, def bool) *Flag {

-	flag := bf.addFlag(name, boolType)

-	if flag == nil {

-		return nil

-	}

-	if def {

-		flag.Value = "true"

-	} else {

-		flag.Value = "false"

-	}

-	return flag

-}

-

-// AddString adds a string flag to BFlags

-// Note, any error will be generated when Parse() is called (see Parse).

-func (bf *BFlags) AddString(name string, def string) *Flag {

-	flag := bf.addFlag(name, stringType)

-	if flag == nil {

-		return nil

-	}

-	flag.Value = def

-	return flag

-}

-

-// addFlag is a generic func used by the other AddXXX() func

-// to add a new flag to the BFlags struct.

-// Note, any error will be generated when Parse() is called (see Parse).

-func (bf *BFlags) addFlag(name string, flagType FlagType) *Flag {

-	if _, ok := bf.flags[name]; ok {

-		bf.Err = fmt.Errorf("Duplicate flag defined: %s", name)

-		return nil

-	}

-

-	newFlag := &Flag{

-		bf:       bf,

-		name:     name,

-		flagType: flagType,

-	}

-	bf.flags[name] = newFlag

-

-	return newFlag

-}

-

-// IsUsed checks if the flag is used

-func (fl *Flag) IsUsed() bool {

-	if _, ok := fl.bf.used[fl.name]; ok {

-		return true

-	}

-	return false

-}

-

-// IsTrue checks if a bool flag is true

-func (fl *Flag) IsTrue() bool {

-	if fl.flagType != boolType {

-		// Should never get here

-		panic(fmt.Errorf("Trying to use IsTrue on a non-boolean: %s", fl.name))

-	}

-	return fl.Value == "true"

-}

-

-// Parse parses and checks if the BFlags is valid.

-// Any error noticed during the AddXXX() funcs will be generated/returned

-// here.  We do this because an error during AddXXX() is more like a

-// compile time error so it doesn't matter too much when we stop our

-// processing as long as we do stop it, so this allows the code

-// around AddXXX() to be just:

-//     defFlag := AddString("description", "")

-// w/o needing to add an if-statement around each one.

-func (bf *BFlags) Parse() error {

-	// If there was an error while defining the possible flags

-	// go ahead and bubble it back up here since we didn't do it

-	// earlier in the processing

-	if bf.Err != nil {

-		return fmt.Errorf("Error setting up flags: %s", bf.Err)

-	}

-

-	for _, arg := range bf.Args {

-		if !strings.HasPrefix(arg, "--") {

-			return fmt.Errorf("Arg should start with -- : %s", arg)

-		}

-

-		if arg == "--" {

-			return nil

-		}

-

-		arg = arg[2:]

-		value := ""

-

-		index := strings.Index(arg, "=")

-		if index >= 0 {

-			value = arg[index+1:]

-			arg = arg[:index]

-		}

-

-		flag, ok := bf.flags[arg]

-		if !ok {

-			return fmt.Errorf("Unknown flag: %s", arg)

-		}

-

-		if _, ok = bf.used[arg]; ok {

-			return fmt.Errorf("Duplicate flag specified: %s", arg)

-		}

-

-		bf.used[arg] = flag

-

-		switch flag.flagType {

-		case boolType:

-			// value == "" is only ok if no "=" was specified

-			if index >= 0 && value == "" {

-				return fmt.Errorf("Missing a value on flag: %s", arg)

-			}

-

-			lower := strings.ToLower(value)

-			if lower == "" {

-				flag.Value = "true"

-			} else if lower == "true" || lower == "false" {

-				flag.Value = lower

-			} else {

-				return fmt.Errorf("Expecting boolean value for flag %s, not: %s", arg, value)

-			}

-

-		case stringType:

-			if index < 0 {

-				return fmt.Errorf("Missing a value on flag: %s", arg)

-			}

-			flag.Value = value

-

-		default:

-			panic("No idea what kind of flag we have! Should never get here!")

-		}

-

-	}

-

-	return nil

-}

deleted file mode 100644

@@ -1,187 +0,0 @@

-package instructions // import "github.com/docker/docker/builder/dockerfile/instructions"

-

-import (

-	"testing"

-)

-

-func TestBuilderFlags(t *testing.T) {

-	var expected string

-	var err error

-

-	// ---

-

-	bf := NewBFlags()

-	bf.Args = []string{}

-	if err := bf.Parse(); err != nil {

-		t.Fatalf("Test1 of %q was supposed to work: %s", bf.Args, err)

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	bf.Args = []string{"--"}

-	if err := bf.Parse(); err != nil {

-		t.Fatalf("Test2 of %q was supposed to work: %s", bf.Args, err)

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flStr1 := bf.AddString("str1", "")

-	flBool1 := bf.AddBool("bool1", false)

-	bf.Args = []string{}

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test3 of %q was supposed to work: %s", bf.Args, err)

-	}

-

-	if flStr1.IsUsed() {

-		t.Fatal("Test3 - str1 was not used!")

-	}

-	if flBool1.IsUsed() {

-		t.Fatal("Test3 - bool1 was not used!")

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flStr1 = bf.AddString("str1", "HI")

-	flBool1 = bf.AddBool("bool1", false)

-	bf.Args = []string{}

-

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test4 of %q was supposed to work: %s", bf.Args, err)

-	}

-

-	if flStr1.Value != "HI" {

-		t.Fatal("Str1 was supposed to default to: HI")

-	}

-	if flBool1.IsTrue() {

-		t.Fatal("Bool1 was supposed to default to: false")

-	}

-	if flStr1.IsUsed() {

-		t.Fatal("Str1 was not used!")

-	}

-	if flBool1.IsUsed() {

-		t.Fatal("Bool1 was not used!")

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flStr1 = bf.AddString("str1", "HI")

-	bf.Args = []string{"--str1"}

-

-	if err = bf.Parse(); err == nil {

-		t.Fatalf("Test %q was supposed to fail", bf.Args)

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flStr1 = bf.AddString("str1", "HI")

-	bf.Args = []string{"--str1="}

-

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)

-	}

-

-	expected = ""

-	if flStr1.Value != expected {

-		t.Fatalf("Str1 (%q) should be: %q", flStr1.Value, expected)

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flStr1 = bf.AddString("str1", "HI")

-	bf.Args = []string{"--str1=BYE"}

-

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)

-	}

-

-	expected = "BYE"

-	if flStr1.Value != expected {

-		t.Fatalf("Str1 (%q) should be: %q", flStr1.Value, expected)

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flBool1 = bf.AddBool("bool1", false)

-	bf.Args = []string{"--bool1"}

-

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)

-	}

-

-	if !flBool1.IsTrue() {

-		t.Fatal("Test-b1 Bool1 was supposed to be true")

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flBool1 = bf.AddBool("bool1", false)

-	bf.Args = []string{"--bool1=true"}

-

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)

-	}

-

-	if !flBool1.IsTrue() {

-		t.Fatal("Test-b2 Bool1 was supposed to be true")

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flBool1 = bf.AddBool("bool1", false)

-	bf.Args = []string{"--bool1=false"}

-

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)

-	}

-

-	if flBool1.IsTrue() {

-		t.Fatal("Test-b3 Bool1 was supposed to be false")

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flBool1 = bf.AddBool("bool1", false)

-	bf.Args = []string{"--bool1=false1"}

-

-	if err = bf.Parse(); err == nil {

-		t.Fatalf("Test %q was supposed to fail", bf.Args)

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flBool1 = bf.AddBool("bool1", false)

-	bf.Args = []string{"--bool2"}

-

-	if err = bf.Parse(); err == nil {

-		t.Fatalf("Test %q was supposed to fail", bf.Args)

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flStr1 = bf.AddString("str1", "HI")

-	flBool1 = bf.AddBool("bool1", false)

-	bf.Args = []string{"--bool1", "--str1=BYE"}

-

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)

-	}

-

-	if flStr1.Value != "BYE" {

-		t.Fatalf("Test %s, str1 should be BYE", bf.Args)

-	}

-	if !flBool1.IsTrue() {

-		t.Fatalf("Test %s, bool1 should be true", bf.Args)

-	}

-}

deleted file mode 100644

@@ -1,418 +0,0 @@

-package instructions // import "github.com/docker/docker/builder/dockerfile/instructions"

-

-import (

-	"errors"

-	"strings"

-

-	"github.com/docker/docker/api/types/container"

-	"github.com/docker/docker/api/types/strslice"

-	specs "github.com/opencontainers/image-spec/specs-go/v1"

-)

-

-// KeyValuePair represent an arbitrary named value (useful in slice instead of map[string] string to preserve ordering)

-type KeyValuePair struct {

-	Key   string

-	Value string

-}

-

-func (kvp *KeyValuePair) String() string {

-	return kvp.Key + "=" + kvp.Value

-}

-

-// Command is implemented by every command present in a dockerfile

-type Command interface {

-	Name() string

-}

-

-// KeyValuePairs is a slice of KeyValuePair

-type KeyValuePairs []KeyValuePair

-

-// withNameAndCode is the base of every command in a Dockerfile (String() returns its source code)

-type withNameAndCode struct {

-	code string

-	name string

-}

-

-func (c *withNameAndCode) String() string {

-	return c.code

-}

-

-// Name of the command

-func (c *withNameAndCode) Name() string {

-	return c.name

-}

-

-func newWithNameAndCode(req parseRequest) withNameAndCode {

-	return withNameAndCode{code: strings.TrimSpace(req.original), name: req.command}

-}

-

-// SingleWordExpander is a provider for variable expansion where 1 word => 1 output

-type SingleWordExpander func(word string) (string, error)

-

-// SupportsSingleWordExpansion interface marks a command as supporting variable expansion

-type SupportsSingleWordExpansion interface {

-	Expand(expander SingleWordExpander) error

-}

-

-// PlatformSpecific adds platform checks to a command

-type PlatformSpecific interface {

-	CheckPlatform(platform string) error

-}

-

-func expandKvp(kvp KeyValuePair, expander SingleWordExpander) (KeyValuePair, error) {

-	key, err := expander(kvp.Key)

-	if err != nil {

-		return KeyValuePair{}, err

-	}

-	value, err := expander(kvp.Value)

-	if err != nil {

-		return KeyValuePair{}, err

-	}

-	return KeyValuePair{Key: key, Value: value}, nil

-}

-func expandKvpsInPlace(kvps KeyValuePairs, expander SingleWordExpander) error {

-	for i, kvp := range kvps {

-		newKvp, err := expandKvp(kvp, expander)

-		if err != nil {

-			return err

-		}

-		kvps[i] = newKvp

-	}

-	return nil

-}

-

-func expandSliceInPlace(values []string, expander SingleWordExpander) error {

-	for i, v := range values {

-		newValue, err := expander(v)

-		if err != nil {

-			return err

-		}

-		values[i] = newValue

-	}

-	return nil

-}

-

-// EnvCommand : ENV key1 value1 [keyN valueN...]

-type EnvCommand struct {

-	withNameAndCode

-	Env KeyValuePairs // kvp slice instead of map to preserve ordering

-}

-

-// Expand variables

-func (c *EnvCommand) Expand(expander SingleWordExpander) error {

-	return expandKvpsInPlace(c.Env, expander)

-}

-

-// MaintainerCommand : MAINTAINER maintainer_name

-type MaintainerCommand struct {

-	withNameAndCode

-	Maintainer string

-}

-

-// NewLabelCommand creates a new 'LABEL' command

-func NewLabelCommand(k string, v string, NoExp bool) *LabelCommand {

-	kvp := KeyValuePair{Key: k, Value: v}

-	c := "LABEL "

-	c += kvp.String()

-	nc := withNameAndCode{code: c, name: "label"}

-	cmd := &LabelCommand{

-		withNameAndCode: nc,

-		Labels: KeyValuePairs{

-			kvp,

-		},

-		noExpand: NoExp,

-	}

-	return cmd

-}

-

-// LabelCommand : LABEL some json data describing the image

-//

-// Sets the Label variable foo to bar,

-//

-type LabelCommand struct {

-	withNameAndCode

-	Labels   KeyValuePairs // kvp slice instead of map to preserve ordering

-	noExpand bool

-}

-

-// Expand variables

-func (c *LabelCommand) Expand(expander SingleWordExpander) error {

-	if c.noExpand {

-		return nil

-	}

-	return expandKvpsInPlace(c.Labels, expander)

-}

-

-// SourcesAndDest represent a list of source files and a destination

-type SourcesAndDest []string

-

-// Sources list the source paths

-func (s SourcesAndDest) Sources() []string {

-	res := make([]string, len(s)-1)

-	copy(res, s[:len(s)-1])

-	return res

-}

-

-// Dest path of the operation

-func (s SourcesAndDest) Dest() string {

-	return s[len(s)-1]

-}

-

-// AddCommand : ADD foo /path

-//

-// Add the file 'foo' to '/path'. Tarball and Remote URL (git, http) handling

-// exist here. If you do not wish to have this automatic handling, use COPY.

-//

-type AddCommand struct {

-	withNameAndCode

-	SourcesAndDest

-	Chown string

-}

-

-// Expand variables

-func (c *AddCommand) Expand(expander SingleWordExpander) error {

-	return expandSliceInPlace(c.SourcesAndDest, expander)

-}

-

-// CopyCommand : COPY foo /path

-//

-// Same as 'ADD' but without the tar and remote url handling.

-//

-type CopyCommand struct {

-	withNameAndCode

-	SourcesAndDest

-	From  string

-	Chown string

-}

-

-// Expand variables

-func (c *CopyCommand) Expand(expander SingleWordExpander) error {

-	return expandSliceInPlace(c.SourcesAndDest, expander)

-}

-

-// OnbuildCommand : ONBUILD <some other command>

-type OnbuildCommand struct {

-	withNameAndCode

-	Expression string

-}

-

-// WorkdirCommand : WORKDIR /tmp

-//

-// Set the working directory for future RUN/CMD/etc statements.

-//

-type WorkdirCommand struct {

-	withNameAndCode

-	Path string

-}

-

-// Expand variables

-func (c *WorkdirCommand) Expand(expander SingleWordExpander) error {

-	p, err := expander(c.Path)

-	if err != nil {

-		return err

-	}

-	c.Path = p

-	return nil

-}

-

-// ShellDependantCmdLine represents a cmdline optionally prepended with the shell

-type ShellDependantCmdLine struct {

-	CmdLine      strslice.StrSlice

-	PrependShell bool

-}

-

-// RunCommand : RUN some command yo

-//

-// run a command and commit the image. Args are automatically prepended with

-// the current SHELL which defaults to 'sh -c' under linux or 'cmd /S /C' under

-// Windows, in the event there is only one argument The difference in processing:

-//

-// RUN echo hi          # sh -c echo hi       (Linux)

-// RUN echo hi          # cmd /S /C echo hi   (Windows)

-// RUN [ "echo", "hi" ] # echo hi

-//

-type RunCommand struct {

-	withNameAndCode

-	ShellDependantCmdLine

-}

-

-// CmdCommand : CMD foo

-//

-// Set the default command to run in the container (which may be empty).

-// Argument handling is the same as RUN.

-//

-type CmdCommand struct {

-	withNameAndCode

-	ShellDependantCmdLine

-}

-

-// HealthCheckCommand : HEALTHCHECK foo

-//

-// Set the default healthcheck command to run in the container (which may be empty).

-// Argument handling is the same as RUN.

-//

-type HealthCheckCommand struct {

-	withNameAndCode

-	Health *container.HealthConfig

-}

-

-// EntrypointCommand : ENTRYPOINT /usr/sbin/nginx

-//

-// Set the entrypoint to /usr/sbin/nginx. Will accept the CMD as the arguments

-// to /usr/sbin/nginx. Uses the default shell if not in JSON format.

-//

-// Handles command processing similar to CMD and RUN, only req.runConfig.Entrypoint

-// is initialized at newBuilder time instead of through argument parsing.

-//

-type EntrypointCommand struct {

-	withNameAndCode

-	ShellDependantCmdLine

-}

-

-// ExposeCommand : EXPOSE 6667/tcp 7000/tcp

-//

-// Expose ports for links and port mappings. This all ends up in

-// req.runConfig.ExposedPorts for runconfig.

-//

-type ExposeCommand struct {

-	withNameAndCode

-	Ports []string

-}

-

-// UserCommand : USER foo

-//

-// Set the user to 'foo' for future commands and when running the

-// ENTRYPOINT/CMD at container run time.

-//

-type UserCommand struct {

-	withNameAndCode

-	User string

-}

-

-// Expand variables

-func (c *UserCommand) Expand(expander SingleWordExpander) error {

-	p, err := expander(c.User)

-	if err != nil {

-		return err

-	}

-	c.User = p

-	return nil

-}

-

-// VolumeCommand : VOLUME /foo

-//

-// Expose the volume /foo for use. Will also accept the JSON array form.

-//

-type VolumeCommand struct {

-	withNameAndCode

-	Volumes []string

-}

-