rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-25 20:52:58 +00:00
Code Issues Releases Wiki Activity

Add --insecure-registry flag to daemon arguments

Browse Source
This commit is contained in:
Josh Curl
2016-11-09 11:36:51 -08:00
parent ee16cd4311
commit 5fe26f3ab5
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
config/types.go
View File

@@ -134,23 +134,24 @@ type UpgradeConfig struct {
} }
type EngineOpts struct { type EngineOpts struct {
Bridge string `yaml:"bridge,omitempty" opt:"bridge"` Bridge string `yaml:"bridge,omitempty" opt:"bridge"`
ConfigFile string `yaml:"config_file,omitempty" opt:"config-file"` ConfigFile string `yaml:"config_file,omitempty" opt:"config-file"`
Containerd string `yaml:"containerd,omitempty" opt:"containerd"` Containerd string `yaml:"containerd,omitempty" opt:"containerd"`
Debug *bool `yaml:"debug,omitempty" opt:"debug"` Debug *bool `yaml:"debug,omitempty" opt:"debug"`
ExecRoot string `yaml:"exec_root,omitempty" opt:"exec-root"` ExecRoot string `yaml:"exec_root,omitempty" opt:"exec-root"`
Group string `yaml:"group,omitempty" opt:"group"` Group string `yaml:"group,omitempty" opt:"group"`
Graph string `yaml:"graph,omitempty" opt:"graph"` Graph string `yaml:"graph,omitempty" opt:"graph"`
Host []string `yaml:"host,omitempty" opt:"host"` Host []string `yaml:"host,omitempty" opt:"host"`
LiveRestore *bool `yaml:"live_restore,omitempty" opt:"live-restore"` InsecureRegistry []string `yaml:"insecure_registry" opt:"insecure-registry"`
LogDriver string `yaml:"log_driver,omitempty" opt:"log-driver"` LiveRestore *bool `yaml:"live_restore,omitempty" opt:"live-restore"`
LogOpts map[string]string `yaml:"log_opts,omitempty" opt:"log-opt"` LogDriver string `yaml:"log_driver,omitempty" opt:"log-driver"`
PidFile string `yaml:"pid_file,omitempty" opt:"pidfile"` LogOpts map[string]string `yaml:"log_opts,omitempty" opt:"log-opt"`
RegistryMirror string `yaml:"registry_mirror,omitempty" opt:"registry-mirror"` PidFile string `yaml:"pid_file,omitempty" opt:"pidfile"`
Restart *bool `yaml:"restart,omitempty" opt:"restart"` RegistryMirror string `yaml:"registry_mirror,omitempty" opt:"registry-mirror"`
SelinuxEnabled *bool `yaml:"selinux_enabled,omitempty" opt:"selinux-enabled"` Restart *bool `yaml:"restart,omitempty" opt:"restart"`
StorageDriver string `yaml:"storage_driver,omitempty" opt:"storage-driver"` SelinuxEnabled *bool `yaml:"selinux_enabled,omitempty" opt:"selinux-enabled"`
UserlandProxy *bool `yaml:"userland_proxy,omitempty" opt:"userland-proxy"` StorageDriver string `yaml:"storage_driver,omitempty" opt:"storage-driver"`
UserlandProxy *bool `yaml:"userland_proxy,omitempty" opt:"userland-proxy"`
} }
type DockerConfig struct { type DockerConfig struct {

3
docs/os/configuration/docker/index.md
View File

@@ -40,7 +40,8 @@ Key | Value
`exec_root` | String `exec_root` | String
`group` | String `group` | String
`graph` | String `graph` | String
`host` | String `host` | List
`insecure_registry` | List
`live_restore` | Boolean `live_restore` | Boolean
`log_driver` | String `log_driver` | String
`log_opts` | Map where keys and values are strings `log_opts` | Map where keys and values are strings