Jess Frazelle
4c55464dd3
Merge pull request #13777 from cpuguy83/graphdriver_extpoints
...
Create extpoint for graphdrivers
2015-10-08 13:46:42 -07:00
Brian Goff
5ec323aaa2
Merge pull request #16660 from Microsoft/js/hostname
...
Windows: --hostname support
2015-10-08 16:11:49 -04:00
Vincent Demeester
caf7d83c67
Merge pull request #16826 from LK4D4/refactor_listenfd
...
Refactor listenFD function
2015-10-08 22:08:52 +02:00
Vincent Demeester
991589d518
Merge pull request #16781 from brahmaroutu/pkg_integration_timeout
...
timeouts causing tests to fail differently. GCCGO CI.
2015-10-08 22:02:22 +02:00
Jess Frazelle
4796b5c2f8
Merge pull request #16544 from Mashimiao/fix-bug-client-start-signal-discarded
...
client/start: fix logic for discarded signal
2015-10-08 12:54:31 -07:00
Jess Frazelle
5bde858db5
Merge pull request #16581 from fgimenez/11584-stdcopy-test-coverage
...
Added test coverage to StdCopy closes #11584
2015-10-08 12:53:25 -07:00
moxiegirl
246072e8c5
Merge pull request #16837 from x1022as/network
...
update dockernetwork.md and network api
2015-10-08 12:27:49 -07:00
Jess Frazelle
cc411c054f
Merge pull request #16785 from cpuguy83/exec_cleanup
...
Cleanup some issues with exec
2015-10-08 12:02:03 -07:00
Jess Frazelle
b5d914188e
Merge pull request #16674 from coolljt0725/use_consistent_command_description
...
Use consistent command description
2015-10-08 12:01:16 -07:00
Sebastiaan van Stijn
80469f8180
Merge pull request #16850 from moxiegirl/fix-command-meta
...
Fixing issues introduced with new commands adding index
2015-10-08 20:59:59 +02:00
Jess Frazelle
73e3d85c28
Merge pull request #16791 from flaccid/patch-1
...
Do not run yaourt as root/sudo
2015-10-08 11:50:56 -07:00
Jess Frazelle
9123f77a78
Merge pull request #16817 from cpuguy83/explicit_volume_ls
...
Make `docker volume` behave like `docker network`
2015-10-08 11:36:51 -07:00
Arnaud Porterie
b3b9fe8c77
Merge pull request #15868 from crosbymichael/aufs-data
...
Add aufs data structure for added mount information
2015-10-08 11:17:20 -07:00
Jess Frazelle
41c99cc621
Merge pull request #15693 from vdemeester/15659-image-label-filter
...
Fix #15659 : filter by label for docker images commited
2015-10-08 11:14:51 -07:00
Vincent Demeester
683ee20562
Merge pull request #16669 from sunyuan3/TestRunInValidCPUShares
...
add TestRunInValidCPUShares
2015-10-08 19:38:21 +02:00
Xiaoxu Chen
79498b1c61
refactor integration-cli/docker_cli_login_test.go with Assert
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
2015-10-08 12:43:03 -04:00
Jess Frazelle
2b6af905fa
Merge pull request #16815 from duglin/fixHelp
...
Fix help test comment to align with the code
2015-10-08 09:29:32 -07:00
Mary Anthony
b44ef2b306
Fixing issues in command ordering. Adding index.md
...
Adjust bullets
Entering Seb's comments
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-08 09:28:46 -07:00
Jess Frazelle
c281f692c7
Merge pull request #16825 from LK4D4/return_listenbuffer
...
Return listenbuffer behavior
2015-10-08 09:18:47 -07:00
Alexander Morozov
6654b0e05f
Merge pull request #16852 from estesp/overlay-cleanup
...
Simplify dir removal in overlay driver
2015-10-08 08:44:50 -07:00
Alexander Morozov
9e58793207
Merge pull request #16842 from coolljt0725/revert_16818
...
Revert add parent img refcount for faster rmi
2015-10-08 08:40:35 -07:00
Vincent Batts
c3e5364813
Merge pull request #16823 from rhvgoyal/check-thin-pool
...
devmapper: Make sure device is a thin pool device
2015-10-08 11:27:53 -04:00
Srini Brahmaroutu
ffe32ac371
Timeouts are causing tests to fail differently. GCCGO CI.
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-10-08 15:14:56 +00:00
Phil Estes
f418f4864b
Merge pull request #16848 from thaJeztah/fix-broken-link-in-error
...
Fix broken link in error-message
2015-10-08 11:11:11 -04:00
Phil Estes
6ed11b5374
Simplify dir removal in overlay driver
...
There is no need to call `os.Stat` on the driver filesystem path of a
container as `os.RemoveAll` already handles (properly) the case where
the path no longer exists.
Given the results of the stat() were not even being used, there is no
value in erroring out because of the stat call failure, and worse, it
prevents daemon cleanup of containers in "Dead" state unless you re-create
directories that were already removed via a manual cleanup after a
failure. This brings removal in overlay in line with aufs/devicemapper
drivers which don't error out if the filesystem path no longer exists.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-08 11:04:00 -04:00
Stefan Berger
f5be0821cf
contrib: Adjustments to AppArmor docker engine policy for docker 1.9
...
This patch contains a few extensions for the AppArmor docker engine
policy for docker 1.9.
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
2015-10-08 10:08:53 -04:00
James Turnbull
52de250496
Merge pull request #16832 from sunyuan3/daemoncommand
...
Replace the deprecated -d with docker daemon.
2015-10-08 10:06:10 -04:00
James Turnbull
a4eba15b75
Merge pull request #16828 from jwayong/jwayong/docs
...
Docs: Add docker-elements to remote API client lib doc page
2015-10-08 10:05:44 -04:00
moxiegirl
df6cd114a0
Merge pull request #15265 from greaber/dockerignore-docs
...
Further clarifications to .dockerignore docs
2015-10-08 06:24:44 -07:00
James Turnbull
e777f96e59
Merge pull request #16845 from thaJeztah/is-that-a-container-in-your-repo
...
docs: minor fix in faq, and update link
2015-10-08 08:55:29 -04:00
Lei Jitang
2b0927c9ac
Use consistent command description
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-08 08:46:21 -04:00
Sebastiaan van Stijn
c1783a1c2a
Merge pull request #16844 from thaJeztah/fix-typo-in-maintainers
...
Fix typo in MAINTAINERS
2015-10-08 14:42:12 +02:00
Sebastiaan van Stijn
4830f488d5
Fix broken link in error-message
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-10-08 14:32:34 +02:00
Sebastiaan van Stijn
6fda30a437
docs: minor fix in faq, and update link
...
The registry doesn't have containers, only images.
Also updated the Docker Hub link to the new location.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-10-08 13:49:30 +02:00
Sebastiaan van Stijn
618e00da81
Fix typo in MAINTAINERS
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-10-08 13:32:58 +02:00
Lei Jitang
b290690d73
Revert add parent img refcount for faster rmi
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-08 06:46:27 -04:00
Vincent Demeester
53d2429164
Merge pull request #16780 from Microsoft/jjh/vfs-build-tags
...
Fix VFS build tags
2015-10-08 09:43:06 +02:00
Deng Guangxing
54f98f40a4
update dockernetwork.md and network api
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2015-10-08 15:34:24 +08:00
Yuan Sun
b7249569e2
Add description for "--cpu-shares=0".
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-10-08 10:50:55 +08:00
Alexander Morozov
4a9d039721
Merge pull request #16783 from Microsoft/10662-cliwait
...
Windows CI: cli_wait_test
2015-10-07 19:39:32 -07:00
Yuan Sun
b08c6b1768
Replace the deprecated -d with docker daemon.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-10-08 10:25:16 +08:00
Yuan Sun
042d08a2a8
add TestRunInValidCPUShares
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-10-08 10:04:51 +08:00
Tibor Vass
a8175b751c
Merge pull request #16830 from Microsoft/10662-refixdownload
...
Windows: Regression re-fix builder
2015-10-07 19:51:39 -04:00
Daniel Hiltgen
124792a871
Add TLS support for discovery backend
...
This leverages recent additions to libkv enabling client
authentication via TLS so the discovery back-end can be locked
down with mutual TLS. Example usage:
docker daemon [other args] \
--cluster-advertise 192.168.122.168:2376 \
--cluster-store etcd://192.168.122.168:2379 \
--cluster-store-opt kv.cacertfile=/path/to/ca.pem \
--cluster-store-opt kv.certfile=/path/to/cert.pem \
--cluster-store-opt kv.keyfile=/path/to/key.pem
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2015-10-07 16:01:00 -07:00
John Howard
9cd84e405d
Windows: Regression re-fix builder
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-07 15:57:37 -07:00
Morgan Bauer
1eecc1e7e5
refactor logs to not use internal data structures
...
- refactor to make it easier to split the api in the future
- additional tests for non existent container case
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-10-07 15:44:16 -07:00
Morgan Bauer
77c592d26a
refactor daemon
...
- create pass through in daemon for access to functions on daemon
member
- import image
push image
export image and corrections
lookup image & comments
load image
list images
image history & comments
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-10-07 15:29:02 -07:00
Januar Wayong
96ad26a730
Docs: Add docker-elements to remote API client lib doc page
...
This closes #16824
Signed-off-by: Januar Wayong <januar@gmail.com>
2015-10-08 08:45:35 +11:00
Alexander Morozov
fb04043ca5
Refactor listenFD function
...
* fixed weird logic with "*"
* return error if fdNum is failed to parse
* check if listener at offset is nil
* close unused listeners
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-07 14:26:48 -07:00
Alexander Morozov
281a48d092
Return listenbuffer behavior
...
Now we're start to serve early, but all Accept calls are intercepted by
listenbuffer or systemd socket.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-07 14:18:42 -07:00