Skip to content

Adding alias to driver #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ebarriosjr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding alias to driver #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion driver/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"os"
"os/exec"
"strconv"
"time"

hclog "github.com/hashicorp/go-hclog"
Expand Down Expand Up @@ -58,6 +59,7 @@ var (
"args": hclspec.NewAttr("args", "list(string)", false),
"port_map": hclspec.NewAttr("port_map", "list(map(string))", false),
"network_mode": hclspec.NewAttr("network_mode", "string", false),
"ip": hclspec.NewAttr("ip", "string", false),
"mount": hclspec.NewAttr("mount", "list(string)", false),
"copy": hclspec.NewAttr("copy", "list(string)", false),
"mount_read_only": hclspec.NewAttr("mount_read_only", "list(string)", false),
Expand Down Expand Up @@ -123,6 +125,7 @@ type TaskConfig struct {

//Network Mode
NetworkMode string `codec:"network_mode"`
IP string `codec:"ip"`

// Enable debug-verbose global options
Debug bool `codec:"debug"`
Expand Down Expand Up @@ -458,6 +461,24 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
StartedAt: h.startedAt,
}

var networkConfig drivers.DriverNetwork
if driverConfig.IP != "" {
networkConfig.IP = driverConfig.IP
networkConfig.AutoAdvertise = true

ports := make(map[string]int)
for name, port := range driverConfig.PortMap {
portString, err := strconv.Atoi(port)
if err != nil {
fmt.Println("Error converting port string to int")
return nil, nil, err
}
ports[name] = portString
}

networkConfig.PortMap = ports
}

d.logger.Trace("START TASK", "taskState", driverState)

if err := handle.SetDriverState(&driverState); err != nil {
Expand All @@ -478,7 +499,7 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
d.logger.Trace("###########################################################################################################################################")
d.logger.Trace("########################################################/STARTTASK#########################################################################")
d.logger.Trace("###########################################################################################################################################")
return handle, nil, nil
return handle, &networkConfig, nil
}

func (d *Driver) recoverWait(id string, se syexec) {
Expand Down
9 changes: 8 additions & 1 deletion driver/prepare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,15 @@ func prepareContainer(cfg *drivers.TaskConfig, taskCfg TaskConfig) (syexec, erro
taskCfg.Command = "\"" + taskCfg.Command + "\""
argv = append(argv, "-c", taskCfg.Command)
}
if taskCfg.NetworkMode != "" {

if taskCfg.NetworkMode != "" && taskCfg.NetworkMode != "alias" && taskCfg.NetworkMode != "host" {
argv = append(argv, "-N", taskCfg.NetworkMode)
} else if taskCfg.NetworkMode == "alias" {
if taskCfg.IP == "" {
err := errors.New("ip can not be empty if network_mode is set to alias")
return se, err
}
argv = append(argv, "-N", "alias", "-i", taskCfg.IP)
} else if len(taskCfg.PortMap) > 0 {
argv = append(argv, "-N", "public-bridge", "-i", "auto")
}
Expand Down