Commit Graph

951 Commits

Author SHA1 Message Date
311dc4f8a6 Add progress bar to docker load
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: fae09e25698006a190d14fe64f1576f68431fabf
Component: engine
2016-02-05 02:24:23 -05:00
32fac24f32 Apply context changes to the client.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: fe53be4e1785ab4d8cadf246e5f2de419f337adc
Component: engine
2016-02-04 13:59:57 -05:00
6e2fab11f7 Remove unnecessary call to /info
Avoid using the `/info` endpoint in the `login` and `logout` workflows
when the Registry endpoint is overriden by the user through the command
line.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 243d0d6bbe0376fb43a2718710f31bb068d22168
Component: engine
2016-02-03 13:10:25 -08:00
556e3002c9 Merge pull request #19975 from aaronlehmann/resolve-auth-config
Introduce a client-side version of resolveAuthConfig
Upstream-commit: 7e236e623b234616ca8536a0d2e3f96103aa061b
Component: engine
2016-02-03 15:57:29 -05:00
9ca2cca984 Introduce a client-side version of resolveAuthConfig
This is similar to the version in the registry package, but uses the
daemon's default index (as opposed to the default for the client's
platform) if using the "official index".

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: ff17cd0bf07fb8fbd811b3a1bf472d701405b1d1
Component: engine
2016-02-03 11:01:29 -08:00
b8fbe028ea Enable cross-platforms logout from Registry
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 8ee7ad2209502f43496ff65e32fbcd7573b13c26
Component: engine
2016-02-03 10:32:22 -08:00
68f96de053 Remove redundant error message
Currently some commands including `kill`, `pause`, `restart`, `rm`,
`rmi`, `stop`, `unpause`, `udpate`, `wait` will print a lot of error
message on client side, with a lot of redundant messages, this commit is
trying to remove the unuseful and redundant information for user.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 894266c1bbdfeb53bf278f3cb762945bac69e592
Component: engine
2016-02-03 15:45:20 +08:00
d2d1dc51de Merge pull request #19761 from HackToday/enhancesortattr
Sort the attributes for events
Upstream-commit: 1bc4c99372fa458c70eeb411575a1c538912521d
Component: engine
2016-02-02 16:08:23 -08:00
43913f9547 Merge pull request #19911 from Microsoft/jstarks/npipe
Windows: Add support for named pipe protocol
Upstream-commit: 83ee24e52b04fd8cf1f7366dff04baa43d89ec49
Component: engine
2016-02-02 15:59:45 -08:00
46e42d4581 Add regression tests for client debug flag.
- Add client debug info to the `docker info` command.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9f315dd328a33b51133a41067a508a8b59166a39
Component: engine
2016-02-02 16:57:36 -05:00
27daf9cbce 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>
Upstream-commit: 0906195fbbd6f379c163b80f23e4c5a60bcfc5f0
Component: engine
2016-02-01 19:46:30 -08:00
69d07840eb Merge pull request #19907 from tiborvass/tty-debug
Prevent stdin from hanging
Upstream-commit: ec6bfebc0f36c15793be7e1a581cab0aafcb31c1
Component: engine
2016-02-01 21:57:32 -05:00
32a339fec6 Merge pull request #19896 from calavera/same_rm_error_message
Make error message consistent when removing containers fail.
Upstream-commit: 3c0c115ec89031e0cbd9e739099828342efc872c
Component: engine
2016-02-01 21:19:42 -05:00
2c45eb2fa9 Skip Close()-ing stdin on Darwin. The Return.
This was accidentally removed in https://github.com/docker/docker/pull/16289
Now adding it back.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 51795c083624b106fe7f338213cbc3d3812f31af
Component: engine
2016-02-01 20:38:01 -05:00
848ab2d223 Merge pull request #19891 from icecrime/windows_login_issue
Enable cross-platforms login to Registry
Upstream-commit: 19eaa71e85f9563e1428347fa9a91c8aa71f1f6d
Component: engine
2016-02-01 19:50:54 -05:00
c20ed2f433 Merge pull request #19416 from mlaventure/warn-on-rm-detach
Print an info message when detaching a container started with --rm
Upstream-commit: 245d6e83a9e739d0d6ab363bfabf779c9b1697f2
Component: engine
2016-02-01 13:17:23 -08:00
fd8165a89d Make error message consistent when removing containers fail.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 50de9fdff11065cbc9783be07ad1b78a35b6bbac
Component: engine
2016-02-01 15:32:50 -05:00
09d7504264 Enable cross-platforms login to Registry
Use a daemon-defined Registry URL for `docker login`. This allows a
Windows client interacting with a Linux daemon to properly use the
default Registry endpoint instead of the Windows specific one.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 960710bd810e70b7c06b77b956c7bf8cdfeb15f8
Component: engine
2016-02-01 11:18:54 -08:00
64053aa6b6 Sort the attributes for events
This is add support for #19559
We tried sort it in client side, and it sort follow go
sort : sorts a slice of strings in increasing order.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 746f6af9aa2a48a8910b51ebbfafac511244fd9d
Component: engine
2016-02-01 00:18:33 +00:00
cb234f712d Merge pull request #19638 from runcom/remove-redunant-function
cleanup and move stuff where needed
Upstream-commit: d695cf8de710ca50f5c2b39727f00bfd4be8e07f
Component: engine
2016-01-30 10:12:38 -05:00
8c7b621b27 Merge pull request #19646 from nishanttotla/19277-CustomInfoField
Display SystemStatus field in docker info
Upstream-commit: 6b573801730f7655a1e2ef1edc35df8e32b713f7
Component: engine
2016-01-30 11:48:01 +01:00
9aabd7572f Adding SystemStatus field for /info endpoint
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 6c5e8dd4c2351fac8bd76d409f44f42edd4b2f4a
Component: engine
2016-01-29 16:26:43 -08:00
2544e343c9 Print an info message when detaching a container started with --rm
Closes #17516

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 1ebeb2c9b4ef22800845f2d97c277f35672f3ba9
Component: engine
2016-01-29 13:19:23 -08:00
a9daf50532 forbid login of a null-string username
With this patch, the client blocks this type login, no sending
useless messages to daemon and registry. This saves lots of time.

