MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused config values

Browse Source
This commit is contained in:
Dane Everitt 2020-10-17 14:09:02 -07:00
parent c031d37b91
commit 9b54be06bb
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/config_docker.go
View File

@ -49,14 +49,6 @@ type DockerConfiguration struct {
// Domainname is the Docker domainname for all containers. // Domainname is the Docker domainname for all containers.
Domainname string `default:"" json:"domainname" yaml:"domainname"` Domainname string `default:"" json:"domainname" yaml:"domainname"`
// If true, container images will be updated when a server starts if there
// is an update available. If false the daemon will not attempt updates and will
// defer to the host system to manage image updates.
UpdateImages bool `default:"true" json:"update_images" yaml:"update_images"`
// The location of the Docker socket.
Socket string `default:"/var/run/docker.sock" json:"socket" yaml:"socket"`
// Registries . // Registries .
Registries map[string]RegistryConfiguration `json:"registries" yaml:"registries"` Registries map[string]RegistryConfiguration `json:"registries" yaml:"registries"`

5
environment/docker.go
View File

@ -3,6 +3,7 @@ package environment
import ( import (
"context" "context"
"github.com/apex/log" "github.com/apex/log"
"strconv"
"sync" "sync"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
@ -24,7 +25,7 @@ func DockerClient() (*client.Client, error) {
return _client, nil return _client, nil
} }
_client, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation()); _client, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
return _client, err return _client, err
} }
@ -83,7 +84,7 @@ func createDockerNetwork(cli *client.Client, c *config.DockerConfiguration) erro
Options: map[string]string{ Options: map[string]string{
"encryption": "false", "encryption": "false",
"com.docker.network.bridge.default_bridge": "false", "com.docker.network.bridge.default_bridge": "false",
"com.docker.network.bridge.enable_icc": "true", "com.docker.network.bridge.enable_icc": strconv.FormatBool(c.Network.EnableICC),
"com.docker.network.bridge.enable_ip_masquerade": "true", "com.docker.network.bridge.enable_ip_masquerade": "true",
"com.docker.network.bridge.host_binding_ipv4": "0.0.0.0", "com.docker.network.bridge.host_binding_ipv4": "0.0.0.0",
"com.docker.network.bridge.name": "pterodactyl0", "com.docker.network.bridge.name": "pterodactyl0",