github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

oci: fix err variable scope

Browse Source 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2018-01-11 14:06:50 +09:00
parent 1167035be3
commit 369d7c9545
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
oci/spec_opts_unix.go
View File

@ -95,6 +95,11 @@ func WithImageConfig(image Image) SpecOpts {
s.Process.Env = append(s.Process.Env, config.Env...) s.Process.Env = append(s.Process.Env, config.Env...)
cmd := config.Cmd cmd := config.Cmd
s.Process.Args = append(config.Entrypoint, cmd...) s.Process.Args = append(config.Entrypoint, cmd...)
cwd := config.WorkingDir
if cwd == "" {
cwd = "/"
}
s.Process.Cwd = cwd
if config.User != "" { if config.User != "" {
parts := strings.Split(config.User, ":") parts := strings.Split(config.User, ":")
switch len(parts) { switch len(parts) {
@ -102,10 +107,7 @@ func WithImageConfig(image Image) SpecOpts {
v, err := strconv.Atoi(parts[0]) v, err := strconv.Atoi(parts[0])
if err != nil { if err != nil {
// if we cannot parse as a uint they try to see if it is a username // if we cannot parse as a uint they try to see if it is a username
if err := WithUsername(config.User)(ctx, client, c, s); err != nil { return WithUsername(config.User)(ctx, client, c, s)
return err
}
return err
} }
if err := WithUserID(uint32(v))(ctx, client, c, s); err != nil { if err := WithUserID(uint32(v))(ctx, client, c, s); err != nil {
return err return err
@ -125,11 +127,6 @@ func WithImageConfig(image Image) SpecOpts {
return fmt.Errorf("invalid USER value %s", config.User) return fmt.Errorf("invalid USER value %s", config.User)
} }
} }
cwd := config.WorkingDir
if cwd == "" {
cwd = "/"
}
s.Process.Cwd = cwd
return nil return nil
} }
} }