Commit graph

17491 commits

Author SHA1 Message Date
Jenny Gebske
a12a781b5e [docs] Add instruction to start docker on Ubuntu
I just tried the installation but docker didn't start automatically. So I had to execute the newly added command in order to get the hello-world verification running.

Signed-off-by: Jenny Gebske <jennifer@gebske.de>
2015-08-06 13:55:32 +02:00
Sebastiaan van Stijn
ad5355151c Merge pull request #15335 from moxiegirl/boot2docker-remove-refs
Boot2Docker Cleanup
2015-08-06 08:48:57 +02:00
Brian Goff
5b289cd1aa Merge pull request #15313 from Microsoft/10662-fixcertdir
Windows: [TP3] Fix certificate directory for registry
2015-08-05 22:59:51 -04:00
Mary Anthony
cc375a1e48 - Remove references to sudo in basics.md; see sudo instructions top of file
- Removing references to Boot2Docker replacing with Docker Machine
- Removing sudo warnings in instances where appropriate (no sudo in file)
- Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-05 19:45:43 -07:00
Tibor Vass
3273209a9c Merge pull request #15075 from hqhq/hq_move_cpushare_change
Cleanup: Merge adjustCpuShares to adoptContainerSettings
2015-08-05 21:53:58 -04:00
Alexander Morozov
263220fa30 Merge pull request #15354 from coolljt0725/remove_redundant_ip_forward_check
Remove redundant ip_forward check
2015-08-05 18:52:44 -07:00
Alexander Morozov
af9dc3050b Merge pull request #15353 from jlhawn/fixing-concurrency-trust
[graph] Use a pipe for downloads to write progress
2015-08-05 18:52:27 -07:00
Antonio Murdaca
6805241fe2 Merge pull request #15352 from icecrime/fix_pause_tests
Use busybox in 'pause' tests
2015-08-06 03:14:44 +02:00
Josh Hawn
d80c4244d3 [graph] Use a pipe for downloads to write progress
The process of pulling an image spawns a new goroutine for each layer in the
image manifest. If any of these downloads fail we would stop everything and
return the error, even though other goroutines would still be running and
writing output through a progress reader which is attached to an http response
writer. Since the request handler had already returned from the first error,
the http server panics when one of these download goroutines makes a write to
the response writer buffer.

