1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

17924 commits

Author SHA1 Message Date
Vincent Demeester
c1af0ac082 Add 'ancestor' ps filter for image
Makes it possible to filter containers by image, using
--filter=ancestor=busybox and get all the container running busybox
image and image based on busybox (to the bottom).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-08-26 22:59:48 +02:00
moxiegirl
ea65c38ac0 Merge pull request from MHBauer/version-order
reweight api doc for v1.21 to correct the order.
2015-08-26 13:51:06 -07:00
Morgan Bauer
31a52a31c6
reweight api doc for v1.21 to correct the order.
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-08-26 13:40:37 -07:00
Alexander Morozov
47cdae243a Merge pull request from Microsoft/10662-isabs
Windows: Fix use of IsAbs check
2015-08-26 13:29:24 -07:00
Sebastiaan van Stijn
fa13f7cde8 Merge pull request from cpuguy83/add_volume_api
Add volume api
2015-08-26 21:57:12 +02:00
John Howard
f11ba3135b Windows: Fix use of IsAbs check
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-26 12:38:28 -07:00
Brian Goff
b3b7eb2723 Add volume API/CLI
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-08-26 13:37:52 -04:00
Jessie Frazelle
5dadfa8b69 Merge pull request from calavera/revert_ipc_mounts
DO NOT MERGE: Check if these commits broke the builds.
2015-08-26 10:29:25 -07:00
David Calavera
7ef08f39ed Merge pull request from choleraehyq/15849-fixtypo
api/client/restart.go:Fix a typo in comment
2015-08-26 16:10:31 +02:00
Brian Goff
2cec06fbcd Merge pull request from coolljt0725/restart_daemon_with_paused_containers
Fix restart docker daemon with paused containers
2015-08-26 09:04:14 -04:00
Cholerae Hu
d30990d7b1 api/client/restart.go:Fix a typo in comment
Signed-off-by: Yingqian Hu <choleraehyq@gmail.com>
2015-08-26 18:59:56 +08:00
David Calavera
b857dadb33 Merge pull request from monitorjbl/import-commit-message
adding message option to the import subcommand
2015-08-26 11:42:10 +02:00
David Calavera
688dd8477e Revert "Add support for sharing /dev/shm/ and /dev/mqueue between containers"
This reverts commit d88fe447df.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-26 05:23:00 -04:00
David Calavera
a9378a0ab5 Revert "Modify test to include /dev/shm sharing"
This reverts commit 457aeaa2e1.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-26 05:22:46 -04:00
Sven Dowideit
8720f71b52 Merge pull request from rsmitty/issue-15835
Resolves link to introduction to Docker
2015-08-26 12:06:29 +10:00
Sven Dowideit
3bc375c6e4 Merge pull request from yasker/master
Update plugins.md
2015-08-26 12:05:35 +10:00
Sven Dowideit
a0f6ff7d58 Merge pull request from rsmitty/issue-15837
Updates link to the understanding-docker section
2015-08-26 11:53:58 +10:00
Spencer Smith
90be489f40 Updates link to the understanding-docker section
Signed-off-by: Spencer Smith <robertspencersmith@gmail.com>
2015-08-25 14:12:29 -07:00
Spencer Smith
9a71dd2b90 Resolves link to introduction to Docker
Signed-off-by: Spencer Smith <robertspencersmith@gmail.com>
2015-08-25 13:54:39 -07:00
Sebastiaan van Stijn
bdba406492 Merge pull request from vbatts/tarsum_warning
tarsum: add a big fat warning
2015-08-25 22:53:04 +02:00
Vincent Batts
459451de8b tarsum: add a big fat warning
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-08-25 16:50:08 -04:00
Sheng Yang
5f156d8c25 Update plugins.md
Add Convoy to Docker plugin list.

