Skip to content

Commit 865e6e7

Browse files
committed
compose: start docker-compose with a non-empty PATH
`docker-compose` invokes `docker`, but obviously this will fail if there is nothing in the `PATH`. Epic: none Release note: None
1 parent ab8fac2 commit 865e6e7

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

pkg/compose/compose_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ func TestComposeCompare(t *testing.T) {
115115
fmt.Sprintf("COMPARE_DIR_PATH=%s", compareDir),
116116
fmt.Sprintf("ARTIFACTS=%s", *flagArtifacts),
117117
fmt.Sprintf("COCKROACH_DEV_LICENSE=%s", envutil.EnvOrDefaultString("COCKROACH_DEV_LICENSE", "")),
118+
fmt.Sprintf("PATH=%s", os.Getenv("PATH")),
118119
}
119120
out, err := cmd.CombinedOutput()
120121
if err != nil {

pkg/testutils/lint/lint_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,7 @@ func TestLint(t *testing.T) {
513513
":!util/log/test_log_scope.go", // For TEST_UNDECLARED_OUTPUT_DIR, REMOTE_EXEC
514514
":!testutils/datapathutils/data_path.go", // For TEST_UNDECLARED_OUTPUT_DIR, REMOTE_EXEC
515515
":!testutils/backup.go", // For BACKUP_TESTING_BUCKET
516+
":!compose/compose_test.go", // For PATH.
516517
},
517518
},
518519
} {

0 commit comments

Comments
 (0)