ThePain/CasaOS
1
0
Fork 0
mirror of https://github.com/IceWhaleTech/CasaOS.git synced 2025-11-07 07:09:46 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' into v0.3.3

Browse Source
This commit is contained in:
a624669980@163.com 2022-06-17 14:02:53 +08:00
commit f1a1c05c94
13 changed files with 84 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CHANGELOG.md
View File

@ -18,14 +18,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
## [0.3.2.1] - 2022-06-14 ## [0.3.2.1] - 2022-06-16(UTC)
### Changed
- [System] Adjusted the display style.
### Fixed ### Fixed
- Fix the problem of application opening failure on non-80 ports ([#283](https://github.com/IceWhaleTech/CasaOS/issues/283) [#280](https://github.com/IceWhaleTech/CasaOS/issues/280)) - [System] Fixed the issue of widgets displaying wrongly on mobile devices.
- Modify port failure problem ([#282](https://github.com/IceWhaleTech/CasaOS/issues/282)) - [App] Fix the problem of application opening failure on non-80 ports ([#283](https://github.com/IceWhaleTech/CasaOS/issues/283) [#280](https://github.com/IceWhaleTech/CasaOS/issues/280))
- Modify environment variables disappearing problem([#284](https://github.com/IceWhaleTech/CasaOS/issues/284)) - [System] Modify port failure problem ([#282](https://github.com/IceWhaleTech/CasaOS/issues/282))
- Fix no update alert([#278](https://github.com/IceWhaleTech/CasaOS/issues/278)) - [App]Modify environment variables disappearing problem([#284](https://github.com/IceWhaleTech/CasaOS/issues/284))
- [System]Fix no update alert([#278](https://github.com/IceWhaleTech/CasaOS/issues/278))
- [System] Fixed some bugs of application cpu usage and memory staging([#272](https://github.com/IceWhaleTech/CasaOS/issues/272))
- [App] Fixed plex and HA network mode error issues ([#299](https://github.com/IceWhaleTech/CasaOS/issues/299))
- [App] Fix application terminal not working ([#266](https://github.com/IceWhaleTech/CasaOS/issues/266))
## [0.3.2] - 2022-06-10 ## [0.3.2] - 2022-06-10

10
model/docker.go
View File

@ -1,3 +1,13 @@
/*
* @Author: LinkLeong link@icewhale.com
* @Date: 2021-12-08 18:10:25
* @LastEditors: LinkLeong
* @LastEditTime: 2022-06-14 17:20:36
* @FilePath: /CasaOS/model/docker.go
* @Description:
* @Website: https://www.casaos.io
* Copyright (c) 2022 by icewhale, All Rights Reserved.
*/
package model package model
type DockerStatsModel struct { type DockerStatsModel struct {

5
pkg/utils/version/version.go
View File

@ -2,7 +2,7 @@
* @Author: LinkLeong link@icewhale.com * @Author: LinkLeong link@icewhale.com
* @Date: 2022-05-13 18:15:46 * @Date: 2022-05-13 18:15:46
* @LastEditors: LinkLeong * @LastEditors: LinkLeong
* @LastEditTime: 2022-06-14 11:17:16 * @LastEditTime: 2022-06-16 20:08:21
* @FilePath: /CasaOS/pkg/utils/version/version.go * @FilePath: /CasaOS/pkg/utils/version/version.go
* @Description: * @Description:
* @Website: https://www.casaos.io * @Website: https://www.casaos.io
@ -41,6 +41,9 @@ func IsNeedUpdate() (bool, model.Version) {
for i := 0; i < len(v1); i++ { for i := 0; i < len(v1); i++ {
a, _ := strconv.Atoi(v1[i]) a, _ := strconv.Atoi(v1[i])
b, _ := strconv.Atoi(v2[i]) b, _ := strconv.Atoi(v2[i])
if i == 0 && a > b {
continue
}
if a > b { if a > b {
return true, version return true, version
} }

3
route/init.go
View File

@ -106,9 +106,10 @@ func installSyncthing(appId string) {
m.Ports = appInfo.Ports m.Ports = appInfo.Ports
m.Restart = "always" m.Restart = "always"
m.Volumes = appInfo.Volumes m.Volumes = appInfo.Volumes
m.NetworkModel = appInfo.NetworkModel
m.Label = id m.Label = id
m.CustomId = id m.CustomId = id
containerId, err := service.MyService.Docker().DockerContainerCreate(dockerImage+":"+dockerImageVersion, m, appInfo.NetworkModel) containerId, err := service.MyService.Docker().DockerContainerCreate(dockerImage+":"+dockerImageVersion, m)
if err != nil { if err != nil {
fmt.Println("container create error", err) fmt.Println("container create error", err)
// create container error // create container error

1
route/route.go
View File

@ -118,6 +118,7 @@ func InitRouter() *gin.Engine {
v1SysGroup := v1Group.Group("/sys") v1SysGroup := v1Group.Group("/sys")
v1SysGroup.Use() v1SysGroup.Use()
{ {
v1SysGroup.GET("/check", v1.GetSystemCheckVersion)
v1SysGroup.GET("/version/check", v1.GetSystemCheckVersion) v1SysGroup.GET("/version/check", v1.GetSystemCheckVersion)
v1SysGroup.GET("/hardware/info", v1.GetSystemHardwareInfo) v1SysGroup.GET("/hardware/info", v1.GetSystemHardwareInfo)
v1SysGroup.POST("/update", v1.SystemUpdate) v1SysGroup.POST("/update", v1.SystemUpdate)

4
route/v1/docker.go
View File

@ -326,7 +326,7 @@ func InstallApp(c *gin.Context) {
time.Sleep(time.Second) time.Sleep(time.Second)
} }
_, err = service.MyService.Docker().DockerContainerCreate(dockerImage+":"+dockerImageVersion, m, appInfo.NetworkModel) _, err = service.MyService.Docker().DockerContainerCreate(dockerImage+":"+dockerImageVersion, m)
if err != nil { if err != nil {
//service.MyService.Redis().Set(id, "{\"id\"\""+id+"\",\"state\":false,\"message\":\""+err.Error()+"\",\"speed\":80}", 100) //service.MyService.Redis().Set(id, "{\"id\"\""+id+"\",\"state\":false,\"message\":\""+err.Error()+"\",\"speed\":80}", 100)
notify := notify.Application{} notify := notify.Application{}
@ -900,7 +900,7 @@ func UpdateSetting(c *gin.Context) {
service.MyService.Docker().DockerContainerUpdateName(id, id) service.MyService.Docker().DockerContainerUpdateName(id, id)
//service.MyService.Docker().DockerContainerRemove(id, true) //service.MyService.Docker().DockerContainerRemove(id, true)
containerId, err := service.MyService.Docker().DockerContainerCreate(m.Image, m, m.NetworkModel) containerId, err := service.MyService.Docker().DockerContainerCreate(m.Image, m)
if err != nil { if err != nil {
service.MyService.Docker().DockerContainerUpdateName(m.Label, id) service.MyService.Docker().DockerContainerUpdateName(m.Label, id)
service.MyService.Docker().DockerContainerStart(id) service.MyService.Docker().DockerContainerStart(id)

23
service/app.go
View File

@ -464,12 +464,8 @@ func (a *appStruct) GetHardwareUsageSteam() {
fts := filters.NewArgs() fts := filters.NewArgs()
fts.Add("label", "casaos=casaos") fts.Add("label", "casaos=casaos")
//fts.Add("label", "casaos") //fts.Add("status", "running")
//fts.Add("casaos", "casaos")
containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{All: true, Filters: fts})
if err != nil {
loger.Error("Failed to get container_list", zap.Any("err", err))
}
for i := 0; i < 100; i++ { for i := 0; i < 100; i++ {
if config.CasaOSGlobalVariables.AppChange { if config.CasaOSGlobalVariables.AppChange {
config.CasaOSGlobalVariables.AppChange = false config.CasaOSGlobalVariables.AppChange = false
@ -479,8 +475,16 @@ func (a *appStruct) GetHardwareUsageSteam() {
return true return true
}) })
} }
containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{All: true, Filters: fts})
if err != nil {
loger.Error("Failed to get container_list", zap.Any("err", err))
}
var temp sync.Map
var wg sync.WaitGroup var wg sync.WaitGroup
for _, v := range containers { for _, v := range containers {
if v.State != "running" {
continue
}
wg.Add(1) wg.Add(1)
go func(v types.Container, i int) { go func(v types.Container, i int) {
defer wg.Done() defer wg.Done()
@ -501,15 +505,18 @@ func (a *appStruct) GetHardwareUsageSteam() {
dockerStats.Data = data dockerStats.Data = data
dockerStats.Icon = v.Labels["icon"] dockerStats.Icon = v.Labels["icon"]
dockerStats.Title = strings.ReplaceAll(v.Names[0], "/", "") dockerStats.Title = strings.ReplaceAll(v.Names[0], "/", "")
dataStats.Store(v.ID, dockerStats)
temp.Store(v.ID, dockerStats)
if i == 99 { if i == 99 {
stats.Body.Close() stats.Body.Close()
} }
}(v, i) }(v, i)
} }
wg.Wait() wg.Wait()
dataStats = temp
isFinish = true isFinish = true
time.Sleep(time.Second * 3)
time.Sleep(time.Second * 1)
} }
isFinish = false isFinish = false
cancel() cancel()

20
service/docker.go
View File

@ -45,7 +45,7 @@ import (
type DockerService interface { type DockerService interface {
DockerPullImage(imageName string, icon, name string) error DockerPullImage(imageName string, icon, name string) error
IsExistImage(imageName string) bool IsExistImage(imageName string) bool
DockerContainerCreate(imageName string, m model.CustomizationPostData, net string) (containerId string, err error) DockerContainerCreate(imageName string, m model.CustomizationPostData) (containerId string, err error)
DockerContainerCopyCreate(info *types.ContainerJSON) (containerId string, err error) DockerContainerCopyCreate(info *types.ContainerJSON) (containerId string, err error)
DockerContainerStart(name string) error DockerContainerStart(name string) error
DockerContainerStats(name string) (string, error) DockerContainerStats(name string) (string, error)
@ -376,9 +376,9 @@ func (ds *dockerService) DockerContainerCopyCreate(info *types.ContainerJSON) (c
//param mapPort 容器主端口映射到外部的端口 //param mapPort 容器主端口映射到外部的端口
//param tcp 容器其他tcp端口 //param tcp 容器其他tcp端口
//param udp 容器其他udp端口 //param udp 容器其他udp端口
func (ds *dockerService) DockerContainerCreate(imageName string, m model.CustomizationPostData, net string) (containerId string, err error) { func (ds *dockerService) DockerContainerCreate(imageName string, m model.CustomizationPostData) (containerId string, err error) {
if len(net) == 0 { if len(m.NetworkModel) == 0 {
net = "bridge" m.NetworkModel = "bridge"
} }
cli, err := client2.NewClientWithOpts(client2.FromEnv) cli, err := client2.NewClientWithOpts(client2.FromEnv)
@ -402,7 +402,7 @@ func (ds *dockerService) DockerContainerCreate(imageName string, m model.Customi
tContainer, _ := strconv.Atoi(portMap.ContainerPort) tContainer, _ := strconv.Atoi(portMap.ContainerPort)
if tContainer > 0 { if tContainer > 0 {
ports[nat.Port(portMap.ContainerPort+"/tcp")] = struct{}{} ports[nat.Port(portMap.ContainerPort+"/tcp")] = struct{}{}
if net != "host" { if m.NetworkModel != "host" {
portMaps[nat.Port(portMap.ContainerPort+"/tcp")] = []nat.PortBinding{{HostPort: portMap.CommendPort}} portMaps[nat.Port(portMap.ContainerPort+"/tcp")] = []nat.PortBinding{{HostPort: portMap.CommendPort}}
} }
} }
@ -411,7 +411,7 @@ func (ds *dockerService) DockerContainerCreate(imageName string, m model.Customi
tContainer, _ := strconv.Atoi(portMap.ContainerPort) tContainer, _ := strconv.Atoi(portMap.ContainerPort)
if tContainer > 0 { if tContainer > 0 {
ports[nat.Port(portMap.ContainerPort+"/tcp")] = struct{}{} ports[nat.Port(portMap.ContainerPort+"/tcp")] = struct{}{}
if net != "host" { if m.NetworkModel != "host" {
portMaps[nat.Port(portMap.ContainerPort+"/tcp")] = []nat.PortBinding{{HostPort: portMap.CommendPort}} portMaps[nat.Port(portMap.ContainerPort+"/tcp")] = []nat.PortBinding{{HostPort: portMap.CommendPort}}
} }
} }
@ -419,7 +419,7 @@ func (ds *dockerService) DockerContainerCreate(imageName string, m model.Customi
uContainer, _ := strconv.Atoi(portMap.ContainerPort) uContainer, _ := strconv.Atoi(portMap.ContainerPort)
if uContainer > 0 { if uContainer > 0 {
ports[nat.Port(portMap.ContainerPort+"/udp")] = struct{}{} ports[nat.Port(portMap.ContainerPort+"/udp")] = struct{}{}
if net != "host" { if m.NetworkModel != "host" {
portMaps[nat.Port(portMap.ContainerPort+"/udp")] = []nat.PortBinding{{HostPort: portMap.CommendPort}} portMaps[nat.Port(portMap.ContainerPort+"/udp")] = []nat.PortBinding{{HostPort: portMap.CommendPort}}
} }
} }
@ -428,7 +428,7 @@ func (ds *dockerService) DockerContainerCreate(imageName string, m model.Customi
uContainer, _ := strconv.Atoi(portMap.ContainerPort) uContainer, _ := strconv.Atoi(portMap.ContainerPort)
if uContainer > 0 { if uContainer > 0 {
ports[nat.Port(portMap.ContainerPort+"/udp")] = struct{}{} ports[nat.Port(portMap.ContainerPort+"/udp")] = struct{}{}
if net != "host" { if m.NetworkModel != "host" {
portMaps[nat.Port(portMap.ContainerPort+"/udp")] = []nat.PortBinding{{HostPort: portMap.CommendPort}} portMaps[nat.Port(portMap.ContainerPort+"/udp")] = []nat.PortBinding{{HostPort: portMap.CommendPort}}
} }
} }
@ -541,7 +541,7 @@ func (ds *dockerService) DockerContainerCreate(imageName string, m model.Customi
config.Labels["protocol"] = m.Protocol config.Labels["protocol"] = m.Protocol
config.Labels["host"] = m.Host config.Labels["host"] = m.Host
//config.Labels["order"] = strconv.Itoa(MyService.App().GetCasaOSCount() + 1) //config.Labels["order"] = strconv.Itoa(MyService.App().GetCasaOSCount() + 1)
hostConfig := &container.HostConfig{Resources: res, Mounts: volumes, RestartPolicy: rp, NetworkMode: container.NetworkMode(net), Privileged: m.Privileged, CapAdd: m.CapAdd} hostConfig := &container.HostConfig{Resources: res, Mounts: volumes, RestartPolicy: rp, NetworkMode: container.NetworkMode(m.NetworkModel), Privileged: m.Privileged, CapAdd: m.CapAdd}
//if net != "host" { //if net != "host" {
config.ExposedPorts = ports config.ExposedPorts = ports
hostConfig.PortBindings = portMaps hostConfig.PortBindings = portMaps
@ -550,7 +550,7 @@ func (ds *dockerService) DockerContainerCreate(imageName string, m model.Customi
containerDb, err := cli.ContainerCreate(context.Background(), containerDb, err := cli.ContainerCreate(context.Background(),
config, config,
hostConfig, hostConfig,
&network.NetworkingConfig{EndpointsConfig: map[string]*network.EndpointSettings{net: {NetworkID: "", Aliases: []string{}}}}, &network.NetworkingConfig{EndpointsConfig: map[string]*network.EndpointSettings{m.NetworkModel: {NetworkID: "", Aliases: []string{}}}},
nil, nil,
m.Label) m.Label)
if err != nil { if err != nil {

5
service/file.go
View File

@ -2,7 +2,7 @@
* @Author: LinkLeong link@icewhale.com * @Author: LinkLeong link@icewhale.com
* @Date: 2021-12-20 14:15:46 * @Date: 2021-12-20 14:15:46
* @LastEditors: LinkLeong * @LastEditors: LinkLeong
* @LastEditTime: 2022-06-09 18:15:54 * @LastEditTime: 2022-06-16 16:47:46
* @FilePath: /CasaOS/service/file.go * @FilePath: /CasaOS/service/file.go
* @Description: * @Description:
* @Website: https://www.casaos.io * @Website: https://www.casaos.io
@ -93,13 +93,12 @@ func FileOperate(k string) {
v := temp.Item[i] v := temp.Item[i]
if temp.Type == "move" { if temp.Type == "move" {
lastPath := v.From[strings.LastIndex(v.From, "/")+1:] lastPath := v.From[strings.LastIndex(v.From, "/")+1:]
if !file.CheckNotExist(temp.To + "/" + lastPath) { if !file.CheckNotExist(temp.To + "/" + lastPath) {
if temp.Style == "skip" { if temp.Style == "skip" {
temp.Item[i].Finished = true temp.Item[i].Finished = true
continue continue
} else { } else {
os.Remove(temp.To + "/" + lastPath) os.RemoveAll(temp.To + "/" + lastPath)
} }
} }

2
web/index.html
View File

@ -20,7 +20,7 @@
<title> <title>
CasaOS CasaOS
</title> </title>
<link href="/ui/css/10.d72d6157.css" rel="prefetch"><link href="/ui/css/11.f8326b27.css" rel="prefetch"><link href="/ui/css/16.a16d5119.css" rel="prefetch"><link href="/ui/css/17.cf8c898a.css" rel="prefetch"><link href="/ui/css/8.11ecc7a4.css" rel="prefetch"><link href="/ui/css/9.e57f27f9.css" rel="prefetch"><link href="/ui/js/0.js" rel="prefetch"><link href="/ui/js/1.js" rel="prefetch"><link href="/ui/js/10.js" rel="prefetch"><link href="/ui/js/11.js" rel="prefetch"><link href="/ui/js/12.js" rel="prefetch"><link href="/ui/js/13.js" rel="prefetch"><link href="/ui/js/14.js" rel="prefetch"><link href="/ui/js/15.js" rel="prefetch"><link href="/ui/js/16.js" rel="prefetch"><link href="/ui/js/17.js" rel="prefetch"><link href="/ui/js/18.js" rel="prefetch"><link href="/ui/js/2.js" rel="prefetch"><link href="/ui/js/3.js" rel="prefetch"><link href="/ui/js/4.js" rel="prefetch"><link href="/ui/js/5.js" rel="prefetch"><link href="/ui/js/6.js" rel="prefetch"><link href="/ui/js/7.js" rel="prefetch"><link href="/ui/js/8.js" rel="prefetch"><link href="/ui/js/9.js" rel="prefetch"><link href="/ui/css/app.4293eecd.css" rel="preload" as="style"><link href="/ui/css/vendors~app.8a2c28d7.css" rel="preload" as="style"><link href="/ui/js/app.js" rel="preload" as="script"><link href="/ui/js/vendors~app.js" rel="preload" as="script"><link href="/ui/css/vendors~app.8a2c28d7.css" rel="stylesheet"><link href="/ui/css/app.4293eecd.css" rel="stylesheet"></head> <link href="/ui/css/10.d72d6157.css" rel="prefetch"><link href="/ui/css/11.f8326b27.css" rel="prefetch"><link href="/ui/css/16.a16d5119.css" rel="prefetch"><link href="/ui/css/17.cf8c898a.css" rel="prefetch"><link href="/ui/css/8.8acf69a4.css" rel="prefetch"><link href="/ui/css/9.e57f27f9.css" rel="prefetch"><link href="/ui/js/0.js" rel="prefetch"><link href="/ui/js/1.js" rel="prefetch"><link href="/ui/js/10.js" rel="prefetch"><link href="/ui/js/11.js" rel="prefetch"><link href="/ui/js/12.js" rel="prefetch"><link href="/ui/js/13.js" rel="prefetch"><link href="/ui/js/14.js" rel="prefetch"><link href="/ui/js/15.js" rel="prefetch"><link href="/ui/js/16.js" rel="prefetch"><link href="/ui/js/17.js" rel="prefetch"><link href="/ui/js/18.js" rel="prefetch"><link href="/ui/js/2.js" rel="prefetch"><link href="/ui/js/3.js" rel="prefetch"><link href="/ui/js/4.js" rel="prefetch"><link href="/ui/js/5.js" rel="prefetch"><link href="/ui/js/6.js" rel="prefetch"><link href="/ui/js/7.js" rel="prefetch"><link href="/ui/js/8.js" rel="prefetch"><link href="/ui/js/9.js" rel="prefetch"><link href="/ui/css/app.fccf59b0.css" rel="preload" as="style"><link href="/ui/css/vendors~app.8a2c28d7.css" rel="preload" as="style"><link href="/ui/js/app.js" rel="preload" as="script"><link href="/ui/js/vendors~app.js" rel="preload" as="script"><link href="/ui/css/vendors~app.8a2c28d7.css" rel="stylesheet"><link href="/ui/css/app.fccf59b0.css" rel="stylesheet"></head>
<body> <body>
<noscript> <noscript>

2
web/js/4.js
View File

File diff suppressed because one or more lines are too long

28
web/js/8.js
View File

File diff suppressed because one or more lines are too long

18
web/js/app.js
View File

File diff suppressed because one or more lines are too long