104dab87ea
Merge pull request #17478 from vdemeester/pr-13921
...
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
2015-11-17 15:44:57 -08:00
f18d5da6a7
Merge pull request #17300 from kunalkushwaha/plugin-info
...
Patch for Plugin drivers in docker info
2015-11-17 10:46:29 -08:00
d507acb175
Merge pull request #17724 from runcom/remove-depreciated-cli-flags
...
Remove depreciated cli flags
2015-11-17 16:40:06 +01:00
7c5cdda74e
Merge pull request #17604 from RyanDeng/fix_cpuPercent_extremelyHigh
...
fix the bug: cpu percent will extremely high
2015-11-16 17:26:29 +01:00
aa7fd884e6
Supported added for reterving Plugin list for Network and Volume.
...
Also, plugin information in docker info output.
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-11-16 15:28:09 +09:00
7929888214
Remove deprecated cli flags
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-15 10:40:01 +01:00
4e8fcd4002
/info: Add keys Architecture, OSType
...
- introduces Swarm-relevant keys, see #13634
- docs updated
Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
2015-11-14 22:21:45 +01:00
ad8a66573c
Merge pull request #17851 from Microsoft/10662-ArgumentEscaping
...
Prevent double escaping of Dockerfile commands on Windows
2015-11-14 17:25:53 +01:00
94ea6af8cd
update vendor.sh and notary api for vendored changes
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:19:11 -08:00
9db5db1b94
This fixes the case where arguments are escaped twice from Dockerfiles on
...
Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2015-11-13 10:43:06 -08:00
cccf674943
Merge pull request #16873 from coolljt0725/expand_docker_info
...
Add more cgroup config to docker info
2015-11-13 09:37:06 -08:00
58b270c338
Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again
...
Another try at dockerversion placeholder for library import
2015-11-09 13:15:50 -08:00
8054a30387
dockerversion placeholder for library import
...
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-09 19:32:46 +01:00
fdc8cce070
Merge pull request #16742 from runcom/10772-docker-stats-all
...
Allow docker stats without arguments
2015-11-07 19:41:03 +00:00
ae818a820f
Allow docker stats without arguments
...
This patch adds the ability to run `docker stats` w/o arguments and get
statistics for all running containers by default. Also add a new
`--all` flag to list statistics for all containers (like `docker ps`).
New running containers are added to the list as they show up also.
Add integration tests for this new behavior.
Docs updated accordingly. Fix missing stuff in man/commandline
reference for `docker stats`.
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-07 17:03:33 +01:00
f198334400
Merge pull request #17738 from Microsoft/jjh/login
...
Windows: [TP4] Fix docker login
2015-11-06 15:02:42 -08:00
e37e329074
Return nice client-side message for docker logs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-06 11:40:48 -08:00
9c765040a5
Windows: Fix docker login
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-05 14:19:48 -08:00
72aeb63a47
Reutrn immediately when inspect connection failed
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-04 21:17:05 -05:00
41de7a18d8
Change 'docker run' exit codes to distinguish docker/contained errors
...
The purpose of this PR is for users to distinguish Docker errors from
contained command errors.
This PR modifies 'docker run' exit codes to follow the chroot standard
for exit codes.
Exit status:
125 if 'docker run' itself fails
126 if contained command cannot be invoked
127 if contained command cannot be found
the exit status otherwise
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-11-04 15:18:50 -05:00
11062ea177
Fixing wrong word spelling in api/client/network.go
...
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com>
2015-11-04 13:42:34 +00:00
e222c61594
fix the bug: cpu percent will extremely high
...
Signed-off-by: Chao Deng <sheldon.d1018@gmail.com>
2015-11-03 10:57:52 +08:00
5a3236d9e8
Update logic of history
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-11-02 10:27:54 +08:00
5719d01066
Merge pull request #16579 from coolljt0725/fix_attach_paused_container
...
Add show error when attach to a paused container
2015-10-31 07:43:22 -07:00
d5c85897f4
Windows: Allows --isolation on docker build
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-30 11:14:38 -07:00
855487b379
Merge pull request #17365 from HuKeping/rework-history
...
Rework docker cli history
2015-10-30 10:33:16 +01:00
34668ad68b
Let the api to choose the default network driver.
...
That way swarm can understand the user's intention.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-29 19:47:12 -04:00
09eedc35b2
Rework docker cli history
...
The implementation of `history` is a little redundant espacially
when user set the `--human` and/or `--no-trunc` options.
There are too many conditionals for `human`, `no-trunc` and `quiet` which
I think is useless and complicated.
Since `quiet` will only display the container IDs so it could be not
nested with the other options.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-29 17:59:07 +08:00
de1d611990
Add show error when attach to a paused container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-28 21:00:09 -04:00
b227d19cae
Merge pull request #17423 from cpuguy83/so_sensitive
...
Revert "dockerversion placeholder for library-import"
2015-10-27 18:32:18 -07:00
b78ca243d9
Revert "dockerversion placeholder for library-import"
...
This reverts commit d5cd032a86
2015-10-27 21:23:53 -04:00
2266462f72
Merge pull request #17373 from Microsoft/10662-volumetests
...
Windows: Volume integration tests
2015-10-27 19:52:11 -04:00
6276c676a8
Merge pull request #17350 from vdemeester/11699-auto-libraryimport
...
dockerversion placeholder for library-import
2015-10-27 13:39:40 -07:00
85ae8b034a
Merge pull request #17364 from mavenugo/advertise
...
Enhancing --cluster-advertise to support <interface-name>
2015-10-27 13:29:18 -07:00
d5cd032a86
dockerversion placeholder for library-import
...
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-27 20:36:07 +01:00
3e7db73b99
Enhancing --cluster-advertise to support <interface-name>
...
--cluster-advertise daemon option is enahanced to support <interface-name>
in addition to <ip-address> in order to amke it automation friendly using
docker-machine.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-27 11:03:22 -07:00
2af5034ce8
Windows: Volume integration tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-26 14:33:28 -07:00
c10ef20ed8
Merge pull request #17319 from vdemeester/fix-network-help-inspect-syntax
...
Update docker network inspect help syntax
2015-10-24 21:56:38 -07:00
448398c2a8
Merge pull request #15780 from mountkin/build-multi-tags
...
Add ability to add multiple tags with docker build
2015-10-23 13:50:35 -07:00
3dd50eaf05
Update docker network inspect help syntax
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-23 22:48:22 +02:00
c2eb37f9ae
Add ability to add multiple tags with docker build
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-10-24 00:59:56 +08:00
3b9c13873a
Fail when there is an error executing an inspect template.
...
- Do not execute the template directly in the cli outout, go is not atomic
in this operation and can send bytes before failing the execution.
- Fail after evaluating a raw interface if the typed execution also
failed, assuming there is a template parsing error.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-22 19:24:50 -04:00
dfdee41308
Show trust variable deprecation warning only if used
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-10-22 11:01:30 -07:00
9f031f70ce
Merge pull request #17218 from vdemeester/17023-network-multiple-inspect
...
Add support for multiple network in inspect
2015-10-21 11:09:02 -07:00
6a7c38a57d
Merge pull request #16940 from coolljt0725/default_tls_host
...
Make default tls host work
2015-10-21 14:02:22 -04:00
492945235b
Merge pull request #17136 from gesellix/change-route-volume-create
...
rename `POST /volumes` to `POST /volumes/create`
2015-10-21 10:21:27 -07:00
7af9f988ac
Add support for multiple network in inspect
...
To be consistent with other inspect command (on container and images),
add the possiblity to pass multiple network to the network inspect
commands.
`docker network inspect host bridge none` is possible now.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-21 08:57:29 +02:00
bb085b7661
Merge pull request #17125 from calavera/check_exec_start_json
...
Check the content type is json when calling exec start.
2015-10-19 18:44:42 +02:00
45dc57f229
Check the content type is json when calling exec start.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-19 11:46:44 -04:00
fbb01b8162
Make default tls host work
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-19 21:17:37 +08:00
Michael Crosby
Alexander Morozov
David Calavera
Sebastiaan van Stijn
Kunal Kushwaha
Antonio Murdaca
Olle Jonsson
Antonio Murdaca
Jessica Frazelle
Darren Stahl
Vincent Demeester
Antonio Murdaca
Alexander Morozov
John Howard
Brian Goff
Sally O'Malley
Shuwei Hao
RyanDeng
Hu Keping
Arnaud Porterie
Lei Jitang
Jess Frazelle
Alexandre Beslic
Madhu Venugopal
moxiegirl
Shijiang Wei
Tonis Tiigi
Tibor Vass