Signed-off-by: Sheng Yang <sheng.yang@rancher.com>
2015-08-25 12:01:31 -07:00
James Turnbull
7dbb5fafcd Merge pull request from Microsoft/10662-moredocs
Windows: Minor doc clarification
2015-08-25 13:30:54 -04:00
Brian Goff
e134ccada7 Merge pull request from gesellix/websocket-disable-check-origin
skip checkOrigin during websocket handshake
2015-08-25 12:56:30 -04:00
John Howard
759ed647fb Windows: Minor doc clarification
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-25 09:36:51 -07:00
Alexander Morozov
78698855ce Merge pull request from calavera/fix_api_json_examples
Fix json examples in the api reference.
2015-08-25 09:22:38 -07:00
David Calavera
7296c845b7 Fix json examples in the api reference.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-25 10:55:12 -04:00
David Calavera
6f8c4480e4 Merge pull request from coolljt0725/fix_build_with_resource_limit
Fix build with resource limit which system not support.
2015-08-25 16:42:13 +02:00
Sebastiaan van Stijn
ee2c476f22 Merge pull request from epc/epc-2015236
Copy edits for typos
2015-08-25 08:04:53 +02:00
Ed Costello
cefb72080d Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
2015-08-24 23:02:44 -04:00
Taylor Jones
936b2c6afe adding message option to the import subcommand
Signed-off-by: Taylor Jones <monitorjbl@gmail.com>
2015-08-25 02:55:04 +00:00
Lei Jitang
9a9724ad56 Fix docker daemon restart with paused container.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-25 09:42:58 +08:00
Jessie Frazelle
903cd2b9e3 Merge pull request from mrunalp/feature/ipc_share_dev
ipc: Share /dev/shm and /dev/mqueue when --ipc container:<id/name> is used
2015-08-24 17:55:03 -07:00
Brian Goff
562cc6254f Merge pull request from LK4D4/fix_events_tests_15
Make events test more deterministic in go1.5
2015-08-24 20:15:09 -04:00
Jessie Frazelle
82e2dec06d Merge pull request from azurezk/exportImage-toplevel
change exportImage to top-level func
2015-08-24 14:35:55 -07:00
Jessie Frazelle
25f4f5588e Merge pull request from tonistiigi/15724-remove-nil-contexts
Remove nil contexts
2015-08-24 14:29:48 -07:00
Jessie Frazelle
ebe27cb34c Merge pull request from jeffminard-ck/rhel-init-detect-failure
Allow RHEL init script to detect daemon start pid failure
2015-08-24 14:24:36 -07:00
moxiegirl
0ce37336b3 Merge pull request from moxiegirl/carry-14503
Closes PR  with this carry
2015-08-24 13:22:19 -07:00
Casey Bisson
831747d59e Closes PR with this carry
- Refer to Joyent's blogs and docs rather than following from our end
- All of this information exists on Joyent's site
Updating with thaJeztah's comments

Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-24 13:21:27 -07:00
Alexander Morozov
1269dd35dc Merge pull request from tonistiigi/parallel-pulls
Mitigate parallel pull issues
2015-08-24 12:56:21 -07:00
Tonis Tiigi
b779bc3102 Mitigate parallel pull issues
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-08-24 11:41:45 -07:00
Alexander Morozov
137df3048c Merge pull request from aidanhs/aphs-simpler-pull-codepath
Remove unnecessary function parameter, add mirror endpoint test
2015-08-24 11:03:01 -07:00
Alexander Morozov
6b21e98432 Merge pull request from hqhq/hq_fix_device
Add mode check for device
2015-08-24 10:58:49 -07:00
Brian Goff
fd8b25c802 Merge pull request from tonistiigi/11008-always-unless-stopped-restart-policy
Add always-unless-stopped restart policy
2015-08-24 13:48:56 -04:00
Alexander Morozov
1544c5edb6 Merge pull request from tonistiigi/graph-register-readcloser
Make graph.Register take in io.Reader
2015-08-24 10:40:04 -07:00
Jessie Frazelle
654b555d09 Merge pull request from calavera/add_cors_head_option
Allow HEAD requests to container archives via CORS.
2015-08-24 10:27:07 -07:00
Alexander Morozov
386aefb9fc Make events test more deterministic in go1.5
Now scheduler makes order of events pretty random, so I added little
sleeps to make order intact. Also I renamed to test so name better
describes its nature.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-08-24 09:35:11 -07:00
Brian Goff
c0a48a676d Merge pull request from mattrobenolt/trim
opts/envfile: trim all leading whitespace in a line
2015-08-24 12:32:27 -04:00
Brian Goff
e14eaba784 Merge pull request from thieman/tnt-issue-12595
Use image ID in ps if tag has been updated
2015-08-24 12:24:42 -04:00
Sebastiaan van Stijn
37f58d266f Merge pull request from docteurklein/master
[experimental compose/swarm] explain how to make it work on awazon ec2.
2015-08-24 17:47:26 +02:00