31df7b66e4
Merge pull request #16781 from brahmaroutu/pkg_integration_timeout
...
timeouts causing tests to fail differently. GCCGO CI.
Upstream-commit: 991589d5180f76b2499036e8f1f84500aabfaaf9
Component: engine
2015-10-08 22:02:22 +02:00
6c294ed6e9
Merge pull request #16544 from Mashimiao/fix-bug-client-start-signal-discarded
...
client/start: fix logic for discarded signal
Upstream-commit: 4796b5c2f84c38960bb1147dff59d7946172b598
Component: engine
2015-10-08 12:54:31 -07:00
b031358eae
Merge pull request #16581 from fgimenez/11584-stdcopy-test-coverage
...
Added test coverage to StdCopy closes #11584
Upstream-commit: 5bde858db56403ab3644f21aa764f67c574df117
Component: engine
2015-10-08 12:53:25 -07:00
b07ff86773
Merge pull request #16837 from x1022as/network
...
update dockernetwork.md and network api
Upstream-commit: 246072e8c5184c78edc9f40435987a7ba26baaa8
Component: engine
2015-10-08 12:27:49 -07:00
e20529cb2b
Merge pull request #16785 from cpuguy83/exec_cleanup
...
Cleanup some issues with exec
Upstream-commit: cc411c054ffc16fff1ec27b49047ff7dba6a1e04
Component: engine
2015-10-08 12:02:03 -07:00
885627be00
Merge pull request #16674 from coolljt0725/use_consistent_command_description
...
Use consistent command description
Upstream-commit: b5d914188efa55e6cf1fcd14334b2c1b61181eea
Component: engine
2015-10-08 12:01:16 -07:00
30a049bac1
Merge pull request #16850 from moxiegirl/fix-command-meta
...
Fixing issues introduced with new commands adding index
Upstream-commit: 80469f8180506b8e3a04e63766b15caddffa9726
Component: engine
2015-10-08 20:59:59 +02:00
336ef562f3
Merge pull request #16791 from flaccid/patch-1
...
Do not run yaourt as root/sudo
Upstream-commit: 73e3d85c28e4fefb035d73ea0e57c6502409b01a
Component: engine
2015-10-08 11:50:56 -07:00
90f924b006
Merge pull request #16817 from cpuguy83/explicit_volume_ls
...
Make `docker volume` behave like `docker network`
Upstream-commit: 9123f77a78c8565e83b8c42a4f14dd0c75f0af66
Component: engine
2015-10-08 11:36:51 -07:00
99f0bfa2a6
Merge pull request #15868 from crosbymichael/aufs-data
...
Add aufs data structure for added mount information
Upstream-commit: b3b9fe8c7730060c9f5a7c5081b773676fdef889
Component: engine
2015-10-08 11:17:20 -07:00
fe5747bb6d
Merge pull request #15693 from vdemeester/15659-image-label-filter
...
Fix #15659 : filter by label for docker images commited
Upstream-commit: 41c99cc62161376981d1c24f30c0e340124778e8
Component: engine
2015-10-08 11:14:51 -07:00
f28b4afc30
Merge pull request #16669 from sunyuan3/TestRunInValidCPUShares
...
add TestRunInValidCPUShares
Upstream-commit: 683ee205620e5e622cb13e3d4e14524b3d92dd96
Component: engine
2015-10-08 19:38:21 +02:00
11d29e39af
refactor integration-cli/docker_cli_login_test.go with Assert
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
Upstream-commit: 79498b1c6124ab4faabb408ef7d973ac899ad1e1
Component: engine
2015-10-08 12:43:03 -04:00
6c42b9a51f
Merge pull request #16815 from duglin/fixHelp
...
Fix help test comment to align with the code
Upstream-commit: 2b6af905faacc5eff0f1b3263974f5af12a92ed4
Component: engine
2015-10-08 09:29:32 -07:00
92bcbdcb5f
Fixing issues in command ordering. Adding index.md
...
Adjust bullets
Entering Seb's comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: b44ef2b306c56dad16500c3738b0f29ec0f34635
Component: engine
2015-10-08 09:28:46 -07:00
2932c5b664
add clean apt db to release script
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 96559aaef22923c9c0d3d75e21e0c85f5b5ad47c
Component: engine
2015-10-08 09:21:20 -07:00
1c7020419c
add script to generate index listing for the repo if say hosted on s3
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 0aee0b1f9e3ffce613a01318cd7e7351025cff0c
Component: engine
2015-10-08 09:21:16 -07:00
eb4cfe02ee
Merge pull request #16825 from LK4D4/return_listenbuffer
...
Return listenbuffer behavior
Upstream-commit: c281f692c7f9abc31b733a1344a03b9aa4493934
Component: engine
2015-10-08 09:18:47 -07:00
815dbb240f
Merge pull request #16852 from estesp/overlay-cleanup
...
Simplify dir removal in overlay driver
Upstream-commit: 6654b0e05f663da394bac6ed846187bca90451f5
Component: engine
2015-10-08 08:44:50 -07:00
b45dd9f105
Merge pull request #16842 from coolljt0725/revert_16818
...
Revert add parent img refcount for faster rmi
Upstream-commit: 9e587932078eba3a45d419721d468db46943e4a3
Component: engine
2015-10-08 08:40:35 -07:00
a6e3345892
Merge pull request #16823 from rhvgoyal/check-thin-pool
...
devmapper: Make sure device is a thin pool device
Upstream-commit: c3e5364813848616d2713083cb442760e62417e4
Component: engine
2015-10-08 11:27:53 -04:00
89ab17818a
Timeouts are causing tests to fail differently. GCCGO CI.
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: ffe32ac371023220075b8ec7ac3cc62b431445b0
Component: engine
2015-10-08 15:14:56 +00:00
f7b1046066
Merge pull request #16848 from thaJeztah/fix-broken-link-in-error
...
Fix broken link in error-message
Upstream-commit: f418f4864bd317755ecf66bd9acc406a7bddc2a9
Component: engine
2015-10-08 11:11:11 -04:00
99dfae8822
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)
Upstream-commit: 6ed11b53743668dba3bcf6ecef4e57a399d95569
Component: engine
2015-10-08 11:04:00 -04:00
ea88988c20
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 >
Upstream-commit: f5be0821cfc583f187f7e91865c987d78321670c
Component: engine
2015-10-08 10:08:53 -04:00
85e1a44e76
Merge pull request #16832 from sunyuan3/daemoncommand
...
Replace the deprecated -d with docker daemon.
Upstream-commit: 52de25049609d55aff26b91db12a792ace30f275
Component: engine
2015-10-08 10:06:10 -04:00
6ff15cb8df
Merge pull request #16828 from jwayong/jwayong/docs
...
Docs: Add docker-elements to remote API client lib doc page
Upstream-commit: a4eba15b75d840672a82802aad992894dbe85a5a
Component: engine
2015-10-08 10:05:44 -04:00
282a5880a8
Merge pull request #15265 from greaber/dockerignore-docs
...
Further clarifications to .dockerignore docs
Upstream-commit: df6cd114a04e343c1f6f2637857bed3c5924873c
Component: engine
2015-10-08 06:24:44 -07:00
18faaa074a
Merge pull request #16845 from thaJeztah/is-that-a-container-in-your-repo
...
docs: minor fix in faq, and update link
Upstream-commit: e777f96e59ffed8bcabc4f8937a058c01d17aa58
Component: engine
2015-10-08 08:55:29 -04:00
262c5c28a2
Use consistent command description
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2b0927c9ac23b66d8a05761801d1c5f882ba8dfb
Component: engine
2015-10-08 08:46:21 -04:00
6dd7824ffd
Merge pull request #16844 from thaJeztah/fix-typo-in-maintainers
...
Fix typo in MAINTAINERS
Upstream-commit: c1783a1c2a97a840cfb26e8333ad2ff8c532816f
Component: engine
2015-10-08 14:42:12 +02:00
66bb31005c
Fix broken link in error-message
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4830f488d5bcdbe73ab49fcedef0c6f686cbe704
Component: engine
2015-10-08 14:32:34 +02:00
1e33aad6ac
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 >
Upstream-commit: 6fda30a43753d504faa8a3d06ef886796e954b81
Component: engine
2015-10-08 13:49:30 +02:00
10aeab9367
Fix typo in MAINTAINERS
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 618e00da818bcd72f7062999e8f9729184bdba26
Component: engine
2015-10-08 13:32:58 +02:00
5cf6a93d8d
Revert add parent img refcount for faster rmi
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: b290690d73094bafea58e34dbccb0db37fd8e6ee
Component: engine
2015-10-08 06:46:27 -04:00
8709c3083b
Merge pull request #16780 from Microsoft/jjh/vfs-build-tags
...
Fix VFS build tags
Upstream-commit: 53d24291648f3c610ddb13e131a498e1d27ae676
Component: engine
2015-10-08 09:43:06 +02:00
0012e76955
update dockernetwork.md and network api
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
Upstream-commit: 54f98f40a478903345400656268202b69b50d46d
Component: engine
2015-10-08 15:34:24 +08:00
7fe62e2968
Add description for "--cpu-shares=0".
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: b7249569e27e1962c69eef2b8f547fb6fb7ad367
Component: engine
2015-10-08 10:50:55 +08:00
e67f107724
Merge pull request #16783 from Microsoft/10662-cliwait
...
Windows CI: cli_wait_test
Upstream-commit: 4a9d039721ac16b07dffb784b2c1e3f884f62459
Component: engine
2015-10-07 19:39:32 -07:00
ee5def44d4
Replace the deprecated -d with docker daemon.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: b08c6b17685d4af40e9705ca0efddbdffdf2657e
Component: engine
2015-10-08 10:25:16 +08:00
5cf2935c37
add TestRunInValidCPUShares
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 042d08a2a89c040b2fc7d97d8cc22a6c4593e275
Component: engine
2015-10-08 10:04:51 +08:00
b5abf96150
Merge pull request #16830 from Microsoft/10662-refixdownload
...
Windows: Regression re-fix builder
Upstream-commit: a8175b751c65b4c2373110f2a513048646336cf9
Component: engine
2015-10-07 19:51:39 -04:00
47fa2052c1
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 >
Upstream-commit: 124792a8714425283226c599ee69cbeac2e4d650
Component: engine
2015-10-07 16:01:00 -07:00
2e11eb0e71
Windows: Regression re-fix builder
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9cd84e405d970239df7169e66a099e28311ef614
Component: engine
2015-10-07 15:57:37 -07:00
8c3d5b861b
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 >
Upstream-commit: 1eecc1e7e57f3b96878df01fd32596bc485117a8
Component: engine
2015-10-07 15:44:16 -07:00
254c913ad5
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 >
Upstream-commit: 77c592d26a83aa5a56726d6e1741f18f044e64ab
Component: engine
2015-10-07 15:29:02 -07:00
9c388a6249
Docs: Add docker-elements to remote API client lib doc page
...
This closes #16824
Signed-off-by: Januar Wayong <januar@gmail.com >
Upstream-commit: 96ad26a7308b9e8b8ad52c5bfb4f0556941fc3f5
Component: engine
2015-10-08 08:45:35 +11:00
074778dab7
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 >
Upstream-commit: fb04043ca52f316ad9cea32ba44a168a68558356
Component: engine
2015-10-07 14:26:48 -07:00
b0a8b96c68
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 >
Upstream-commit: 281a48d092fa84500c63b984ad45c59a06f301c4
Component: engine
2015-10-07 14:18:42 -07:00
5e87c46dcd
clarify dockerignore semantics
...
Signed-off-by: Grant Reaber <grant.reaber@gmail.com >
Upstream-commit: 899ecc11c521d536f26b2e2f062382930dd6ff99
Component: engine
2015-10-07 15:51:57 -05:00
