Commit Graph

80 Commits

Author SHA1 Message Date
Dan Walsh 1419abf7b2 Add support for setting sysctls
This patch will allow users to specify namespace specific "kernel parameters"
for running inside of a container.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2017-05-15 11:57:18 +02:00
John Howard 1688110fd6 Windows: Remove TP4 support from main code
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-05-15 11:57:18 +02:00
allencloud a5f0686bf0 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-05-15 11:57:18 +02:00
John Starks 6ad28f55d5 Windows: Default to npipe transport
This changes the default transport for Windows from unencrypted TCP to
npipe. This is similar to how Linux runs with the unix socket transport by
default.

Signed-off-by: John Starks <jostarks@microsoft.com>
2017-05-15 11:57:18 +02:00
David Calavera 2b140819b3 Upgrade Go to 1.6.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2017-05-15 11:57:18 +02:00
John Starks 5d648746e8 Windows: Add support for named pipe protocol
This adds an npipe protocol option for Windows hosts, akin to unix
sockets for Linux hosts. This should become the default transport
for Windows, but this change does not yet do that.

It also does not add support for the client side yet since that
code is in engine-api, which will have to be revendored separately.

Signed-off-by: John Starks <jostarks@microsoft.com>
2017-05-15 11:57:17 +02:00
David Calavera d611dc46c0 Allow to set daemon and server configurations in a file.
Read configuration after flags making this the priority:

1- Apply configuration from file.
2- Apply configuration from flags.

Reload configuration when a signal is received, USR2 in Linux:

- Reload router if the debug configuration changes.
- Reload daemon labels.
- Reload cluster discovery.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2017-05-15 11:57:17 +02:00
Daniel Nephin e73db35cbf Move some validators from opts to runconfig/opts.
These validators are only used by runconfig.Parse() or some other part of the
client, so move them into the client-side package.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-15 11:57:17 +02:00
Daniel Nephin cef8b71ff4 Move ulimit options to runconfig opts
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-15 11:57:17 +02:00
Daniel Nephin 5d99388c23 Move runconfig blkiodev options and parsing into runconfig/opts package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-15 11:57:17 +02:00
David Calavera 757d284759 Move blkiodev package to types.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2017-05-15 11:57:17 +02:00
Ma Shimiao 369f057818 Add support for blkio read/write iops device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2017-05-15 11:57:17 +02:00
Daniel Nephin 659fac261b Move ParseLink and validators into runconfig.parse where they are used.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-15 11:57:16 +02:00
David Calavera bfba6ec070 Replace pkg/units with docker/go-units.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2017-05-15 11:57:16 +02:00
Daniel Nephin 7dc7bff9a0 Move ParseDockerDaemonHost to opts/ package.
This function was only being used from a single place opts/opts.go. This
change moves it from a incohesive package (parsers) to the single place it
is used.

Also made a bunch of the helper methods private because they are not used
by any external modules.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-15 11:57:16 +02:00
Justas Brazauskas f599afe64e Fix typos found across repository
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
2017-05-15 11:57:16 +02:00
Ma Shimiao 02a6d3c5e6 Add support for blkio read/write bps device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2017-05-15 11:57:16 +02:00
David Calavera 9837646cd1 Move Container to its own package.
So other packages don't need to import the daemon package when they
want to use this struct.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-05-15 11:57:16 +02:00
Ma Shimiao 35c223629b opts/weightdevice: fix typo
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2017-05-15 11:57:16 +02:00
Ma Shimiao 8a67a18fd8 Add support for blkio.weight_device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2017-05-15 11:57:16 +02:00
David Calavera 8c734c8cde Use an empty slice as default value for DNS, DNSSearch and DNSOptions
So we don't print those <no value> in the client and we don't fail
executing inspect templates with API field names.

Make sure those fields are initialized as empty slices when
a container is loaded from disk and their values are nil.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2017-05-15 11:57:16 +02:00
John Howard d02ac2a694 Windows [TP4] localhost mitigation
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-05-15 11:57:16 +02:00
Shijiang Wei 36030a9a8b Add ability to add multiple tags with docker build
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2017-05-15 11:57:15 +02:00
John Howard af6e545164 Windows: Add volume support
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-05-15 11:57:15 +02:00
Lei Jitang 74d0203af0 Make default tls host work
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2017-05-15 11:57:15 +02:00
Doug Davis 1398bd9861 Remove used param on ParseHost
The first param on opts.ParseHost() wasn't being used for anything.

Once we get rid of that param we can then also clean-up some code
that calls ParseHost() because the param that was passed in wasn't
being used for anything else.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2017-05-15 11:57:15 +02:00
Sven Dowideit 6ad0875074 Default the tcp port to 2376 if tls is on, and 2375 if not
Refactor so that the Host flag validation doesn't destroy the user's input,
and then post process the flags when we know the TLS options

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-05-15 11:57:15 +02:00
Vincent Demeester aca36e11f2 Revert environment regexp from 13694
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-05-15 11:57:15 +02:00
Ma Shimiao 863be38db7 opts/opts.go: fix typo
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2017-05-15 11:57:15 +02:00
Sven Dowideit 2d2863ebd5 Change ParseTCPAddr to use tcp://127.0.0.0:2375 format as default consistently
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-05-15 11:57:15 +02:00
Vincent Demeester 59ffb24c8f Finish linting opts and trust package.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-05-15 11:57:15 +02:00
Sevki Hasirci 1c5cd03b1b golint: trust
contributes to #14756

