show version & fix support for older docker-compose

grafana · Sep 8, 2018 · 4b22597 · 4b22597
1 parent a647113
commit 4b22597
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/stacktest/tests/end2end_carbon/end2end_carbon_test.go b/stacktest/tests/end2end_carbon/end2end_carbon_test.go
@@ -25,9 +25,18 @@ const metricsPerSecond = 1000
 
 func TestMain(m *testing.M) {
 	log.Println("launching docker-dev stack...")
-	cmd := exec.Command("docker-compose", "up", "--force-recreate", "-V")
+	version := exec.Command("docker-compose", "version")
+	output, err := version.CombinedOutput()
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+	log.Println(string(output))
+
+	// TODO: should probably use -V flag here.
+	// introduced here https://github.com/docker/compose/releases/tag/1.19.0
+	// but circleCI machine image still stuck with 1.14.0
+	cmd := exec.Command("docker-compose", "up", "--force-recreate")
 	cmd.Dir = docker.Path("docker/docker-dev")
-	var err error
 
 	tracker, err = track.NewTracker(cmd, false, false, "launch-stdout", "launch-stderr")
 	if err != nil {