change default shell to "sh" instead of "bash", change default mysql user to "root"

This commit is contained in:
richardxz
2018-06-21 10:28:48 +08:00
parent 4f4caa33fb
commit 91e5587fb0
2 changed files with 2 additions and 2 deletions

View File

@@ -271,7 +271,7 @@ func WaitForTerminal(k8sClient kubernetes.Interface, cfg *rest.Config, request *
close(terminalSessions[sessionId].bound)
var err error
validShells := []string{"bash", "sh"}
validShells := []string{"sh", "bash"}
if isValidShell(validShells, shell) {
cmd := []string{shell}

View File

@@ -107,7 +107,7 @@ func (s *ServerRunOptions) addFlags(fs *pflag.FlagSet) {
fs.StringVar(&s.mysqlPasswd, "mysql-password", "123456",
"Password of mysql")
fs.StringVar(&s.mysqlUser, "mysql-user", "mysql",
fs.StringVar(&s.mysqlUser, "mysql-user", "root",
"User of mysql.")
fs.StringVar(&s.opAddress, "openpitrix-address", "http://openpitrix-api-gateway.openpitrix-system.svc",