Signed-off-by: Sevki Hasirci <s@sevki.org>
2017-05-15 11:57:15 +02:00
Sevki Hasirci 409920de5c Opts lint issues, ip and ulimit
Signed-off-by: Sevki Hasirci <s@sevki.org>
2017-05-15 11:57:15 +02:00
Brian Goff f2934dbacf Add volume API/CLI
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-05-15 11:57:14 +02:00
Qiang Huang 22e1ac4966 Add mode check for device
This fixes two problems:
1. docker run --device /dev/sda:rw ubuntu bash doesn't work
2. --device /dev/zero:/dev/noro:ro doesn't show clear error message,
but fail when writing to cgroup file.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2017-05-15 11:57:14 +02:00
Qiang Huang 6a31056ff6 Change return value for ValidateMountMode
1. rename it from ValidateMountMode to ValidMountMode
Because it's a function simply check mount mode is valid or not.
2. remove the rw check return value
It's not supposed to be combined into this function, and we already
have a function for that check.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2017-05-15 11:57:14 +02:00
Matt Robenolt 869e08a12b opts/envfile: trim all leading whitespace in a line
Signed-off-by: Matt Robenolt <matt@ydekproductions.com>
2017-05-15 11:57:14 +02:00
Qiang Huang 091f800069 Change all docker -d to docker daemon
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2017-05-15 11:57:14 +02:00
Antonio Murdaca 351ac873e0 Remove unused functions
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2017-05-15 11:57:14 +02:00
Shishir Mahajan f3841a1d27 Add and modify tests for legacy and new daemon invokations
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-05-15 11:57:14 +02:00
Tibor Vass f55d8241cf cli: new daemon command and new cli package
This patch creates a new cli package that allows to combine both client
and daemon commands (there is only one daemon command: docker daemon).

The `-d` and `--daemon` top-level flags are deprecated and a special
message is added to prompt the user to use `docker daemon`.

Providing top-level daemon-specific flags for client commands result
in an error message prompting the user to use `docker daemon`.

This patch does not break any old but correct usages.

This also makes `-d` and `--daemon` flags, as well as the `daemon`
command illegal in client-only binaries.

Signed-off-by: Tibor Vass <tibor@docker.com>
2017-05-15 11:57:14 +02:00
Vincent Demeester 7b9ceadc4d Add test coverage to opts and refactor
- Refactor opts.ValidatePath and add an opts.ValidateDevice
  ValidePath will now accept : containerPath:mode, hostPath:containerPath:mode
  and hostPath:containerPath.
  ValidateDevice will have the same behavior as current.

- Refactor opts.ValidateEnv, opts.ParseEnvFile
  Environment variables will now be validated with the following
  definition :
  > Environment variables set by the user must have a name consisting
  > solely of alphabetics, numerics, and underscores - the first of
  > which must not be numeric.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-05-15 11:57:14 +02:00
Matthieu Hauglustaine f49f44a3a3 Add unit tests for ParseEnvFile.
Add unit tests of the ParseEnvFile function. Test for:
* good file
* empty file
* non existent file
* badly formatted file

Signed-off-by: Matthieu Hauglustaine <matt.hauglustaine@gmail.com>
2017-05-15 11:57:14 +02:00
Matthieu Hauglustaine 0ede41afbd Return bufio error if set in ParseEnvFile
Return an error value if bufio failed to properly read a token.
Avoids running a container with partial environment.

Fixes: #14266

Signed-off-by: Matthieu Hauglustaine <matt.hauglustaine@gmail.com>
2017-05-15 11:57:14 +02:00
Eric-Olivier Lamey 0c721e1ad5 Display empty string instead of <nil> when IP opt is nil.
Fixes #13878.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
2017-05-15 11:57:13 +02:00
Doug Davis d1be0bd11e Minor doc edit to add clarity around the --volume path format
Also add a comment to the ValidatePath func so devs/reviewers
know exactly what its looking for.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2017-05-15 11:57:13 +02:00
Doug Davis 292e38a144 Remove duplicate call to net.ParseIP
and a little cleanup

Signed-off-by: Doug Davis <dug@us.ibm.com>
2017-05-15 11:57:13 +02:00
Antonio Murdaca 51c5706326 Add syslog-address log-opt
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2017-05-15 11:57:13 +02:00
Antonio Murdaca e8e6124050 Allow links to be specified with only the name if this matches the alias
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2017-05-15 11:57:13 +02:00
wlan0 d0c32b1efa Add log opts flag to pass in logging options
Signed-off-by: wlan0 <sidharthamn@gmail.com>
2017-05-15 11:57:13 +02:00