clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes to type names

Browse Source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby
2014-01-17 17:42:22 -08:00
parent 889b4b10ae
commit ca8dd73fbf
5 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
execdriver/lxc/init.go
+6 -6
View File
@@ -13,7 +13,7 @@ import (
"syscall"
)
func setupHostname(args *execdriver.DockerInitArgs) error {
func setupHostname(args *execdriver.InitArgs) error {
hostname := getEnv(args, "HOSTNAME")
if hostname == "" {
return nil
@@ -22,7 +22,7 @@ func setupHostname(args *execdriver.DockerInitArgs) error {
}
// Setup networking
func setupNetworking(args *execdriver.DockerInitArgs) error {
func setupNetworking(args *execdriver.InitArgs) error {
if args.Ip != "" {
// eth0
iface, err := net.InterfaceByName("eth0")
@@ -67,7 +67,7 @@ func setupNetworking(args *execdriver.DockerInitArgs) error {
}
// Setup working directory
func setupWorkingDirectory(args *execdriver.DockerInitArgs) error {
func setupWorkingDirectory(args *execdriver.InitArgs) error {
if args.WorkDir == "" {
return nil
}
@@ -78,7 +78,7 @@ func setupWorkingDirectory(args *execdriver.DockerInitArgs) error {
}
// Takes care of dropping privileges to the desired user
func changeUser(args *execdriver.DockerInitArgs) error {
func changeUser(args *execdriver.InitArgs) error {
if args.User == "" {
return nil
}
@@ -106,7 +106,7 @@ func changeUser(args *execdriver.DockerInitArgs) error {
return nil
}
func setupCapabilities(args *execdriver.DockerInitArgs) error {
func setupCapabilities(args *execdriver.InitArgs) error {
if args.Privileged {
return nil
@@ -142,7 +142,7 @@ func setupCapabilities(args *execdriver.DockerInitArgs) error {
return nil
}
func getEnv(args *execdriver.DockerInitArgs, key string) string {
func getEnv(args *execdriver.InitArgs, key string) string {
for _, kv := range args.Env {
parts := strings.SplitN(kv, "=", 2)
if parts[0] == key && len(parts) == 2 {