Browse code

integration-cli: fix some bashism's in Dockerfiles

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit dbde4786e48531f095f9c3ecaff0f57b838abefc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/09/02 17:51:18
Showing 1 changed files
... ...
@@ -4535,17 +4535,17 @@ func (s *DockerSuite) TestBuildBuildTimeArgEnv(c *check.C) {
4535 4535
 		ARG FOO6
4536 4536
 		ARG FO10
4537 4537
 		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" ]
4543 4543
 		# 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" = "" ]
4549 4549
 	    `
4550 4550
 	result := buildImage("testbuildtimeargenv",
4551 4551
 		cli.WithFlags(
... ...
@@ -4615,9 +4615,9 @@ func (s *DockerSuite) TestBuildBuildTimeArgEmptyValVariants(c *check.C) {
4615 4615
 		ARG %s=
4616 4616
 		ARG %s=""
4617 4617
 		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)
4621 4621
 	buildImageSuccessfully(c, imgName, build.WithDockerfile(dockerfile))
4622 4622
 }
4623 4623