Skip to content

Commit 24ec0b2

Browse files
gloursndeloof
authored andcommitted
pass services list to projectOrName function to add profiles for targeted services
Signed-off-by: Guillaume Lours <[email protected]>
1 parent ed38fe0 commit 24ec0b2

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

cmd/compose/compose.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ func (o *projectOptions) addProjectFlags(f *pflag.FlagSet) {
137137
_ = f.MarkHidden("workdir")
138138
}
139139

140-
func (o *projectOptions) projectOrName() (*types.Project, string, error) {
140+
func (o *projectOptions) projectOrName(services ...string) (*types.Project, string, error) {
141141
name := o.ProjectName
142142
var project *types.Project
143143
if o.ProjectName == "" {
144-
p, err := o.toProject(nil)
144+
p, err := o.toProject(services)
145145
if err != nil {
146146
envProjectName := os.Getenv("COMPOSE_PROJECT_NAME")
147147
if envProjectName != "" {

cmd/compose/kill.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func killCommand(p *projectOptions, backend api.Service) *cobra.Command {
5454
}
5555

5656
func runKill(ctx context.Context, backend api.Service, opts killOptions, services []string) error {
57-
project, name, err := opts.projectOrName()
57+
project, name, err := opts.projectOrName(services...)
5858
if err != nil {
5959
return err
6060
}

cmd/compose/logs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func logsCommand(p *projectOptions, backend api.Service) *cobra.Command {
6363
}
6464

6565
func runLogs(ctx context.Context, backend api.Service, opts logsOptions, services []string) error {
66-
project, name, err := opts.projectOrName()
66+
project, name, err := opts.projectOrName(services...)
6767
if err != nil {
6868
return err
6969
}

cmd/compose/pause.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func pauseCommand(p *projectOptions, backend api.Service) *cobra.Command {
4444
}
4545

4646
func runPause(ctx context.Context, backend api.Service, opts pauseOptions, services []string) error {
47-
project, name, err := opts.projectOrName()
47+
project, name, err := opts.projectOrName(services...)
4848
if err != nil {
4949
return err
5050
}
@@ -75,7 +75,7 @@ func unpauseCommand(p *projectOptions, backend api.Service) *cobra.Command {
7575
}
7676

7777
func runUnPause(ctx context.Context, backend api.Service, opts unpauseOptions, services []string) error {
78-
project, name, err := opts.projectOrName()
78+
project, name, err := opts.projectOrName(services...)
7979
if err != nil {
8080
return err
8181
}

cmd/compose/ps.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func psCommand(p *projectOptions, backend api.Service) *cobra.Command {
9191
}
9292

9393
func runPs(ctx context.Context, backend api.Service, services []string, opts psOptions) error {
94-
project, name, err := opts.projectOrName()
94+
project, name, err := opts.projectOrName(services...)
9595
if err != nil {
9696
return err
9797
}

cmd/compose/remove.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Any data which is not in a volume will be lost.`,
5959
}
6060

6161
func runRemove(ctx context.Context, backend api.Service, opts removeOptions, services []string) error {
62-
project, name, err := opts.projectOrName()
62+
project, name, err := opts.projectOrName(services...)
6363
if err != nil {
6464
return err
6565
}

cmd/compose/restart.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func restartCommand(p *projectOptions, backend api.Service) *cobra.Command {
4949
}
5050

5151
func runRestart(ctx context.Context, backend api.Service, opts restartOptions, services []string) error {
52-
project, name, err := opts.projectOrName()
52+
project, name, err := opts.projectOrName(services...)
5353
if err != nil {
5454
return err
5555
}

cmd/compose/start.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func startCommand(p *projectOptions, backend api.Service) *cobra.Command {
4343
}
4444

4545
func runStart(ctx context.Context, backend api.Service, opts startOptions, services []string) error {
46-
project, name, err := opts.projectOrName()
46+
project, name, err := opts.projectOrName(services...)
4747
if err != nil {
4848
return err
4949
}

cmd/compose/stop.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func stopCommand(p *projectOptions, backend api.Service) *cobra.Command {
5353
}
5454

5555
func runStop(ctx context.Context, backend api.Service, opts stopOptions, services []string) error {
56-
project, name, err := opts.projectOrName()
56+
project, name, err := opts.projectOrName(services...)
5757
if err != nil {
5858
return err
5959
}

0 commit comments

Comments
 (0)