浏览代码

ACI : allow `docker compose down —project-name xxx` without requiring the compose file

Guillaume Tardif 5 年之前
父节点
当前提交
76cb73c5c2
共有 2 个文件被更改,包括 11 次插入4 次删除
  1. 10 3
      azure/backend.go
  2. 1 1
      tests/aci-e2e/e2e-aci_test.go

+ 10 - 3
azure/backend.go

@@ -319,9 +319,16 @@ func (cs *aciComposeService) Up(ctx context.Context, opts cli.ProjectOptions) er
 }
 
 func (cs *aciComposeService) Down(ctx context.Context, opts cli.ProjectOptions) error {
-	project, err := cli.ProjectFromOptions(&opts)
-	if err != nil {
-		return err
+	var project types.Project
+
+	if opts.Name != "" {
+		project = types.Project{Name:opts.Name}
+	} else {
+		fullProject, err := cli.ProjectFromOptions(&opts)
+		if err != nil {
+			return err
+		}
+		project = *fullProject
 	}
 	logrus.Debugf("Down on project with name %q\n", project.Name)
 

+ 1 - 1
tests/aci-e2e/e2e-aci_test.go

@@ -297,7 +297,7 @@ func (s *E2eACISuite) TestACIBackend() {
 	})
 
 	s.T().Run("shutdown compose app", func(t *testing.T) {
-		s.NewDockerCommand("compose", "down", "-f", composeFile, "--project-name", "acidemo").ExecOrDie()
+		s.NewDockerCommand("compose", "down", "--project-name", "acidemo").ExecOrDie()
 	})
 
 	s.T().Run("switches back to default context", func(t *testing.T) {