use compose-go PR to run tests on CI

Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

cmd/compose/run.go

@@ -187,20 +187,12 @@ func runCommand(p *ProjectOptions, dockerCli command.Cli, backendOptions *Backen
 				return err
 			}
 
-			project, _, err := p.ToProject(ctx, dockerCli, backend, nil, composecli.WithoutEnvironmentResolution)
+			project, _, err := p.ToProject(ctx, dockerCli, backend, []string{options.ServiceOrJob}, composecli.WithoutEnvironmentResolution)
 			if err != nil {
 				return err
 			}
 
 			isJob := isJobName(project, options.ServiceOrJob)
-			if isJob {
-				project, err = project.WithSelectedJob(options.ServiceOrJob)
-			} else {
-				project, err = project.WithSelectedServices([]string{options.ServiceOrJob})
-			}
-			if err != nil {
-				return err
-			}
 
 			project, err = project.WithServicesEnvironmentResolved(true)
 			if err != nil {

docs/reference/compose.md

@@ -35,7 +35,7 @@ Define and run multi-container applications with Docker
 | [`push`](compose_push.md)       | Push service images                                                                     |
 | [`restart`](compose_restart.md) | Restart service containers                                                              |
 | [`rm`](compose_rm.md)           | Removes stopped service containers                                                      |
-| [`run`](compose_run.md)         | Run a one-off command on a service                                                      |
+| [`run`](compose_run.md)         | Run a one-off command on a service or job                                               |
 | [`scale`](compose_scale.md)     | Scale services                                                                          |
 | [`start`](compose_start.md)     | Start services                                                                          |
 | [`stats`](compose_stats.md)     | Display a live stream of container(s) resource usage statistics                         |

docs/reference/docker_compose_run.yaml

@@ -1,5 +1,5 @@
 command: docker compose run
-short: Run a one-off command on a service
+short: Run a one-off command on a service or job
 long: |-
     Runs a one-time command against a service.
 
@@ -54,7 +54,7 @@ long: |-
 
     This runs a database upgrade script, and removes the container when finished running, even if a restart policy is
     specified in the service configuration.
-usage: docker compose run [OPTIONS] SERVICE [COMMAND] [ARGS...]
+usage: docker compose run [OPTIONS] SERVICE|JOB [COMMAND] [ARGS...]
 pname: docker compose
 plink: docker_compose.yaml
 options:

go.mod

@@ -147,7 +147,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/compose-spec/compose-go/v2 => /Users/nicolas/go/src/github.com/compose-spec/compose-go
+replace github.com/compose-spec/compose-go/v2 => github.com/ndeloof/compose-go/v2 v2.0.1-0.20260417132041-a0f7078b3027
 
 exclude (
 	// FIXME(thaJeztah): remove this once kubernetes updated their dependencies to no longer need this.

go.sum

@@ -272,8 +272,8 @@ github.com/morikuni/aec v1.1.0 h1:vBBl0pUnvi/Je71dsRrhMBtreIqNMYErSAbEeb8jrXQ=
 github.com/morikuni/aec v1.1.0/go.mod h1:xDRgiq/iw5l+zkao76YTKzKttOp2cwPEne25HDkJnBw=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/ndeloof/compose-go/v2 v2.0.1-0.20260417075248-f37d49c3e808 h1:j9xyZ+njAa42UU2nW8d9tGAtg/Sh/v/t1nG7heRytWw=
-github.com/ndeloof/compose-go/v2 v2.0.1-0.20260417075248-f37d49c3e808/go.mod h1:ZU6zlcweCZKyiB7BVfCizQT9XmkEIMFE+PRZydVcsZg=
+github.com/ndeloof/compose-go/v2 v2.0.1-0.20260417132041-a0f7078b3027 h1:djnpaPpekm8X6oSswGFeFk/8jB4hgXZCP6KqZ8WZXe0=
+github.com/ndeloof/compose-go/v2 v2.0.1-0.20260417132041-a0f7078b3027/go.mod h1:ZU6zlcweCZKyiB7BVfCizQT9XmkEIMFE+PRZydVcsZg=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
 github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s=
 github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=

pkg/compose/loader.go

@@ -122,26 +122,28 @@ func (s *composeService) postProcessProject(project *types.Project, options api.
 		return nil, errors.New("project name can't be empty. Use ProjectName option to set a valid name")
 	}
 
+	// When the target is a job, skip service-oriented processing (profiles, service selection)
+	// and only select the job's service dependencies.
+	if len(options.Services) == 1 && project.Jobs != nil {
+		if _, ok := project.Jobs[options.Services[0]]; ok {
+			s.addCustomLabels(project, options)
+			project, err := project.WithSelectedJob(options.Services[0])
+			if err != nil {
+				return nil, err
+			}
+			if !options.All {
+				project = project.WithoutUnnecessaryResources()
+			}
+			return project, nil
+		}
+	}
+
 	project, err := project.WithServicesEnabled(options.Services...)
 	if err != nil {
 		return nil, err
 	}
 
-	// Add custom labels
-	for name, s := range project.Services {
-		s.CustomLabels = map[string]string{
-			api.ProjectLabel:     project.Name,
-			api.ServiceLabel:     name,
-			api.VersionLabel:     api.ComposeVersion,
-			api.WorkingDirLabel:  project.WorkingDir,
-			api.ConfigFilesLabel: strings.Join(project.ComposeFiles, ","),
-			api.OneoffLabel:      "False",
-		}
-		if len(options.EnvFiles) != 0 {
-			s.CustomLabels[api.EnvironmentFileLabel] = strings.Join(options.EnvFiles, ",")
-		}
-		project.Services[name] = s
-	}
+	s.addCustomLabels(project, options)
 
 	project, err = project.WithSelectedServices(options.Services)
 	if err != nil {
@@ -155,3 +157,20 @@ func (s *composeService) postProcessProject(project *types.Project, options api.
 
 	return project, nil
 }
+
+func (s *composeService) addCustomLabels(project *types.Project, options api.ProjectLoadOptions) {
+	for name, svc := range project.Services {
+		svc.CustomLabels = map[string]string{
+			api.ProjectLabel:     project.Name,
+			api.ServiceLabel:     name,
+			api.VersionLabel:     api.ComposeVersion,
+			api.WorkingDirLabel:  project.WorkingDir,
+			api.ConfigFilesLabel: strings.Join(project.ComposeFiles, ","),
+			api.OneoffLabel:      "False",
+		}
+		if len(options.EnvFiles) != 0 {
+			svc.CustomLabels[api.EnvironmentFileLabel] = strings.Join(options.EnvFiles, ",")
+		}
+		project.Services[name] = svc
+	}
+}