a8d6119113
Finish linting opts and trust package.
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0bd016b1c31f807169019d10a496144c34698431
Component: engine
2015-08-27 17:36:11 +02:00
062cf19d08
Fix docker volume invalid so it displays usage
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 38da43184d9353d1924ff8cd5bcedcf82ca6b008
Component: engine
2015-08-27 09:46:05 -04:00
cd1363a47b
golint: trust
...
contributes to #14756
Signed-off-by: Sevki Hasirci <s@sevki.org >
Upstream-commit: 5572148477ad069989bc3301e662cd6ee44832d2
Component: engine
2015-08-27 11:40:27 +02:00
c9cbc27779
Opts lint issues, ip and ulimit
...
Signed-off-by: Sevki Hasirci <s@sevki.org >
Upstream-commit: 6eb03c53db1f9e99a8fe7b006f4ab3214c022c01
Component: engine
2015-08-27 11:40:27 +02:00
3fac2ae98a
Updated to use correct cgroup paths
...
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com >
Upstream-commit: b582977bc8a7937a12b9064aa7fbe688b7d9c8fe
Component: engine
2015-08-27 10:39:37 +01:00
cdd3b53574
Merge pull request #15878 from brahmaroutu/vendor_netns
...
Allow vendoring netns changes to build Docker on s390x
Upstream-commit: 4579d5ac783df9d275fb616009cb6754efffe5ec
Component: engine
2015-08-27 10:02:25 +02:00
59e5fcdd6a
Update filtering chapters on ps/images references
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 61de442c49a56f9fc6f82174c97e1229e8aa39f2
Component: engine
2015-08-27 08:47:03 +02:00
2133f70561
Added note about process interaction with container in detached mode
...
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com >
Added note about process interaction with container in detached mode
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com >
Upstream-commit: 9f8891a855c81d49bced308b9bc90640af0c5f01
Component: engine
2015-08-27 09:39:34 +05:30
58853bb568
Add aufs data structure for added mount information
...
This adds a data struct in the aufs driver for including more
information about active mounts along with their reference count.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 20bb0655356900fcd94756afc5228f23e0a40b1f
Component: engine
2015-08-26 16:38:13 -07:00
54ef7aa45d
Merge pull request #15760 from mikebrow/9235-improve-documentation
...
Improvement to userguide/dockerrepos/ documentation
Upstream-commit: 44ea7e91fb1fc3e237ff6c70c2615f8cd919b8ff
Component: engine
2015-08-27 01:21:12 +02:00
4801e8999f
improvement to documentation
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
Upstream-commit: 5caccd27cd9903786898a336bd28fc50450f9eab
Component: engine
2015-08-26 16:49:31 -05:00
0143ca9eed
Merge pull request #15773 from charleswhchan/patch-3
...
Fix #14572 : Improve explaination for using `RUN` command inside Docke…
Upstream-commit: 5e8038d0b0e4f1af43a0daecc4775375721d1051
Component: engine
2015-08-26 14:19:44 -07:00
248e0595b9
Merge pull request #15801 from jfrazelle/btrfs-rm-subvolume-recursion
...
remove btrfs subvolumes when destroying containers (recursive)
Upstream-commit: 459c2c66c3c168364f90532811c96c80e8153822
Component: engine
2015-08-26 14:00:53 -07:00
e191a06015
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 >
Upstream-commit: c1af0ac0820d1385fe2ee65593b0558840395c7b
Component: engine
2015-08-26 22:59:48 +02:00
c09d503a17
Merge pull request #15826 from Microsoft/start-from-one
...
Builder counts from 1
Upstream-commit: 7a74422724ef3a4ae33f6bcd45ce908be279e476
Component: engine
2015-08-26 13:59:38 -07:00
4602da3b1b
Merge pull request #15493 from stevvooe/no-buffer-on-push
...
Avoid buffering to tempfile when pushing with V2
Upstream-commit: 70a814c3f378a5873aedf3be85397272de4f6672
Component: engine
2015-08-26 13:59:01 -07:00
2dc587d949
Merge pull request #15843 from MHBauer/version-order
...
reweight api doc for v1.21 to correct the order.
Upstream-commit: ea65c38ac0972709cdb371ce6b1886eb252a126e
Component: engine
2015-08-26 13:51:06 -07:00
ebcab8fd5d
reweight api doc for v1.21 to correct the order.
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 31a52a31c661fedc671e53c3706bc294f8bf6b1c
Component: engine
2015-08-26 13:40:37 -07:00
20b02657f2
Merge pull request #15865 from Microsoft/10662-isabs
...
Windows: Fix use of IsAbs check
Upstream-commit: 47cdae243a7e0108d487e88cab966ff09e8d94c0
Component: engine
2015-08-26 13:29:24 -07:00
05f2bb7d8b
Merge pull request #14242 from cpuguy83/add_volume_api
...
Add volume api
Upstream-commit: fa13f7cde81d1d92c17740efb05823e7f9cc5468
Component: engine
2015-08-26 21:57:12 +02:00
799fa64220
Windows: Fix use of IsAbs check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f11ba3135b19006a47cf80861f3c291a3211eb1e
Component: engine
2015-08-26 12:38:28 -07:00
bfe1bbc7d2
Add volume API/CLI
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b3b7eb2723461b1eb4be692f4bced0ae8ea9cb58
Component: engine
2015-08-26 13:37:52 -04:00
34f99e4291
Merge pull request #15848 from calavera/revert_ipc_mounts
...
DO NOT MERGE: Check if these commits broke the builds.
Upstream-commit: 5dadfa8b697f83619f4782eb2421c161a779b859
Component: engine
2015-08-26 10:29:25 -07:00
5850f3450f
Builder counts from 1
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 17d6c6c7e514d6cea0820c6e81924413e9416cad
Component: engine
2015-08-26 10:05:04 -07:00
addde22b02
Merge pull request #15850 from choleraehyq/15849-fixtypo
...
api/client/restart.go:Fix a typo in comment
Upstream-commit: 7ef08f39eddecdf120af4dd92c2c3128a021523b
Component: engine
2015-08-26 16:10:31 +02:00
c1608c666a
Merge pull request #13304 from coolljt0725/restart_daemon_with_paused_containers
...
Fix restart docker daemon with paused containers
Upstream-commit: 2cec06fbcd0b4cb6107ae432d92c3997075a4035
Component: engine
2015-08-26 09:04:14 -04:00
1a3f9a1f39
api/client/restart.go:Fix a typo in comment
...
Signed-off-by: Yingqian Hu <choleraehyq@gmail.com >
Upstream-commit: d30990d7b1468488768847521a3a7ce66a081015
Component: engine
2015-08-26 18:59:56 +08:00
6dd2b74345
Merge pull request #15711 from monitorjbl/import-commit-message
...
adding message option to the import subcommand
Upstream-commit: b857dadb334fe0660abce4ae73a8b5b5c7f92c33
Component: engine
2015-08-26 11:42:10 +02:00
8c106c9224
Revert "Add support for sharing /dev/shm/ and /dev/mqueue between containers"
...
This reverts commit d88fe447df0e87b3a57f9d08b108b141dd72678c.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 688dd8477e907ca1899c6c2863775b3af2c30174
Component: engine
2015-08-26 05:23:00 -04:00
9f31b0028d
Revert "Modify test to include /dev/shm sharing"
...
This reverts commit 457aeaa2e1bdbb75c5b3bcedacde460920965c2f.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: a9378a0ab56ec50c7b3f14942ac1b54e6ea42f59
Component: engine
2015-08-26 05:22:46 -04:00
0c55d594b4
Fix #14572 : Improve explaination for usng RUN and apt-get inside Dockerfil.
...
Based on example provided by @thaJeztah and @moxiegirl:
https://github.com/docker/docker/pull/15773
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: b6621a1b6c79bf3338ad3fa3746e515b797565fa
Component: engine
2015-08-25 21:58:20 -07:00
c3bcf238b1
Merge pull request #15836 from rsmitty/issue-15835
...
Resolves link to introduction to Docker
Upstream-commit: 8720f71b522fd0a7abbd47374b27e11d7f1beb7d
Component: engine
2015-08-26 12:06:29 +10:00
8ce1cf104d
Merge pull request #15831 from yasker/master
...
Update plugins.md
Upstream-commit: 3bc375c6e4eb29dde58d966437bd52d146ce55c9
Component: engine
2015-08-26 12:05:35 +10:00
1646aadf41
Merge pull request #15838 from rsmitty/issue-15837
...
Updates link to the understanding-docker section
Upstream-commit: a0f6ff7d58cd3de10f10aea56670f2f3d4e35e70
Component: engine
2015-08-26 11:53:58 +10:00
db9cfc87e1
Updates link to the understanding-docker section
...
Signed-off-by: Spencer Smith <robertspencersmith@gmail.com >
Upstream-commit: 90be489f4030ececf98499d9afaf0bc60becafae
Component: engine
2015-08-25 14:12:29 -07:00
7f42d6bd03
Resolves link to introduction to Docker
...
Signed-off-by: Spencer Smith <robertspencersmith@gmail.com >
Upstream-commit: 9a71dd2b90c13291de979d968b5f9240e9a4a7aa
Component: engine
2015-08-25 13:54:39 -07:00
eea5abee5b
Merge pull request #15821 from vbatts/tarsum_warning
...
tarsum: add a big fat warning
Upstream-commit: bdba406492ad0fab8efb9a74bcd4836c80a9ebe2
Component: engine
2015-08-25 22:53:04 +02:00
c4be78888c
tarsum: add a big fat warning
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 459451de8b6760034dd4bf7a782b7875441254a5
Component: engine
2015-08-25 16:50:08 -04:00
45c63177a1
Windows: Fix docker cp
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f950de575483f562bc56b7f42b67b00b3df1387b
Component: engine
2015-08-25 13:26:49 -07:00
5b4a0b8a4c
cleanup and fix btrfs subvolume recursion deletion
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: bd06432ba32a6cc555de82e08b125992aaec25fb
Component: engine
2015-08-25 13:00:41 -07:00
104b75b203
Update plugins.md
...
Add Convoy to Docker plugin list.
Signed-off-by: Sheng Yang <sheng.yang@rancher.com >
Upstream-commit: 5f156d8c2587018aa16c621a9a48c919465cf3f0
Component: engine
2015-08-25 12:01:31 -07:00
211c5a7ae6
Merge pull request #15824 from Microsoft/10662-moredocs
...
Windows: Minor doc clarification
Upstream-commit: 7dbb5fafcdfa8d83e131a94009907ff0cf7d019e
Component: engine
2015-08-25 13:30:54 -04:00
b6051b4d2b
Fix OpenRC init script
...
The shebang for OpenRC init scripts is now #!/sbin/openrc-run, and we
can also use the default start and stop functions built into OpenRC.
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com >
Upstream-commit: e3772538c0eb5c1478075979d222485cb3bd8c91
Component: engine
2015-08-25 12:02:01 -05:00
ba5891cb58
Drop execute bit from openrc init script
...
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com >
Upstream-commit: 1c0c68b18fe3a32f3e9915c3bf6ae50b69fee288
Component: engine
2015-08-25 12:00:54 -05:00
434547ed08
Merge pull request #14978 from gesellix/websocket-disable-check-origin
...
skip checkOrigin during websocket handshake
Upstream-commit: e134ccada7fae12271c4169e592b8bf09aff923d
Component: engine
2015-08-25 12:56:30 -04:00
77030d2282
Windows: Minor doc clarification
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 759ed647fbdb026ec91ba8ef84e0fac67b1c73bb
Component: engine
2015-08-25 09:36:51 -07:00
67834e90a3
Merge pull request #15818 from calavera/fix_api_json_examples
...
Fix json examples in the api reference.
Upstream-commit: 78698855ce248fb2fc3f23cba26abee073200e80
Component: engine
2015-08-25 09:22:38 -07:00
300f8e6fef
Allow vendoring netns change to build Docker on s390x
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: eecf6cd48cf7c48f00aa8261cf431c87084161ae
Component: engine
2015-08-25 15:07:17 +00:00
5e196ef2cc
Fix json examples in the api reference.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 7296c845b739ae4133e3d02d56cb7e8df29eb020
Component: engine
2015-08-25 10:55:12 -04:00
b498641d47
Merge pull request #14665 from coolljt0725/fix_build_with_resource_limit
...
Fix build with resource limit which system not support.
Upstream-commit: 6f8c4480e4f99b08c84d25f1611d6b12ee646066
Component: engine
2015-08-25 16:42:13 +02:00
