opensource/1Panel
3
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-10-24 23:12:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: docker 配置增加 iptables (#535)

Browse Source
This commit is contained in:
ssongliu
2023-04-07 09:44:15 +00:00
committed by GitHub
parent 74b6af64e9
commit dbe70ecc28
8 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/dto/docker.go
+1
View File
@@ -10,6 +10,7 @@ type DaemonJsonConf struct {
Mirrors []string `json:"registryMirrors"`
Registries []string `json:"insecureRegistries"`
LiveRestore bool `json:"liveRestore"`
IPTables bool `json:"iptables"`
CgroupDriver string `json:"cgroupDriver"`
}
backend/app/service/docker.go
+21 -5
View File
@@ -34,6 +34,7 @@ type daemonJsonItem struct {
Mirrors []string `json:"registry-mirrors"`
Registries []string `json:"insecure-registries"`
LiveRestore bool `json:"live-restore"`
IPTables bool `json:"iptables"`
ExecOpts []string `json:"exec-opts"`
}
@@ -63,23 +64,26 @@ func (u *DockerService) LoadDockerConf() *dto.DaemonJsonConf {
}
}
if _, err := os.Stat(constant.DaemonJsonPath); err != nil {
return &dto.DaemonJsonConf{Status: status, Version: version}
return &dto.DaemonJsonConf{Status: status, IPTables: true, Version: version}
}
file, err := os.ReadFile(constant.DaemonJsonPath)
if err != nil {
return &dto.DaemonJsonConf{Status: status, Version: version}
return &dto.DaemonJsonConf{Status: status, IPTables: true, Version: version}
}
var conf daemonJsonItem
deamonMap := make(map[string]interface{})
if err := json.Unmarshal(file, &deamonMap); err != nil {
return &dto.DaemonJsonConf{Status: status, Version: version}
return &dto.DaemonJsonConf{Status: status, IPTables: true, Version: version}
}
arr, err := json.Marshal(deamonMap)
if err != nil {
return &dto.DaemonJsonConf{Status: status, Version: version}
return &dto.DaemonJsonConf{Status: status, IPTables: true, Version: version}
}
if err := json.Unmarshal(arr, &conf); err != nil {
return &dto.DaemonJsonConf{Status: status, Version: version}
return &dto.DaemonJsonConf{Status: status, IPTables: true, Version: version}
}
if _, ok := deamonMap["iptables"]; !ok {
conf.IPTables = true
}
driver := "cgroupfs"
for _, opt := range conf.ExecOpts {
@@ -93,6 +97,7 @@ func (u *DockerService) LoadDockerConf() *dto.DaemonJsonConf {
Version: version,
Mirrors: conf.Mirrors,
Registries: conf.Registries,
IPTables: conf.IPTables,
LiveRestore: conf.LiveRestore,
CgroupDriver: driver,
}
@@ -130,6 +135,11 @@ func (u *DockerService) UpdateConf(req dto.DaemonJsonConf) error {
} else {
deamonMap["live-restore"] = req.LiveRestore
}
if req.IPTables {
delete(deamonMap, "iptables")
} else {
deamonMap["live-restore"] = false
}
if opts, ok := deamonMap["exec-opts"]; ok {
if optsValue, isArray := opts.([]interface{}); isArray {
for i := 0; i < len(optsValue); i++ {
@@ -162,6 +172,12 @@ func (u *DockerService) UpdateConf(req dto.DaemonJsonConf) error {
}
func (u *DockerService) UpdateConfByFile(req dto.DaemonJsonUpdateByFile) error {
if _, err := os.Stat(constant.DaemonJsonPath); err != nil && os.IsNotExist(err) {
if err = os.MkdirAll(path.Dir(constant.DaemonJsonPath), os.ModePerm); err != nil {
return err
}
_, _ = os.Create(constant.DaemonJsonPath)
}
file, err := os.OpenFile(constant.DaemonJsonPath, os.O_WRONLY|os.O_TRUNC, 0640)
if err != nil {
return err