microsoft
/
docker
зеркало из https://github.com/microsoft/docker.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #16457 from Microsoft/10662-blockarg 

Windows: Nice error on ARG (builder)
This commit is contained in:
Brian Goff 2015-09-21 19:43:48 -04:00
Родитель 985b7ec895 b69c13b1a6
Коммит 5c73f14c62
3 изменённых файлов: 18 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
builder/dispatchers.go
Просмотреть файл

@ -546,10 +546,6 @@ func expose(b *builder, args []string, attributes map[string]bool, original stri
// ENTRYPOINT/CMD at container run time.
//
func user(b *builder, args []string, attributes map[string]bool, original string) error {
if runtime.GOOS == "windows" {
return derr.ErrorCodeNotOnWindows.WithArgs("USER")
}
if len(args) != 1 {
return derr.ErrorCodeExactlyOneArg.WithArgs("USER")
}
@ -567,9 +563,6 @@ func user(b *builder, args []string, attributes map[string]bool, original string
// Expose the volume /foo for use. Will also accept the JSON array form.
//
func volume(b *builder, args []string, attributes map[string]bool, original string) error {
if runtime.GOOS == "windows" {
return derr.ErrorCodeNotOnWindows.WithArgs("VOLUME")
}
if len(args) == 0 {
return derr.ErrorCodeAtLeastOneArg.WithArgs("VOLUME")
}
@ -598,9 +591,6 @@ func volume(b *builder, args []string, attributes map[string]bool, original stri
//
// Set the signal that will be used to kill the container.
func stopSignal(b *builder, args []string, attributes map[string]bool, original string) error {
if runtime.GOOS == "windows" {
return fmt.Errorf("STOPSIGNAL is not supported on Windows")
}
if len(args) != 1 {
return fmt.Errorf("STOPSIGNAL requires exactly one argument")
}

2
builder/evaluator.go
Просмотреть файл

@ -417,7 +417,7 @@ func platformSupports(command string) error {
return nil
}
switch command {
case "expose", "volume", "user", "stopsignal":
case "expose", "volume", "user", "stopsignal", "arg":
return fmt.Errorf("The daemon on this platform does not support the command '%s'", command)
}
return nil

17
integration-cli/docker_cli_build_test.go
Просмотреть файл

@ -5675,6 +5675,7 @@ func (s *DockerSuite) TestBuildStopSignal(c *check.C) {
}
func (s *DockerSuite) TestBuildBuildTimeArg(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldargtest"
envKey := "foo"
envVal := "bar"
@ -5700,6 +5701,7 @@ func (s *DockerSuite) TestBuildBuildTimeArg(c *check.C) {
}
func (s *DockerSuite) TestBuildBuildTimeArgHistory(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldargtest"
envKey := "foo"
envVal := "bar"
@ -5725,6 +5727,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgHistory(c *check.C) {
}
func (s *DockerSuite) TestBuildBuildTimeArgCacheHit(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldargtest"
envKey := "foo"
envVal := "bar"
@ -5751,6 +5754,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgCacheHit(c *check.C) {
}
func (s *DockerSuite) TestBuildBuildTimeArgCacheMissExtraArg(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldargtest"
envKey := "foo"
envVal := "bar"
@ -5782,6 +5786,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgCacheMissExtraArg(c *check.C) {
}
func (s *DockerSuite) TestBuildBuildTimeArgCacheMissSameArgDiffVal(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldargtest"
envKey := "foo"
envVal := "bar"
@ -5813,6 +5818,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgCacheMissSameArgDiffVal(c *check.C) {
}
func (s *DockerSuite) TestBuildBuildTimeArgOverrideArgDefinedBeforeEnv(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldargtest"
envKey := "foo"
envVal := "bar"
@ -5841,6 +5847,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgOverrideArgDefinedBeforeEnv(c *check.
}
func (s *DockerSuite) TestBuildBuildTimeArgOverrideEnvDefinedBeforeArg(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldargtest"
envKey := "foo"
envVal := "bar"
@ -5869,6 +5876,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgOverrideEnvDefinedBeforeArg(c *check.
}
func (s *DockerSuite) TestBuildBuildTimeArgExpansion(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldvarstest"
wdVar := "WDIR"
@ -5978,6 +5986,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgExpansion(c *check.C) {
}
func (s *DockerSuite) TestBuildBuildTimeArgExpansionOverride(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldvarstest"
envKey := "foo"
envVal := "bar"
@ -6007,6 +6016,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgExpansionOverride(c *check.C) {
}
func (s *DockerSuite) TestBuildBuildTimeArgUntrustedDefinedAfterUse(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldargtest"
envKey := "foo"
envVal := "bar"
@ -6032,6 +6042,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgUntrustedDefinedAfterUse(c *check.C)
}
func (s *DockerSuite) TestBuildBuildTimeArgBuiltinArg(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldargtest"
envKey := "HTTP_PROXY"
envVal := "bar"
@ -6056,6 +6067,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgBuiltinArg(c *check.C) {
}
func (s *DockerSuite) TestBuildBuildTimeArgDefaultOverride(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldargtest"
envKey := "foo"
envVal := "bar"
@ -6083,6 +6095,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgDefaultOverride(c *check.C) {
}
func (s *DockerSuite) TestBuildBuildTimeArgMultiArgsSameLine(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldargtest"
envKey := "foo"
envKey1 := "foo1"
@ -6099,6 +6112,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgMultiArgsSameLine(c *check.C) {
}
func (s *DockerSuite) TestBuildBuildTimeArgUnconsumedArg(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldargtest"
envKey := "foo"
envVal := "bar"
@ -6119,6 +6133,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgUnconsumedArg(c *check.C) {
}
func (s *DockerSuite) TestBuildBuildTimeArgQuotedValVariants(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldargtest"
envKey := "foo"
envKey1 := "foo1"
@ -6144,6 +6159,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgQuotedValVariants(c *check.C) {
}
func (s *DockerSuite) TestBuildBuildTimeArgEmptyValVariants(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldargtest"
envKey := "foo"
envKey1 := "foo1"
@ -6163,6 +6179,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgEmptyValVariants(c *check.C) {
}
func (s *DockerSuite) TestBuildBuildTimeArgDefintionWithNoEnvInjection(c *check.C) {
testRequires(c, DaemonIsLinux)
imgName := "bldargtest"
envKey := "foo"
args := []string{}