beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

integration-cli: fix some bashism's in Dockerfiles

Browse source 
`TestBuildBuildTimeArgEnv` and `TestBuildBuildTimeArgEmptyValVariants` were
using non-standard comparisons.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit dbde4786e4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-09-02 10:51:18 +02:00
parent 69da36f39e
commit ae7858ff2c
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
integration-cli/docker_cli_build_test.go
View file

@ -4535,17 +4535,17 @@ func (s *DockerSuite) TestBuildBuildTimeArgEnv(c *check.C) {
ARG FOO6
ARG FO10
RUN env
RUN [ "$FOO1" == "fromcmd" ]
RUN [ "$FOO2" == "" ]
RUN [ "$FOO3" == "fromenv" ]
RUN [ "$FOO4" == "fromfile" ]
RUN [ "$FOO5" == "fromcmd" ]
RUN [ "$FOO1" = "fromcmd" ]
RUN [ "$FOO2" = "" ]
RUN [ "$FOO3" = "fromenv" ]
RUN [ "$FOO4" = "fromfile" ]
RUN [ "$FOO5" = "fromcmd" ]
# The following should not exist at all in the env
RUN [ "$(env | grep FOO6)" == "" ]
RUN [ "$(env | grep FOO7)" == "" ]
RUN [ "$(env | grep FOO8)" == "" ]
RUN [ "$(env | grep FOO9)" == "" ]
RUN [ "$FO10" == "" ]
RUN [ "$(env | grep FOO6)" = "" ]
RUN [ "$(env | grep FOO7)" = "" ]
RUN [ "$(env | grep FOO8)" = "" ]
RUN [ "$(env | grep FOO9)" = "" ]
RUN [ "$FO10" = "" ]
`
result := buildImage("testbuildtimeargenv",
cli.WithFlags(
@ -4615,9 +4615,9 @@ func (s *DockerSuite) TestBuildBuildTimeArgEmptyValVariants(c *check.C) {
ARG %s=
ARG %s=""
ARG %s=''
RUN [ "$%s" == "$%s" ]
RUN [ "$%s" == "$%s" ]
RUN [ "$%s" == "$%s" ]`, envKey, envKey1, envKey2, envKey, envKey1, envKey1, envKey2, envKey, envKey2)
RUN [ "$%s" = "$%s" ]
RUN [ "$%s" = "$%s" ]
RUN [ "$%s" = "$%s" ]`, envKey, envKey1, envKey2, envKey, envKey1, envKey1, envKey2, envKey, envKey2)
buildImageSuccessfully(c, imgName, build.WithDockerfile(dockerfile))
}