0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
17462 commits 14 branches 412 tags 338 MiB
Commit graph

17462 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Laurent Erignoux
ac1794d3e2 Removing deprecated notice to update mkdocs.yml in docs README 
Signed-off-by: Laurent Erignoux <lerignoux@gmail.com>
 2015-08-04 15:15:46 +02:00
Sven Dowideit
bc12094251 Merge pull request #15236 from charleswhchan/patch-1 
Fix #15212: Add "Label" key to output of /containers/json
 2015-08-04 21:48:39 +10:00
Sebastiaan van Stijn
c26c1eb8ba Merge pull request #15278 from campoy/14558-break-long-command 
Break long command to avoid cropping
 2015-08-04 08:27:55 +02:00
Francesc Campoy
16b5b6e49f Break long command to avoid cropping 
Fixes docker/docker#14558

Signed-off-by: Francesc Campoy <campoy@google.com>
 2015-08-03 18:36:32 -07:00
Charles Chan
b245bcd458 Fix #15212: Add "Labels" key to output of /containers/json 
Applied retroactively from API v1.18 - v1.21.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2015-08-03 18:11:33 -07:00
Jessie Frazelle
dff25c9e46 Merge pull request #15277 from calavera/check_apparmor_docker_contrib 
Include apparmor/docker only when it exists.
 2015-08-03 17:36:23 -07:00
David Calavera
408cffac94 Include apparmor/docker only when it exists. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-08-03 17:34:04 -07:00
David Calavera
d7c2fe0f20 Merge pull request #15276 from aboch/24 
Fix preallocated bridge networks
 2015-08-03 17:21:03 -07:00
Alessandro Boch
dab0447ae0 Fix preallocated bridge networks 
- Because of a bug, all the statically preallocated
  bridge networks have /24 as network mask.

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-08-03 16:37:01 -07:00
Arnaud Porterie
ff3adb135d Merge pull request #15114 from hqhq/hq_exedriver_win_lint 
Fix golint warnings for daemon/execdriver/windows
 2015-08-03 16:28:47 -07:00
Jessie Frazelle
8d3bc4b98c Merge pull request #15261 from LK4D4/fix_fluentd_vendor 
Fix vendoring for fluent-logger-golang
 2015-08-03 16:13:05 -07:00
David Calavera
40bd10dc95 Merge pull request #15273 from calavera/remove_new_key_path_on_error 
Remove key file when migration fails.
 2015-08-03 16:07:22 -07:00
David Calavera
dfb63b0425 Merge pull request #15255 from crosbymichael/lxc-dep 
Add LXC built in support deprecation notice
 2015-08-03 15:36:43 -07:00
David Calavera
07c45e499d Remove key file when migration fails. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-08-03 15:29:54 -07:00
Michael Crosby
06f6c0c7e5 Add LXC built in support deprecation notice 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-08-03 14:54:42 -07:00
David Calavera
e84a938f2e Merge pull request #15222 from jlhawn/error_on_v2pull_hash_mismatch 
[Re]Enforce manifest/layer digest verification
 2015-08-03 13:02:52 -07:00
Sally O'Malley
f3bea61c80 make man/docker.1.md consistent with docker --help 
"Options:" listed when you run "docker --help" and "docker daemon
--help" do not match the options listed in "man/docker.1.md".  This PR
makes 'docker --help', 'docker daemon --help' and 'man docker' consistent.
Also 2 typo fixes.

Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-08-03 15:12:33 -04:00
David Calavera
00c1874b8e Merge pull request #15092 from brahmaroutu/lint_daemon_graphdriver_vfs 
daemon/graphdriver/vfs fix lint errors/warnings
 2015-08-03 11:50:05 -07:00
Josh Hawn
de52a3bcaa [graph] Enforce manifest/layer digest verification 
We noticed a regression since the 1.7.1 patch after some refactoring. This
patch corrects the behavior and adds integration tests for modified manifest
and rootfs layer blobs.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-08-03 11:41:23 -07:00
Tibor Vass
102724700b Merge pull request #13698 from cpuguy83/split_api_routes_from_setup 
Move api handlers to separate file
 2015-08-03 14:03:15 -04:00
Srini Brahmaroutu
3e7f9c636a daemon/graphdriver/vfs fix lint errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-08-03 17:46:42 +00:00
Alexander Morozov
ef7bb7242f Fix vendoring for fluent-logger-golang 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-08-03 10:23:50 -07:00
Harald Albers
b898111d3a Add --config to bash completion 
The custom configuration will also be used in docker invocations made
by the completion script itself, just like `-H`.

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-03 19:03:43 +02:00
Brian Goff
b9aaf8c758 Merge pull request #15257 from sallyom/manTypo 
Typo fix: man/docker-tag.1.md
 2015-08-03 12:53:04 -04:00
Sally O'Malley
70ac38025c Typo fix: man/docker-tag.1.md 
Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-08-03 12:51:10 -04:00
David Calavera
637cf3a4b7 Merge pull request #15233 from srust/add_blockbridge_volume_plugin 
Docs: Add Blockbridge volume plugin
 2015-08-03 09:46:33 -07:00
David Calavera
137995cb94 Merge pull request #15229 from albers/completion-inspect-filter-by-type 
Filter completions of `docker inspect` by `--type`
 2015-08-03 09:45:21 -07:00