Compare commits

...

2 Commits

Author SHA1 Message Date
LinkLeong
4434ba522b update upgrade script address 2022-09-09 07:36:49 +01:00
LinkLeong
aac8fe85ba update the way environment variables are displayed 2022-09-09 06:46:51 +01:00
3 changed files with 4 additions and 4 deletions

View File

@@ -9,4 +9,4 @@
### ###
curl -fsSL https://raw.githubusercontent.com/LinkLeong/casaos-alpha/main/new.update.sh | bash curl -fsSL https://raw.githubusercontent.com/IceWhaleTech/get/main/upgrade.sh | bash

View File

@@ -38,7 +38,7 @@ var upgrader = websocket.Upgrader{
HandshakeTimeout: time.Duration(time.Second * 5), HandshakeTimeout: time.Duration(time.Second * 5),
} }
//打开docker的terminal // 打开docker的terminal
func DockerTerminal(c *gin.Context) { func DockerTerminal(c *gin.Context) {
col := c.DefaultQuery("cols", "100") col := c.DefaultQuery("cols", "100")
row := c.DefaultQuery("rows", "30") row := c.DefaultQuery("rows", "30")
@@ -1126,7 +1126,7 @@ func ContainerUpdateInfo(c *gin.Context) {
} }
} }
for _, v := range info.Config.Env { for _, v := range info.Config.Env {
if len(showENVList) > 0 { if len(showENVList) > 0 && info.Config.Labels["origin"] != "local" {
if _, ok := showENVMap[strings.Split(v, "=")[0]]; ok { if _, ok := showENVMap[strings.Split(v, "=")[0]]; ok {
temp := model.Env{ temp := model.Env{
Name: strings.Split(v, "=")[0], Name: strings.Split(v, "=")[0],

View File

@@ -221,7 +221,7 @@ func (s *systemService) UpdateSystemVersion(version string) {
} }
file.CreateFile(config.AppInfo.LogPath + "/upgrade.log") file.CreateFile(config.AppInfo.LogPath + "/upgrade.log")
//go command2.OnlyExec("curl -fsSL https://raw.githubusercontent.com/LinkLeong/casaos-alpha/main/update.sh | bash") //go command2.OnlyExec("curl -fsSL https://raw.githubusercontent.com/LinkLeong/casaos-alpha/main/update.sh | bash")
go command2.OnlyExec("curl -fsSL https://raw.githubusercontent.com/IceWhaleTech/get/main/update.sh | sudo bash") go command2.OnlyExec("curl -fsSL https://raw.githubusercontent.com/IceWhaleTech/get/main/upgrade.sh | bash")
//s.log.Error(config.AppInfo.ProjectPath + "/shell/tool.sh -r " + version) //s.log.Error(config.AppInfo.ProjectPath + "/shell/tool.sh -r " + version)
//s.log.Error(command2.ExecResultStr(config.AppInfo.ProjectPath + "/shell/tool.sh -r " + version)) //s.log.Error(command2.ExecResultStr(config.AppInfo.ProjectPath + "/shell/tool.sh -r " + version))
} }