forked from coop-cloud/abra
Revert "fix: match exact on filtering" [ci skip]
This reverts commit 2bc2f8630b
.
This breaks other stuff. Reverting!
This commit is contained in:
parent
2bc2f8630b
commit
3fb43ffa2c
|
@ -75,7 +75,7 @@ var appLogsCommand = &cli.Command{
|
||||||
}
|
}
|
||||||
logrus.Debugf("tailing logs for '%s'", serviceName)
|
logrus.Debugf("tailing logs for '%s'", serviceName)
|
||||||
|
|
||||||
service := fmt.Sprintf("^%s_%s", app.StackName(), serviceName)
|
service := fmt.Sprintf("%s_%s", app.StackName(), serviceName)
|
||||||
filters := filters.NewArgs()
|
filters := filters.NewArgs()
|
||||||
filters.Add("name", service)
|
filters.Add("name", service)
|
||||||
serviceOpts := types.ServiceListOptions{Filters: filters}
|
serviceOpts := types.ServiceListOptions{Filters: filters}
|
||||||
|
|
|
@ -34,7 +34,7 @@ var appRestartCommand = &cli.Command{
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
serviceFilter := fmt.Sprintf("^%s_%s", app.StackName(), serviceName)
|
serviceFilter := fmt.Sprintf("%s_%s", app.StackName(), serviceName)
|
||||||
filters := filters.NewArgs()
|
filters := filters.NewArgs()
|
||||||
filters.Add("name", serviceFilter)
|
filters.Add("name", serviceFilter)
|
||||||
containerOpts := types.ContainerListOptions{Filters: filters}
|
containerOpts := types.ContainerListOptions{Filters: filters}
|
||||||
|
|
|
@ -55,7 +55,7 @@ var appRunCommand = &cli.Command{
|
||||||
}
|
}
|
||||||
|
|
||||||
serviceName := c.Args().Get(1)
|
serviceName := c.Args().Get(1)
|
||||||
stackAndServiceName := fmt.Sprintf("^%s_%s", app.StackName(), serviceName)
|
stackAndServiceName := fmt.Sprintf("%s_%s", app.StackName(), serviceName)
|
||||||
filters := filters.NewArgs()
|
filters := filters.NewArgs()
|
||||||
filters.Add("name", stackAndServiceName)
|
filters.Add("name", stackAndServiceName)
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ func ConfigureAndCp(c *cli.Context, app config.App, srcPath string, dstPath stri
|
||||||
}
|
}
|
||||||
|
|
||||||
filters := filters.NewArgs()
|
filters := filters.NewArgs()
|
||||||
filters.Add("name", fmt.Sprintf("^%s_%s", appEnv.StackName(), service))
|
filters.Add("name", fmt.Sprintf("%s_%s", appEnv.StackName(), service))
|
||||||
containers, err := cl.ContainerList(c.Context, types.ContainerListOptions{Filters: filters})
|
containers, err := cl.ContainerList(c.Context, types.ContainerListOptions{Filters: filters})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
|
|
@ -100,7 +100,7 @@ func GetAllDeployedServices(contextName string) StackStatus {
|
||||||
// GetDeployedServicesByName filters services by name
|
// GetDeployedServicesByName filters services by name
|
||||||
func GetDeployedServicesByName(ctx context.Context, cl *dockerclient.Client, stackName, serviceName string) StackStatus {
|
func GetDeployedServicesByName(ctx context.Context, cl *dockerclient.Client, stackName, serviceName string) StackStatus {
|
||||||
filters := filters.NewArgs()
|
filters := filters.NewArgs()
|
||||||
filters.Add("name", fmt.Sprintf("^%s_%s", stackName, serviceName))
|
filters.Add("name", fmt.Sprintf("%s_%s", stackName, serviceName))
|
||||||
|
|
||||||
services, err := cl.ServiceList(ctx, types.ServiceListOptions{Filters: filters})
|
services, err := cl.ServiceList(ctx, types.ServiceListOptions{Filters: filters})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in New Issue