fix orphan detection

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

Author: ndeloof

pkg/compose/hash.go

@@ -42,6 +42,19 @@ func ServiceHash(o types.ServiceConfig) (string, error) {
 	return digest.SHA256.FromBytes(bytes).Encoded(), nil
 }
 
+// ContainerSpecHash computes the configuration hash for a ContainerSpec (used by jobs and one-off containers).
+func ContainerSpecHash(o types.ContainerSpec) (string, error) {
+	o.Build = nil
+	o.PullPolicy = ""
+	o.DependsOn = nil
+
+	bytes, err := json.Marshal(o)
+	if err != nil {
+		return "", err
+	}
+	return digest.SHA256.FromBytes(bytes).Encoded(), nil
+}
+
 // NetworkHash computes the configuration hash for a network.
 func NetworkHash(o *types.NetworkConfig) (string, error) {
 	bytes, err := json.Marshal(o)

pkg/compose/run.go

@@ -190,39 +190,17 @@ func (s *composeService) prepareRun(ctx context.Context, project *types.Project,
 		return prepareRunResult{}, err
 	}
 
-	createOpts := createOptions{
-		AutoRemove:        opts.AutoRemove,
-		AttachStdin:       opts.Interactive,
-		UseNetworkAliases: opts.UseNetworkAliases,
-		Labels:            mergeLabels(target.Labels, target.CustomLabels),
-	}
-
-	eventName := "Container " + target.ContainerName
-	s.events.On(creatingEvent(eventName))
-	created, err := s.createMobyContainer(ctx, project, target.Name, &target.ContainerSpec, nil, target.ContainerName, -1, nil, createOpts)
-	if err != nil {
-		if ctx.Err() == nil {
-			s.events.On(api.Resource{
-				ID:     eventName,
-				Status: api.Error,
-				Text:   err.Error(),
-			})
-		}
-		return prepareRunResult{}, err
-	}
-	s.events.On(createdEvent(eventName))
-
-	inspect, err := s.apiClient().ContainerInspect(ctx, created.ID, client.ContainerInspectOptions{})
+	created, err := s.createOneOffContainer(ctx, project, target, opts)
 	if err != nil {
 		return prepareRunResult{}, err
 	}
 
-	err = s.injectSecrets(ctx, project, target.Name, &target.ContainerSpec, inspect.Container.ID)
+	err = s.injectSecrets(ctx, project, target.Name, &target.ContainerSpec, created.ID)
 	if err != nil {
 		return prepareRunResult{containerID: created.ID}, err
 	}
 
-	err = s.injectConfigs(ctx, project, target.Name, &target.ContainerSpec, inspect.Container.ID)
+	err = s.injectConfigs(ctx, project, target.Name, &target.ContainerSpec, created.ID)
 	return prepareRunResult{
 		containerID: created.ID,
 		target:      target,
@@ -247,6 +225,36 @@ func resolveRunTarget(project *types.Project, opts api.RunOptions) (runTarget, e
 	return runTarget{Name: service.Name, ContainerSpec: service.ContainerSpec}, nil
 }
 
+func (s *composeService) createOneOffContainer(ctx context.Context, project *types.Project, target runTarget, opts api.RunOptions) (container.Summary, error) {
+	hash, err := ContainerSpecHash(target.ContainerSpec)
+	if err != nil {
+		return container.Summary{}, err
+	}
+	createOpts := createOptions{
+		AutoRemove:        opts.AutoRemove,
+		AttachStdin:       opts.Interactive,
+		UseNetworkAliases: opts.UseNetworkAliases,
+		Labels: mergeLabels(target.Labels, target.CustomLabels).
+			Add(api.ConfigHashLabel, hash),
+	}
+
+	eventName := "Container " + target.ContainerName
+	s.events.On(creatingEvent(eventName))
+	created, err := s.createMobyContainer(ctx, project, target.Name, &target.ContainerSpec, nil, target.ContainerName, -1, nil, createOpts)
+	if err != nil {
+		if ctx.Err() == nil {
+			s.events.On(api.Resource{
+				ID:     eventName,
+				Status: api.Error,
+				Text:   err.Error(),
+			})
+		}
+		return container.Summary{}, err
+	}
+	s.events.On(createdEvent(eventName))
+	return created, nil
+}
+
 func prepareBuildOptions(opts api.RunOptions) *api.BuildOptions {
 	if opts.Build == nil {
 		return nil

pkg/e2e/compose_run_test.go

@@ -78,7 +78,7 @@ func TestLocalComposeRun(t *testing.T) {
 		assert.Assert(t, strings.Contains(res.Stdout(), "run-test-back"), res.Stdout())
 	})
 
-	t.Run("down", func(t *testing.T) {
+	t.Run("down --remove-orphans", func(t *testing.T) {
 		c.RunDockerComposeCmd(t, "-f", "./fixtures/run-test/compose.yaml", "down", "--remove-orphans")
 		res := c.RunDockerCmd(t, "ps", "--all")
 		assert.Assert(t, !strings.Contains(res.Stdout(), "run-test"), res.Stdout())