Skip to content

config: support some flags in daemon config file #1088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2018
Merged

config: support some flags in daemon config file #1088

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions daemon/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ type Config struct {
ContainerdAddr string `json:"containerd,omitempty"`

// DefaultRegistry is daemon's default registry which is to pull/push/search images.
DefaultRegistry string
DefaultRegistry string `json:"default-registry,omitempty"`

// DefaultRegistryNS is daemon's default registry namespace used in pull/push/search images.
DefaultRegistryNS string
DefaultRegistryNS string `json:"default-registry-namespace,omitempty"`

// Home directory.
HomeDir string `json:"home-dir,omitempty"`
Expand All @@ -63,13 +63,13 @@ type Config struct {
LxcfsBinPath string `json:"lxcfs,omitempty"`

// LxcfsHome is the absolute path of lxcfs
LxcfsHome string
LxcfsHome string `json:"lxcfs-home,omitempty"`

// ImagxeProxy is a http proxy to pull image
ImageProxy string `json:"image-proxy,omitempty"`

// QuotaDriver is used to set the driver of Quota
QuotaDriver string
QuotaDriver string `json:"quota-driver,omitempty"`

// Configuration file of pouchd
ConfigFile string `json:"config-file,omitempty"`
Expand Down