David Calavera
243f98ff6d
Fix server header parsing.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-28 11:06:24 -04:00
Kristina Zabunova
f753f6d597
unit test refactor in pkg/httputils as suggested by vdemeester; using pattern if x := …; x == nil {}
...
Signed-off-by: Kristina Zabunova <triara.xiii@gmail.com>
(cherry picked from commit c3f1b2a5bd4a4330bcbad401c316af90925b99ad)
2015-08-28 10:41:19 -04:00
Kristina Zabunova
b3f999e863
Increased test coverage of httputils to 70 %
...
Signed-off-by: Kristina Zabunova <triara.xiii@gmail.com>
(cherry picked from commit d71817464e859cd323d6cdaf4dec5a9dd530f57e)
2015-08-28 10:41:19 -04:00
Sebastiaan van Stijn
fdc73cc3fc
Merge pull request #15778 from dharmit/13595-update-docs-process-interaction-container
...
Added note about process interaction with container in detached mode
2015-08-27 22:39:20 +02:00
Brian Goff
ba019dc0d0
Merge pull request #15882 from vdemeester/14756-lint-opts-trust
...
Carry #14813 on linting package opts and trust
2015-08-27 15:58:13 -04:00
Alexander Morozov
0ca2c3abf5
Merge pull request #15893 from tonistiigi/fix-testsuite
...
Use DockerSuite for PullClientDisconnect test
2015-08-27 12:30:44 -07:00
Tonis Tiigi
9dd6c8822d
Use DockerSuite for PullClientDisconnect test
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-08-27 11:22:54 -07:00
moxiegirl
04b0fb6314
Merge pull request #15822 from vdemeester/docs-update-filtering-ps-and-images
...
Update filtering chapters on ps/images references
2015-08-27 10:39:20 -07:00
David Calavera
0634c653d5
Merge pull request #15646 from tonistiigi/15589-pull-cancellation
...
Fix pull on client disconnect
2015-08-27 17:54:08 +02:00
Vincent Demeester
0bd016b1c3
Finish linting opts and trust package.
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-08-27 17:36:11 +02:00
Sevki Hasirci
5572148477
golint: trust
...
contributes to #14756
Signed-off-by: Sevki Hasirci <s@sevki.org>
2015-08-27 11:40:27 +02:00
Sevki Hasirci
6eb03c53db
Opts lint issues, ip and ulimit
...
Signed-off-by: Sevki Hasirci <s@sevki.org>
2015-08-27 11:40:27 +02:00
David Calavera
4579d5ac78
Merge pull request #15878 from brahmaroutu/vendor_netns
...
Allow vendoring netns changes to build Docker on s390x
2015-08-27 10:02:25 +02:00
Vincent Demeester
61de442c49
Update filtering chapters on ps/images references
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-08-27 08:47:03 +02:00
Dharmit Shah
9f8891a855
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>
2015-08-27 09:39:34 +05:30
Sebastiaan van Stijn
44ea7e91fb
Merge pull request #15760 from mikebrow/9235-improve-documentation
...
Improvement to userguide/dockerrepos/ documentation
2015-08-27 01:21:12 +02:00
Mike Brown
5caccd27cd
improvement to documentation
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2015-08-26 16:49:31 -05:00
moxiegirl
5e8038d0b0
Merge pull request #15773 from charleswhchan/patch-3
...
Fix #14572 : Improve explaination for using `RUN` command inside Docke…
2015-08-26 14:19:44 -07:00
Alexander Morozov
459c2c66c3
Merge pull request #15801 from jfrazelle/btrfs-rm-subvolume-recursion
...
remove btrfs subvolumes when destroying containers (recursive)
2015-08-26 14:00:53 -07:00
Alexander Morozov
7a74422724
Merge pull request #15826 from Microsoft/start-from-one
...
Builder counts from 1
2015-08-26 13:59:38 -07:00
Alexander Morozov
70a814c3f3
Merge pull request #15493 from stevvooe/no-buffer-on-push
...
Avoid buffering to tempfile when pushing with V2
2015-08-26 13:59:01 -07:00
moxiegirl
ea65c38ac0
Merge pull request #15843 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 #15865 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 #14242 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 #15848 from calavera/revert_ipc_mounts
...
DO NOT MERGE: Check if these commits broke the builds.
2015-08-26 10:29:25 -07:00
John Howard
17d6c6c7e5
Builder counts from 1
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-26 10:05:04 -07:00
David Calavera
7ef08f39ed
Merge pull request #15850 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 #13304 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 #15711 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
Charles Chan
b6621a1b6c
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>
2015-08-25 21:58:20 -07:00
Sven Dowideit
8720f71b52
Merge pull request #15836 from rsmitty/issue-15835
...
Resolves link to introduction to Docker
2015-08-26 12:06:29 +10:00
Sven Dowideit
3bc375c6e4
Merge pull request #15831 from yasker/master
...
Update plugins.md
2015-08-26 12:05:35 +10:00
Sven Dowideit
a0f6ff7d58
Merge pull request #15838 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 #15821 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
Jessica Frazelle
bd06432ba3
cleanup and fix btrfs subvolume recursion deletion
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-25 13:00:41 -07: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 #15824 from Microsoft/10662-moredocs
...
Windows: Minor doc clarification
2015-08-25 13:30:54 -04:00
Brian Goff
e134ccada7
Merge pull request #14978 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 #15818 from calavera/fix_api_json_examples
...
Fix json examples in the api reference.
2015-08-25 09:22:38 -07:00
Srini Brahmaroutu
eecf6cd48c
Allow vendoring netns change to build Docker on s390x
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-08-25 15:07:17 +00:00