container/docker: inline some vars

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

container/docker/handler.go

@@ -197,9 +197,18 @@ func newContainerHandler(
 		rootfsStorageDir:   rootfsStorageDir,
 		envs:               make(map[string]string),
 		labels:             ctnr.Config.Labels,
+		image:              ctnr.Config.Image,
 		metrics:            includedMetrics,
 		thinPoolName:       thinPoolName,
 		zfsParent:          zfsParent,
+		reference: info.ContainerReference{
+			// Add the name and bare ID as aliases of the container.
+			Id:        id,
+			Name:      name,
+			Aliases:   []string{strings.TrimPrefix(ctnr.Name, "/"), id},
+			Namespace: DockerNamespace,
+		},
+		libcontainerHandler: containerlibcontainer.NewHandler(cgroupManager, rootFs, ctnr.State.Pid, metrics),
 	}
 	// Health status may be nil if no health check is configured
 	if ctnr.State.Health != nil {
@@ -210,16 +219,6 @@ func newContainerHandler(
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse the create timestamp %q for container %q: %v", ctnr.Created, id, err)
 	}
-	handler.libcontainerHandler = containerlibcontainer.NewHandler(cgroupManager, rootFs, ctnr.State.Pid, metrics)
-
-	// Add the name and bare ID as aliases of the container.
-	handler.reference = info.ContainerReference{
-		Id:        id,
-		Name:      name,
-		Aliases:   []string{strings.TrimPrefix(ctnr.Name, "/"), id},
-		Namespace: DockerNamespace,
-	}
-	handler.image = ctnr.Config.Image
 
 	if ctnr.RestartCount > 0 {
 		handler.labels["restartcount"] = strconv.Itoa(ctnr.RestartCount)

container/podman/handler.go

@@ -153,6 +153,7 @@ func newContainerHandler(
 		thinPoolName:       thinPoolName,
 		zfsParent:          zfsParent,
 		reference: info.ContainerReference{
+			// Add the name and bare ID as aliases of the container.
 			Id:        id,
 			Name:      name,
 			Aliases:   []string{strings.TrimPrefix(ctnr.Name, "/"), id},