From 5fe26f3ab572685d2fbe74070282f6a209ec62df Mon Sep 17 00:00:00 2001 From: Josh Curl Date: Wed, 9 Nov 2016 11:36:51 -0800 Subject: [PATCH] Add --insecure-registry flag to daemon arguments --- config/types.go | 35 ++++++++++++++------------- docs/os/configuration/docker/index.md | 3 ++- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/config/types.go b/config/types.go index 2039daed..da62f0bf 100644 --- a/config/types.go +++ b/config/types.go @@ -134,23 +134,24 @@ type UpgradeConfig struct { } type EngineOpts struct { - Bridge string `yaml:"bridge,omitempty" opt:"bridge"` - ConfigFile string `yaml:"config_file,omitempty" opt:"config-file"` - Containerd string `yaml:"containerd,omitempty" opt:"containerd"` - Debug *bool `yaml:"debug,omitempty" opt:"debug"` - ExecRoot string `yaml:"exec_root,omitempty" opt:"exec-root"` - Group string `yaml:"group,omitempty" opt:"group"` - Graph string `yaml:"graph,omitempty" opt:"graph"` - Host []string `yaml:"host,omitempty" opt:"host"` - LiveRestore *bool `yaml:"live_restore,omitempty" opt:"live-restore"` - LogDriver string `yaml:"log_driver,omitempty" opt:"log-driver"` - LogOpts map[string]string `yaml:"log_opts,omitempty" opt:"log-opt"` - PidFile string `yaml:"pid_file,omitempty" opt:"pidfile"` - RegistryMirror string `yaml:"registry_mirror,omitempty" opt:"registry-mirror"` - Restart *bool `yaml:"restart,omitempty" opt:"restart"` - SelinuxEnabled *bool `yaml:"selinux_enabled,omitempty" opt:"selinux-enabled"` - StorageDriver string `yaml:"storage_driver,omitempty" opt:"storage-driver"` - UserlandProxy *bool `yaml:"userland_proxy,omitempty" opt:"userland-proxy"` + Bridge string `yaml:"bridge,omitempty" opt:"bridge"` + ConfigFile string `yaml:"config_file,omitempty" opt:"config-file"` + Containerd string `yaml:"containerd,omitempty" opt:"containerd"` + Debug *bool `yaml:"debug,omitempty" opt:"debug"` + ExecRoot string `yaml:"exec_root,omitempty" opt:"exec-root"` + Group string `yaml:"group,omitempty" opt:"group"` + Graph string `yaml:"graph,omitempty" opt:"graph"` + Host []string `yaml:"host,omitempty" opt:"host"` + InsecureRegistry []string `yaml:"insecure_registry" opt:"insecure-registry"` + LiveRestore *bool `yaml:"live_restore,omitempty" opt:"live-restore"` + LogDriver string `yaml:"log_driver,omitempty" opt:"log-driver"` + LogOpts map[string]string `yaml:"log_opts,omitempty" opt:"log-opt"` + PidFile string `yaml:"pid_file,omitempty" opt:"pidfile"` + RegistryMirror string `yaml:"registry_mirror,omitempty" opt:"registry-mirror"` + Restart *bool `yaml:"restart,omitempty" opt:"restart"` + SelinuxEnabled *bool `yaml:"selinux_enabled,omitempty" opt:"selinux-enabled"` + StorageDriver string `yaml:"storage_driver,omitempty" opt:"storage-driver"` + UserlandProxy *bool `yaml:"userland_proxy,omitempty" opt:"userland-proxy"` } type DockerConfig struct { diff --git a/docs/os/configuration/docker/index.md b/docs/os/configuration/docker/index.md index dd03b583..b4cd348a 100644 --- a/docs/os/configuration/docker/index.md +++ b/docs/os/configuration/docker/index.md @@ -40,7 +40,8 @@ Key | Value `exec_root` | String `group` | String `graph` | String -`host` | String +`host` | List +`insecure_registry` | List `live_restore` | Boolean `log_driver` | String `log_opts` | Map where keys and values are strings