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

17633 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Arnaud Porterie
67bca8ab8a Merge pull request #15215 from dmcgowan/notary-update 
Notary updates
 2015-08-03 09:06:09 -07:00
moxiegirl
1367bb41fc Merge pull request #15249 from Evalle/15198-fix-path-to-routing-menu 
Fix wrong path to YaST's 'Routing' menu for openSUSE Tumbleweed
 2015-08-03 09:04:10 -07:00
moxiegirl
cc5cd65e6d Merge pull request #15248 from vdemeester/userguide-fixes 
Fix "Getting started" link in userguide
 2015-08-03 09:00:18 -07:00
moxiegirl
d136f5e027 Merge pull request #15102 from moxiegirl/fix-run-headings 
Several fixes in formatting
 2015-08-03 08:46:15 -07:00
Mary Anthony
70aa63b92a Several fixes in formatting 
- fixing headings in run.md
- creating a table for readability
- adding index for logging
- moving logging overview into logging
- Updating with Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-08-03 08:45:25 -07:00
Alexander Morozov
69f3def58d Merge pull request #15225 from runcom/add-restart-always-test-on-daemon-restart 
test: daemon restart with containers running with restart always policy manually stopped
 2015-08-03 08:40:44 -07:00
Alexander Morozov
3f23ae663b Merge pull request #15244 from hqhq/hq_remove_closeOnce 
Remove unused variable
 2015-08-03 08:39:43 -07:00
Brian Goff
1a77580030 Split API handlers into domain specific files 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-08-03 11:12:44 -04:00
evalle
5f1593c7b8 Fix wrong path to YaST's 'Routing' menu for openSUSE Tumbleweed 
Signed-off-by: evalle <shmarnev@gmail.com>
 2015-08-03 12:01:25 +02:00
Vincent Demeester
5d57f56362 Fix "Getting started" link in userguide 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-08-03 11:48:59 +02:00
Brian Goff
dce1488ae5 Merge pull request #15013 from coolljt0725/14756_enbale_golint_1 
Enable golint, part of #14756
 2015-08-02 22:14:18 -04:00
Qiang Huang
f9b5eb0cac Fix golint warnings for daemon/execdriver/windows 
Addresses: #14756

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-03 09:54:02 +08:00
Stephen Rust
8b15b7958a Docs: Add Blockbridge volume plugin 
Signed-off-by: Stephen Rust <srust@blockbridge.com>
 2015-08-02 21:48:46 -04:00
Lei Jitang
27a8f9937e Enable golint part of #14756 
pkg/broadcastwriter
pkg/graphdb
pkg/httputils
pkg/ioutils

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-08-03 09:45:05 +08:00
Qiang Huang
f5557f4f43 Remove unused variable 
Introduced by #15209 unintentionally.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-03 09:14:52 +08:00
Sebastiaan van Stijn
05529ab584 Merge pull request #15235 from charleswhchan/patch-1 
Update docker_remote_api.md
 2015-08-02 19:17:22 +02:00
Charles Chan
084d464081 Update docker_remote_api.md 
Minor fixes:
* v1.19: GET /containers/(id)/logs - add missing '/'
* v1.18: Break up POST /containers/create and POST /containers/(id)/start into separate lines.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2015-08-02 10:11:18 -07:00
Brian Goff
ef24b8e485 Merge pull request #15181 from Microsoft/10662-registermountpoints 
Windows: Tidy/godoc volume*.go
 2015-08-02 13:04:48 -04:00
Antonio Murdaca
af59c80b4a test: daemon restart with containers running with restart always policy 
manually stopped

If a container is running with a restart policy of always and it's
manually stopped, then on daemon restart it will be running.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-08-02 11:14:01 +02:00
Tibor Vass
bf384a3e4f Merge pull request #15226 from vdemeester/3745-remote-TEST-env-test-from-daemon 
Remove daemon check for TEST
 2015-08-01 13:10:02 -04:00
moxiegirl
7feb176233 Merge pull request #14539 from nhocki/improve-docs-for-execstart 
Adding information about ExecStart configuration for systemd
 2015-08-01 09:23:59 -07:00
Alexander Morozov
d080d262b3 Merge pull request #15209 from cpuguy83/15199_fix_tailing_more_than_available 
Ensure reader position is at the end after tailing
 2015-08-01 09:02:44 -07:00
Harald Albers
69cde5a302 Filter completions of docker inspect by --type 
Completion now filters the images and containers by given
`--type`.

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-01 08:36:00 -07:00
Vincent Demeester
9af6b57a5d Remove daemon check for TEST 
Closes #3745

I think DEBUG is still used (might be wrong though) and according to
https://github.com/docker/docker/issues/3745#issuecomment-76035979 there
is now nothing in integration (all has been migrated to integration-cli)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-08-01 15:13:38 +02:00
Brian Goff
f9a2b3650b Merge pull request #15220 from maaquib/15217-skip-TestRunCapAddSYSTIME-on-lxc 
Skipping test TestRunCapAddSYSTIME on lxc
 2015-08-01 09:04:16 -04:00
Brian Goff
c57faa91e2 Ensure reader position is at the end after tailing 
After tailing a file, if the number of lines requested is > the number
of lines in the file, this would cause a json unmarshalling error to
occur when we later try to go follow the file.
So brute force set it to the end if any tailing occurred.

There is potential that there could be some missing log messages if logs
are being written very quickly, however I was not able to make this
happen even with `while true; do echo hello; done`, so this is probably
acceptable.

While testing this I also found a panic in LogWatcher.Close can be
called twice due to a race. Fix channel close to only close when there
has been no signal to the channel.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-08-01 08:00:28 -04:00
Hu Keping
7390cc5300 Fix golint warning on pkg/sysinfo 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-08-01 18:24:49 +08:00
Nicolás Hock Isaza
6b44c05205 Adding information about ExecStart configuration for systemsd 
Closes #14491

Signed-off-by: Nicolás Hock Isaza <nhocki@gmail.com>
 2015-07-31 21:28:30 -05:00
Mohammed Aaqib Ansari
84c9a6684f skipping test TestRunCapAddSYSTIME on lxc 
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
 2015-07-31 22:07:40 -04:00
Derek McGowan
6ce76cd9ed Updated to use latest version of notary 
Update UX to use aliases for root, snapshot, and target key

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-07-31 17:32:35 -07:00
Derek McGowan
d594c6fcd8 Vendor latest notary 
Use updated notary to pick up updates from security review

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-07-31 17:32:35 -07:00