forked from toolshed/abra
		
	fix: respect NoInput on "app cp" & use app to get StackName
This commit is contained in:
		@ -106,25 +106,15 @@ func configureAndCp(
 | 
				
			|||||||
	dstPath string,
 | 
						dstPath string,
 | 
				
			||||||
	service string,
 | 
						service string,
 | 
				
			||||||
	isToContainer bool) error {
 | 
						isToContainer bool) error {
 | 
				
			||||||
	appFiles, err := config.LoadAppFiles("")
 | 
					 | 
				
			||||||
	if err != nil {
 | 
					 | 
				
			||||||
		logrus.Fatal(err)
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	appEnv, err := config.GetApp(appFiles, app.Name)
 | 
					 | 
				
			||||||
	if err != nil {
 | 
					 | 
				
			||||||
		logrus.Fatal(err)
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	cl, err := client.New(app.Server)
 | 
						cl, err := client.New(app.Server)
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		logrus.Fatal(err)
 | 
							logrus.Fatal(err)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	filters := filters.NewArgs()
 | 
						filters := filters.NewArgs()
 | 
				
			||||||
	filters.Add("name", fmt.Sprintf("%s_%s", appEnv.StackName(), service))
 | 
						filters.Add("name", fmt.Sprintf("%s_%s", app.StackName(), service))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	container, err := container.GetContainer(context.Background(), cl, filters, true)
 | 
						container, err := container.GetContainer(context.Background(), cl, filters, internal.NoInput)
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		logrus.Fatal(err)
 | 
							logrus.Fatal(err)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
@ -157,5 +147,6 @@ func configureAndCp(
 | 
				
			|||||||
			logrus.Fatal(err)
 | 
								logrus.Fatal(err)
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return nil
 | 
						return nil
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user