Merge pull request #22 from silphid/network-mode-and-host-env

Add "network" model option with "host" default value.

.gitignore

@@ -1 +1,2 @@
-**/.DS_Store
+**/.DS_Store
+/.yeyrc.yaml

src/internal/context.go

@@ -20,6 +20,7 @@ type Context struct {
 	Mounts     map[string]string
 	Cmd        []string
 	EntryPoint []string
+	Network    string
 }
 
 // Clone returns a deep-copy of this context
@@ -69,6 +70,9 @@ func (c Context) Merge(source Context) Context {
 	for key, value := range source.Build.Args {
 		merged.Build.Args[key] = value
 	}
+	if source.Network != "" {
+		merged.Network = source.Network
+	}
 	return merged
 }
 

src/internal/docker/cli.go

@@ -163,17 +163,17 @@ func runContainer(ctx context.Context, yeyCtx yey.Context, containerName string,
 		"run",
 		"-it",
 		"--name", containerName,
-		"--env", "LS_COLORS",
-		"--env", "TERM",
-		"--env", "TERM_COLOR",
-		"--env", "TERM_PROGRAM",
 		"--env", "YEY_WORK_DIR=" + cwd,
 		"--env", "YEY_CONTEXT=" + yeyCtx.Name,
 	}
 
 	// Context env vars
 	for name, value := range yeyCtx.Env {
-		args = append(args, "--env", fmt.Sprintf("%s=%s", name, value))
+		arg := name
+		if value != "" {
+			arg = fmt.Sprintf("%s=%s", name, value)
+		}
+		args = append(args, "--env", arg)
 	}
 
 	// Mount binds
@@ -185,10 +185,19 @@ func runContainer(ctx context.Context, yeyCtx yey.Context, containerName string,
 		)
 	}
 
+	// Remove container upon exit?
 	if yeyCtx.Remove != nil && *yeyCtx.Remove {
 		args = append(args, "--rm")
 	}
 
+	// Network mode
+	network := yeyCtx.Network
+	if network == "" {
+		network = "host"
+	}
+	args = append(args, "--network", network)
+
+	// Work directory
 	if options.workDir != "" {
 		args = append(args, "--workdir", options.workDir)
 	}