fix: rework services

pkg/container/docker_network.go

@@ -7,15 +7,22 @@ import (
 	"github.com/nektos/act/pkg/common"
 )
 
-func NewDockerNetworkCreateExecutor(name string) common.Executor {
+func NewDockerNetworkCreateExecutor(name string, config types.NetworkCreate) common.Executor {
 	return func(ctx context.Context) error {
+		if common.Dryrun(ctx) {
+			return nil
+		}
+
 		cli, err := GetDockerClient(ctx)
 		if err != nil {
 			return err
 		}
 
-		_, err = cli.NetworkCreate(ctx, name, types.NetworkCreate{})
-		if err != nil {
+		if exists := DockerNetworkExists(ctx, name); exists {
+			return nil
+		}
+
+		if _, err = cli.NetworkCreate(ctx, name, config); err != nil {
 			return err
 		}
 
@@ -25,12 +32,40 @@ func NewDockerNetworkCreateExecutor(name string) common.Executor {
 
 func NewDockerNetworkRemoveExecutor(name string) common.Executor {
 	return func(ctx context.Context) error {
+		if common.Dryrun(ctx) {
+			return nil
+		}
+
 		cli, err := GetDockerClient(ctx)
 		if err != nil {
 			return err
 		}
 
-		cli.NetworkRemove(ctx, name)
+		if err = cli.NetworkRemove(ctx, name); err != nil {
+			return err
+		}
+
 		return nil
 	}
 }
+
+func DockerNetworkExists(ctx context.Context, name string) bool {
+	if _, exists, _ := GetDockerNetwork(ctx, name); !exists {
+		return false
+	}
+	return true
+}
+
+func GetDockerNetwork(ctx context.Context, name string) (types.NetworkResource, bool, error) {
+	cli, err := GetDockerClient(ctx)
+	if err != nil {
+		return types.NetworkResource{}, false, err
+	}
+
+	res, err := cli.NetworkInspect(ctx, name, types.NetworkInspectOptions{})
+	if err != nil {
+		return types.NetworkResource{}, false, err
+	}
+
+	return res, true, nil
+}

pkg/container/docker_run.go

@@ -78,6 +78,7 @@ type Container interface {
 	UpdateFromPath(env *map[string]string) common.Executor
 	Remove() common.Executor
 	Close() common.Executor
+	SetContainerNetworkMode(mode string) common.Executor
 }
 
 // NewContainer creates a reference to a container
@@ -106,12 +107,26 @@ func supportsContainerImagePlatform(cli *client.Client) bool {
 	return constraint.Check(sv)
 }
 
+func (cr *containerReference) SetContainerNetworkMode(mode string) common.Executor {
+	return common.
+		NewDebugExecutor("Changed network mode for container '%s' from '%s' to '%s'", cr.input.Name, cr.input.NetworkMode, mode).
+		Then(
+			common.NewPipelineExecutor(
+				func(ctx context.Context) error {
+					cr.input.NetworkMode = mode
+					return nil
+				},
+			).IfNot(common.Dryrun),
+		)
+}
+
 func (cr *containerReference) ConnectToNetwork(name string) common.Executor {
 	return common.
-		NewDebugExecutor("%sdocker network connect %s %s", logPrefix, name, cr.input.Name).
+		NewInfoExecutor("%sdocker network connect %s %s", logPrefix, name, cr.input.Name).
 		Then(
 			common.NewPipelineExecutor(
 				cr.connect(),
+				cr.find(),
 				cr.connectToNetwork(name),
 			).IfNot(common.Dryrun),
 		)
@@ -158,19 +173,26 @@ func (cr *containerReference) Pull(forcePull bool) common.Executor {
 }
 
 func (cr *containerReference) Copy(destPath string, files ...*FileEntry) common.Executor {
-	return common.NewPipelineExecutor(
-		cr.connect(),
-		cr.find(),
-		cr.copyContent(destPath, files...),
-	).IfNot(common.Dryrun)
+	return common.
+		NewInfoExecutor("%sdocker cp %+v destPath=%s", logPrefix, files, destPath).
+		Then(
+			common.NewPipelineExecutor(
+				cr.connect(),
+				cr.find(),
+				cr.copyContent(destPath, files...),
+			).IfNot(common.Dryrun),
+		)
 }
 
 func (cr *containerReference) CopyDir(destPath string, srcPath string, useGitIgnore bool) common.Executor {
-	return common.NewPipelineExecutor(
-		common.NewInfoExecutor("%sdocker cp src=%s dst=%s", logPrefix, srcPath, destPath),
-		cr.Exec([]string{"mkdir", "-p", destPath}, nil, "", ""),
-		cr.copyDir(destPath, srcPath, useGitIgnore),
-	).IfNot(common.Dryrun)
+	return common.
+		NewInfoExecutor("%sdocker cp src=%s dst=%s", logPrefix, srcPath, destPath).
+		Then(
+			common.NewPipelineExecutor(
+				cr.Exec([]string{"mkdir", "-p", destPath}, nil, "", ""),
+				cr.copyDir(destPath, srcPath, useGitIgnore),
+			).IfNot(common.Dryrun),
+		)
 }
 
 func (cr *containerReference) GetContainerArchive(ctx context.Context, srcPath string) (io.ReadCloser, error) {
@@ -191,21 +213,28 @@ func (cr *containerReference) UpdateFromPath(env *map[string]string) common.Exec
 }
 
 func (cr *containerReference) Exec(command []string, env map[string]string, user, workdir string) common.Executor {
-	return common.NewPipelineExecutor(
-		common.NewInfoExecutor("%sdocker exec cmd=[%s] user=%s workdir=%s", logPrefix, strings.Join(command, " "), user, workdir),
-		cr.connect(),
-		cr.find(),
-		cr.exec(command, env, user, workdir),
-	).IfNot(common.Dryrun)
+	return common.
+		NewInfoExecutor("%sdocker exec cmd=%v user=%s workdir=%s", logPrefix, command, user, workdir).
+		Then(
+			common.NewPipelineExecutor(
+				cr.connect(),
+				cr.find(),
+				cr.exec(command, env, user, workdir),
+			).IfNot(common.Dryrun),
+		)
 }
 
 func (cr *containerReference) Remove() common.Executor {
-	return common.NewPipelineExecutor(
-		cr.connect(),
-		cr.find(),
-	).Finally(
-		cr.remove(),
-	).IfNot(common.Dryrun)
+	return common.
+		NewInfoExecutor("%sdocker rm %s", logPrefix, cr.id).
+		Then(
+			common.NewPipelineExecutor(
+				cr.connect(),
+				cr.find(),
+			).Finally(
+				cr.remove(),
+			).IfNot(common.Dryrun),
+		)
 }
 
 type containerReference struct {
@@ -247,7 +276,7 @@ func GetDockerClient(ctx context.Context) (*client.Client, error) {
 
 func (cr *containerReference) connectToNetwork(name string) common.Executor {
 	return func(ctx context.Context) error {
-		return cr.cli.NetworkConnect(ctx, name, cr.input.Name, nil)
+		return cr.cli.NetworkConnect(ctx, name, cr.id, nil)
 	}
 }
 
@@ -338,9 +367,11 @@ func (cr *containerReference) create(capAdd []string, capDrop []string) common.E
 			Tty:        isTerminal,
 			Hostname:   input.Hostname,
 		}
+
 		if len(input.Cmd) > 0 {
 			config.Cmd = input.Cmd
 		}
+
 		if len(input.Entrypoint) > 0 {
 			config.Entrypoint = input.Entrypoint
 		}
@@ -379,6 +410,7 @@ func (cr *containerReference) create(capAdd []string, capDrop []string) common.E
 		if err != nil {
 			return errors.WithStack(err)
 		}
+
 		logger.Debugf("Created container name=%s id=%v from image %v (platform: %s)", input.Name, resp.ID, input.Image, input.Platform)
 		logger.Debugf("ENV ==> %v", input.Env)