Skip to content

Commit dbde478

Browse files
committed
integration-cli: fix some bashism's in Dockerfiles
`TestBuildBuildTimeArgEnv` and `TestBuildBuildTimeArgEmptyValVariants` were using non-standard comparisons. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 234b951 commit dbde478

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

integration-cli/docker_cli_build_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4535,17 +4535,17 @@ func (s *DockerSuite) TestBuildBuildTimeArgEnv(c *testing.T) {
45354535
ARG FOO6
45364536
ARG FO10
45374537
RUN env
4538-
RUN [ "$FOO1" == "fromcmd" ]
4539-
RUN [ "$FOO2" == "" ]
4540-
RUN [ "$FOO3" == "fromenv" ]
4541-
RUN [ "$FOO4" == "fromfile" ]
4542-
RUN [ "$FOO5" == "fromcmd" ]
4538+
RUN [ "$FOO1" = "fromcmd" ]
4539+
RUN [ "$FOO2" = "" ]
4540+
RUN [ "$FOO3" = "fromenv" ]
4541+
RUN [ "$FOO4" = "fromfile" ]
4542+
RUN [ "$FOO5" = "fromcmd" ]
45434543
# The following should not exist at all in the env
4544-
RUN [ "$(env | grep FOO6)" == "" ]
4545-
RUN [ "$(env | grep FOO7)" == "" ]
4546-
RUN [ "$(env | grep FOO8)" == "" ]
4547-
RUN [ "$(env | grep FOO9)" == "" ]
4548-
RUN [ "$FO10" == "" ]
4544+
RUN [ "$(env | grep FOO6)" = "" ]
4545+
RUN [ "$(env | grep FOO7)" = "" ]
4546+
RUN [ "$(env | grep FOO8)" = "" ]
4547+
RUN [ "$(env | grep FOO9)" = "" ]
4548+
RUN [ "$FO10" = "" ]
45494549
`
45504550
result := buildImage("testbuildtimeargenv",
45514551
cli.WithFlags(
@@ -4615,9 +4615,9 @@ func (s *DockerSuite) TestBuildBuildTimeArgEmptyValVariants(c *testing.T) {
46154615
ARG %s=
46164616
ARG %s=""
46174617
ARG %s=''
4618-
RUN [ "$%s" == "$%s" ]
4619-
RUN [ "$%s" == "$%s" ]
4620-
RUN [ "$%s" == "$%s" ]`, envKey, envKey1, envKey2, envKey, envKey1, envKey1, envKey2, envKey, envKey2)
4618+
RUN [ "$%s" = "$%s" ]
4619+
RUN [ "$%s" = "$%s" ]
4620+
RUN [ "$%s" = "$%s" ]`, envKey, envKey1, envKey2, envKey, envKey1, envKey1, envKey2, envKey, envKey2)
46214621
buildImageSuccessfully(c, imgName, build.WithDockerfile(dockerfile))
46224622
}
46234623

0 commit comments

Comments
 (0)