Signed-off-by: Liu Hua <sdu.liu@huawei.com>
Upstream-commit: 755df347fbaf6a02e6bdc2d5b7339aade2dbade0
Component: engine
2016-01-29 22:39:22 +08:00
4ce68d47a6 api: client: remove redunant function to encode auth
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 505a56d6da69825e2ef1ebcf985a0a2e143d2966
Component: engine
2016-01-29 14:07:54 +01:00
426fb03f9a Merge pull request #19793 from calavera/full_login_prompt
Always prompt for a password when asking for credentials.
Upstream-commit: 6c6729ef5b74a54e20eb2a11812bf5f80e03b174
Component: engine
2016-01-29 12:39:57 +01:00
98aeb8772a Always prompt for a password when asking for credentials.
There is a weird behavior where we don't ask for a password
when the user you type in the prompt is the same you have configured
in the config file.

This is the source of many frustrations and also a bug.
If the authentication with a registry fails because the password
is incorrect, we won't ask for the password again with the current logic.

With this change, we also stop calling `CmdLogin` directly when
authentication fails. We don't need to parse flags from the cli or
setting up input destriptiors again, like the current behavior is doing.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 8ed06af0443f4239f446b3cff202d91a61af350f
Component: engine
2016-01-27 18:26:48 -05:00
868c4d3b26 Remove output file when save/export fail
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Upstream-commit: b78c736356cb2142e66bd8c8020f6f355c565917
Component: engine
2016-01-26 22:12:31 -07:00
4edafc3bc1 *: purge dockerinit from source code
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: 4357ed4a7363a1032edf93cf03232953c805184f
Component: engine
2016-01-26 23:47:02 +11:00
25849c48bc Merge pull request #19057 from dnephin/remove_version_from_registry_pkg
Remove dockerversion from registry package
Upstream-commit: 07e2dedecb3a0b7381ebf0f8fb4d08d082754cd0
Component: engine
2016-01-25 22:45:06 -08:00
ff3e96b827 Fix comment about swap limit of docker update
The description "set `-1` to disable swap" is wrong, `build`,
`create` and `run` already fixed, we need to fix `update` as well.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 603bc69b2c3c00714c18e6ddc65bf53c2f1a079d
Component: engine
2016-01-21 13:48:53 +08:00
31eb5171fa Move tty set and restore to caller
Fixes #19506

This fixes the issue of errors on create and the tty not being able to
be restored to its previous state because of a race where it was
in the hijack goroutine.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: a1eb6029cc4e4ccd820b0aac147a6121f1967ba2
Component: engine
2016-01-20 13:32:19 -08:00
dca237fb71 api: client: build: do not fall through if git isn't installed
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 167cc42986c8939c7aacf73570adaf19b8cad0b3
Component: engine
2016-01-19 16:50:14 +01:00
88549196d4 Merge pull request #19414 from anusha-ragunathan/postBuild
Make daemonbuilder.Docker leaner.
Upstream-commit: a495c148a5948c372c626c6a4643d361f31374d0
Component: engine
2016-01-18 21:46:49 +01:00
bd1120dfd8 Make daemonbuilder.Docker leaner.
Currently builder.Backend is implemented by daemonbuilder.Docker{} for
the daemon. This registration happens in the API/server code. However,
this is too implementation specific. Ideally we should be able to specify
that docker daemon (or any other) is implementing the Backend and abstract
the implementation details. So we should remove package daemonbuilder
dependency in build_routes.go

