admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #105 from richardxz/master

Browse Source 
@richardxz change default shell to "sh" instead of "bash", change default mysql user to "root"
This commit is contained in:
zryfish
2018-06-21 12:48:02 +08:00
committed by GitHub
parent 195dc34337 91e5587fb0
commit b40750378b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/models/terminal.go
View File

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

2
pkg/options/options.go
View File

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