diff --git a/base/cli/cli.go b/base/cli/cli.go index 98761c93..770bc300 100644 --- a/base/cli/cli.go +++ b/base/cli/cli.go @@ -42,6 +42,7 @@ var Index = &ice.Context{Name: "cli", Help: "命令模块", m.Conf(RUNTIME, "conf.ctx_dev", os.Getenv("ctx_dev")) m.Conf(RUNTIME, "conf.ctx_shy", os.Getenv("ctx_shy")) m.Conf(RUNTIME, "conf.ctx_pid", os.Getenv("ctx_pid")) + m.Conf(RUNTIME, "conf.ctx_user", os.Getenv("ctx_user")) // 主机信息 m.Conf(RUNTIME, "host.GOARCH", runtime.GOARCH) @@ -49,7 +50,7 @@ var Index = &ice.Context{Name: "cli", Help: "命令模块", m.Conf(RUNTIME, "host.pid", os.Getpid()) // 启动信息 - m.Conf(RUNTIME, "boot.username", os.Getenv("USER")) + m.Conf(RUNTIME, "boot.username", kit.Select(os.Getenv("USER"), os.Getenv("ctx_user"))) if user, e := user.Current(); e == nil && user.Name != "" { m.Conf(RUNTIME, "boot.username", user.Name) } diff --git a/misc/docker/docker.go b/misc/docker/docker.go index e7fa24aa..9a09d707 100644 --- a/misc/docker/docker.go +++ b/misc/docker/docker.go @@ -139,8 +139,8 @@ var Index = &ice.Context{Name: "docker", Help: "虚拟机", p = path.Join(p, ".bashrc") if _, e := os.Stat(p); e != nil { - m.Cmd(nfs.SAVE, p, kit.Format("export ctx_dev=%s\nexport ctx_pod=%s\n", - m.Conf(cli.RUNTIME, "conf.ctx_dev"), arg[0])) + m.Cmd(nfs.SAVE, p, kit.Format("export ctx_dev=%s\nexport ctx_pod=%s ctx_user=%s\n", + m.Conf(cli.RUNTIME, "conf.ctx_dev"), arg[0], cli.UserName)) } }