This patch prevents this crash in the daemon http server by waiting for all of
the download goroutines to complete, even if one of them fails. Only then does
it return, terminating the request handler.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-08-05 18:13:39 -07:00
Lei
6a0050d0f0 Remove redundant ip_forward check
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-06 09:06:31 +08:00
Jessie Frazelle
efe4f0dfa9 Merge pull request #15119 from xnox/sdnotify
systemd: set service type to notify.
2015-08-05 17:42:58 -07:00
Arnaud Porterie
3529e3dac7 Use busybox in 'pause' tests
Don't assume that any random image will have 'top' and explicitely use
the busybox image for testing.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-08-05 17:35:20 -07:00
Qiang Huang
e0af23dc18 Cleanup: Merge adjustCPUShares to adoptContainerSettings
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-08-06 08:15:14 +08:00
Antonio Murdaca
044c4e00a0 Merge pull request #15334 from Mashimiao/change-name-check-for-image-delete
image_delete: move name check first
2015-08-06 02:07:34 +02:00
Tibor Vass
8534090476 Merge pull request #15252 from coolljt0725/14765_enable_golint_3
Enable golint in pkg/archive
2015-08-05 19:27:48 -04:00
Tibor Vass
d93eca2250 Merge pull request #15345 from calavera/fix_ps_format_error
Fail fail when the ps format template is invalid.
2015-08-05 19:19:33 -04:00
Jessie Frazelle
a8e67849b9 Merge pull request #15001 from fmoliveira/master
Adding support for elementary OS distro in install script.
2015-08-05 16:14:47 -07:00
Sebastiaan van Stijn
565535073f Merge pull request #15346 from Microsoft/minortypo
Minor typo in test-and-docs.md
2015-08-05 22:27:18 +02:00
John Howard
831b00303f Windows: Fix certificate directory for registry
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-05 13:25:41 -07:00
John Howard
b5eea8f33b Minor typo in test-and-docs.md
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-05 13:22:39 -07:00
David Calavera
3d3db0d4af Fail fail when the ps format template is invalid.
Fixes error continuing execution when the parsing fails.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-05 13:22:24 -07:00
Alexander Morozov
aec46ac0b2 Merge pull request #15336 from Microsoft/fixwindowsci
Windows: Fix for CI
2015-08-05 13:11:59 -07:00
John Howard
ac120567e8 Windows: Workaround for CI
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-05 11:20:30 -07:00
Ma Shimiao
cb2def9f90 image_delete: move name check first
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-08-06 00:27:45 +08:00
moxiegirl
6206cbe193 Merge pull request #15305 from vdemeester/contribution-docs-updates
Update some contributions documentations
2015-08-05 08:46:53 -07:00
Doug Davis
a15b676ee1 Merge pull request #15318 from Microsoft/10662-fixmasteragain
Windows: Fix docker/master daemon compile again
2015-08-05 08:32:12 -04:00
John Howard
67e670b79f Windows: Fix docker/master daemon compile again
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-04 19:32:05 -07:00
Arnaud Porterie
7374852be9 Merge pull request #14921 from aaronlehmann/int64
Fix uses of "int" where "int64" should be used instead
2015-08-04 19:16:13 -07:00
Arnaud Porterie
b985dca578 Merge pull request #15241 from vdemeester/api-test-coverage
Add more unit tests (coverage) to package api
2015-08-04 18:41:35 -07:00
Arnaud Porterie
2c3cd949c8 Merge pull request #15269 from brahmaroutu/lint_daemon_graphdriver_zfs
daemon/graphdriver/zfs fix lint errrors/warnings
2015-08-04 18:41:02 -07:00
Arnaud Porterie
7b077c16d6 Merge pull request #15302 from LK4D4/update_libcontainer
Update runc to v0.0.3
2015-08-04 18:40:32 -07:00
Filipe Oliveira
f618de1543 Adding support to forked distributions in installer script.
Signed-off-by: Filipe Oliveira <contato@fmoliveira.com.br>
2015-08-04 21:33:48 -03:00
David Calavera
58121c59ff Merge pull request #15304 from jfrazelle/only-sign-files-changes-within-last-2-hours
only sign the files that were changed in the last 2 hours
2015-08-04 14:16:20 -07:00
Tibor Vass
63940145a4 Merge pull request #15303 from Microsoft/10662-fixdaemonbuild
Windows: Daemon compile was broken
2015-08-04 16:48:11 -04:00
Jessica Frazelle
efd47654dd only sign the files that were changed in the last 2 hours
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-04 13:16:57 -07:00
Sebastiaan van Stijn
d4d3504122 Merge pull request #15301 from jfrazelle/fix-systemd-docs
update systemd article to reference dropin file
2015-08-04 22:12:36 +02:00
Vincent Demeester
b304920021 Update some contributions documentations
- Add a golint entry to coding-style.md

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-08-04 22:04:11 +02:00
John Howard
fe8cfc5b39 Windows: Daemon compile was broken
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-04 12:42:41 -07:00
Antonio Murdaca
23dab01ed2 Merge pull request #14840 from HuKeping/golint-pkg-sysinfo
Fix golint warning on pkg/sysinfo
2015-08-04 20:57:39 +02:00
Srini Brahmaroutu
e27c904b99 daemon/graphdriver/zfs fix lint errrors/warnings
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-08-04 18:30:55 +00:00
Jessica Frazelle
35e7a7c3e2 update systemd article to reference dropin file
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-04 11:03:43 -07:00
Vincent Demeester
f7e43d45b3 Add more unit tests (thus coverage) to pkg api
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-08-04 19:51:02 +02:00
Alexander Morozov
a4ddf0e362 Update runc to v0.0.3
This fixes criu behavior with mounted cgroups.
It includes also update of go-systemd dependecy.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-08-04 10:47:59 -07:00
Sebastiaan van Stijn
0f49141150 Merge pull request #15300 from l0rd/test-and-docs-fix
Removed `docs-test` from Makefile rules list
2015-08-04 19:41:48 +02:00
Jessie Frazelle
c4b9884ab5 Merge pull request #15260 from albers/completion-config
Add `--config` to bash completion
2015-08-04 10:14:15 -07:00
Arnaud Porterie
2c6fa8375b Merge pull request #15291 from duglin/FixInspectExecId
Another try to fix InspectExecID
2015-08-04 10:13:42 -07:00
Doug Davis
fe6a7c8e57 Another try to fix InspectExecID
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-08-04 09:21:41 -07:00
moxiegirl
c5e0ea02f7 Merge pull request #15297 from lerignoux/15296-updating-docs-README-new-md-file
Removing deprecated notice to update mkdocs.yml in docs README
2015-08-04 09:04:21 -07:00
Mario Loriedo
5237670b5b Removed docs-test from Makefile rules list
Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
2015-08-04 15:57:42 +00:00
moxiegirl
be07c53d2d Merge pull request #15259 from sallyom/manFixes
make man/docker.1.md consistent with docker --help
2015-08-04 08:34:52 -07:00