With this change, daemonbuilder.Docker is nothing more than the daemon.
A follow on change will remove the daemonbuilder package and move relevant
methods under daemon, so that API only knows about the backend.

Also cleanup code in api/client/build.go. docker cli always performs build
context tar download for remoteURLs and sends an empty remoteContext. So
remove relevant dead code.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 14215ed5a1900a88a3b17dd7cd566def50bfcbc9
Component: engine
2016-01-18 09:16:11 -08:00
a208c4a74e Remove the use of dockerversion from the registry package
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 61a49bb6ba2c0f17a31a64ee6336b4fc40c37f71
Component: engine
2016-01-15 12:43:54 -05:00
6e02d0f3a0 Merge pull request #19355 from riyazdf/notary-revendor
notary revendor into docker
Upstream-commit: 4c89b1f72c1259858e243ddbfb00d74dbafeff8a
Component: engine
2016-01-15 01:02:35 -08:00
9952183b81 revendor notary and wrap friendlier error messages
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: dd7436c832a5dd777d0276c3e3b1819062b86ebc
Component: engine
2016-01-14 20:35:59 -08:00
6f200e8423 Merge pull request #19308 from estesp/better-warning-msg
Better warning message on OOM kill disable without mem limit
Upstream-commit: 6add477c9185f09e20c3ca94dd42fff5d6084461
Component: engine
2016-01-14 16:49:38 -08:00
57bedb0b2d Merge pull request #17316 from rmb938/ipam_conf_options
Add IPAM Config Options to match libnetwork
Upstream-commit: e35f5a481ac5c982c4f97be5dc41206e21e19007
Component: engine
2016-01-14 16:30:03 -05:00
f8714c52f0 Add IPAM Config Options to match libnetwork
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
Upstream-commit: 662cac08ef83ee105addb4d29f6e46188468306f
Component: engine
2016-01-14 14:32:25 -05:00
8eb1087397 Network scoped alias support
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: dda513ef651b42fcb9625e651f664554161c0a6a
Component: engine
2016-01-14 08:44:41 -08:00
2b7ea75ef2 Forced endpoint cleanup
docker's network disconnect api now supports `Force` option which can be
used to force cleanup an endpoint from any host in the cluster.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: b464f1d78cdfa2a4124e083b8f7b0f2353f12de3
Component: engine
2016-01-13 21:28:52 -08:00
a7dc252abe Merge pull request #19283 from tonistiigi/fix-permission-build-stdin
Avoid extracting to temp directory on building from tar
Upstream-commit: c8cc4fb8d9a8d0cd155b8d26a3108e7762b623e3
Component: engine
2016-01-13 11:17:37 -08:00
82334437e0 Better warning message on OOM kill disable without mem limit
Modify the warning to be more readable/understandable.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 4983e5807eb86a71f88dd83791f7a9f277bc2889
Component: engine
2016-01-13 10:40:49 -08:00
9c6798de6b Add network interal mode
Signed-off-by: Chun Chen <ramichen@tencent.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: b70954e60a15d09756bd6b00a6fadedc64829477
Component: engine
2016-01-13 11:30:36 -05:00
69c1610f93 Merge pull request #19249 from calavera/carry_17414
[Carry 17414] Added additional container information to "docker info".
Upstream-commit: a79f96828f7da2fc762002bf79ab8a9dcf908457
Component: engine
2016-01-13 10:42:22 +01:00
d461b41f22 Avoid extracting to temp directory on building from tar
Fixes #15785

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 42961a66a5c1575d81c89aa258f6624f48bba94d
Component: engine
2016-01-12 17:43:52 -08:00
6c7b14647b Support --link for user-defined networks
This brings in the container-local alias functionality for containers
connected to u ser-defined networks.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: e221b8a3d64c13178e156fc3ece5e9894dac1603
Component: engine
2016-01-12 13:38:48 -08:00
410757a181 Change OomKillDisable to be pointer
It's like `MemorySwappiness`, the default value has specific
meaning (default false means enable oom kill).

We need to change it to pointer so we can update it after
container is created.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
(cherry picked from commit 9c2ea42329179c589f5a8991ccf0253eb10fc897)

Conflicts:
	vendor/src/github.com/docker/engine-api/types/container/host_config.go
Upstream-commit: f4a687334b1d026c84809fd005e1a82225d1c86f
Component: engine
2016-01-12 13:19:17 -05:00