Refactor dockerCli *Format to ConfigFile call

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7c8780ea6327b1d403b13c8b144d9557b5e655e5
Component: engine
This commit is contained in:
Vincent Demeester
2016-08-04 15:00:00 +02:00
parent b837103bde
commit 652ecddc04
5 changed files with 8 additions and 32 deletions

View File

@ -118,30 +118,6 @@ func (cli *DockerCli) CheckTtyInput(attachStdin, ttyMode bool) error {
return nil
}
// PsFormat returns the format string specified in the configuration.
// String contains columns and format specification, for example {{ID}}\t{{Name}}.
func (cli *DockerCli) PsFormat() string {
return cli.configFile.PsFormat
}
// ImagesFormat returns the format string specified in the configuration.
// String contains columns and format specification, for example {{ID}}\t{{Name}}.
func (cli *DockerCli) ImagesFormat() string {
return cli.configFile.ImagesFormat
}
// NetworksFormat returns the format string specified in the configuration.
// String contains columns and format specification, for example {{ID}}\t{{Name}}
func (cli *DockerCli) NetworksFormat() string {
return cli.configFile.NetworksFormat
}
// VolumesFormat returns the format string specified in the configuration.
// String contains columns and format specification, for example {{ID}}\t{{Name}}
func (cli *DockerCli) VolumesFormat() string {
return cli.configFile.VolumesFormat
}
func (cli *DockerCli) setRawTerminal() error {
if os.Getenv("NORAW") == "" {
if cli.isTerminalIn {