Fix failing tests

Author: tgxworld

launcher_go/v2/cli_build_test.go

@@ -1,6 +1,8 @@
 package main_test
 
 import (
+	"fmt"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
@@ -35,8 +37,10 @@ var _ = Describe("Build", func() {
 			TemplatesDir: "./test",
 			BuildDir:     testDir,
 		}
+
 		utils.CmdRunner = CreateNewFakeCmdRunner()
 	})
+
 	AfterEach(func() {
 		os.RemoveAll(testDir)
 	})
@@ -72,8 +76,8 @@ var _ = Describe("Build", func() {
 		}
 
 		var checkConfigureCmd = func(cmd exec.Cmd) {
-			Expect(cmd.String()).To(Equal(
-				"/usr/local/bin/docker run " +
+			Expect(cmd.String()).To(ContainSubstring(
+				"docker run " +
 					"--env DISCOURSE_DB_HOST " +
 					"--env DISCOURSE_DB_PASSWORD " +
 					"--env DISCOURSE_DB_PORT " +
@@ -142,8 +146,10 @@ var _ = Describe("Build", func() {
 
 		// commit on configure
 		var checkConfigureCommit = func(cmd exec.Cmd) {
+			fmt.Print(cmd.String())
+
 			Expect(cmd.String()).To(MatchRegexp(
-				"/usr/local/bin/docker commit " +
+				".*docker commit " +
 					`--change LABEL org\.opencontainers\.image\.created="[\d\-T:+]+" ` +
 					`--change CMD \["/sbin/boot"\] ` +
 					"discourse-build-test local_discourse/test",
@@ -154,7 +160,7 @@ var _ = Describe("Build", func() {
 
 		// configure also cleans up
 		var checkConfigureClean = func(cmd exec.Cmd) {
-			Expect(cmd.String()).To(Equal("/usr/local/bin/docker rm --force discourse-build-test"))
+			Expect(cmd.String()).To(ContainSubstring("docker rm --force discourse-build-test"))
 		}
 
 		It("Should run docker build with correct arguments", func() {