07c45e499d
Remove key file when migration fails.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-03 15:29:54 -07:00
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
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
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
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
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
b9aaf8c758
Merge pull request #15257 from sallyom/manTypo
...
Typo fix: man/docker-tag.1.md
2015-08-03 12:53:04 -04:00
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
637cf3a4b7
Merge pull request #15233 from srust/add_blockbridge_volume_plugin
...
Docs: Add Blockbridge volume plugin
2015-08-03 09:46:33 -07:00
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
67bca8ab8a
Merge pull request #15215 from dmcgowan/notary-update
...
Notary updates
2015-08-03 09:06:09 -07:00
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
cc5cd65e6d
Merge pull request #15248 from vdemeester/userguide-fixes
...
Fix "Getting started" link in userguide
2015-08-03 09:00:18 -07:00
d136f5e027
Merge pull request #15102 from moxiegirl/fix-run-headings
...
Several fixes in formatting
2015-08-03 08:46:15 -07:00
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
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
3f23ae663b
Merge pull request #15244 from hqhq/hq_remove_closeOnce
...
Remove unused variable
2015-08-03 08:39:43 -07:00
1a77580030
Split API handlers into domain specific files
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-08-03 11:12:44 -04:00
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
5d57f56362
Fix "Getting started" link in userguide
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-08-03 11:48:59 +02:00
dce1488ae5
Merge pull request #15013 from coolljt0725/14756_enbale_golint_1
...
Enable golint, part of #14756
2015-08-02 22:14:18 -04:00
8b15b7958a
Docs: Add Blockbridge volume plugin
...
Signed-off-by: Stephen Rust <srust@blockbridge.com>
2015-08-02 21:48:46 -04:00
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
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
05529ab584
Merge pull request #15235 from charleswhchan/patch-1
...
Update docker_remote_api.md
2015-08-02 19:17:22 +02:00
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
ef24b8e485
Merge pull request #15181 from Microsoft/10662-registermountpoints
...
Windows: Tidy/godoc volume*.go
2015-08-02 13:04:48 -04:00
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
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
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
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
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
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
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
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
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
84c9a6684f
skipping test TestRunCapAddSYSTIME on lxc
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
2015-07-31 22:07:40 -04:00
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
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
8f2dca5386
Merge pull request #15144 from aaronlehmann/graph-cleanup
...
Documentation improvements and code cleanups for graph package
2015-07-31 15:11:34 -07:00
bb2039c925
Merge pull request #14960 from MHBauer/faq-links
...
Fix FAQ links
2015-08-01 00:05:53 +02:00
3e0b0c59e6
Merge pull request #15207 from calavera/fix_index_locking
...
Remove read index that causes dead lock.
2015-07-31 14:55:00 -07:00
6fbacc6edb
Merge pull request #15005 from WeiZhang555/stats-block
...
Docker stats: display Block IO stats
2015-07-31 13:59:55 -07:00
5ed84009b3
Remove read index that causes dead lock.
...
Let the iterator to lock the index when it needs it.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-31 13:53:17 -07:00
72c04ab87c
Tidy volume*.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-31 13:13:40 -07:00
ce99a462f8
Merge pull request #15208 from albers/daemon-completion-fixes
...
Fixes to bash completion for docker daemon
2015-07-31 11:56:11 -07:00
aab82c5c22
Fix completion of commands after a global option with arg
...
Without this fix, `docker -l info ` would not complete the commands.
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-31 20:16:33 +02:00
e0dad9a153
Add completion of global options to `docker daemon`
...
It's a bit confusing: the "global options" are valid as "global options"
for all client commands (i.e. all but daemon).
Example: `docker --log-level info run`
For `docker daemon`, these "global options" are only valid as "command
options".
Example: `docker daemon --log-level info`
As command completion cannot tell which command the user is going to
type next, completion for the daemon command has to allow illegal
syntaxes like
`docker --log-level info daemon --log-level info`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-31 20:06:45 +02:00
0659ceb0d0
Merge pull request #15201 from moul/names-generator-bin
...
pkg/namesgenerator: add a 'names-generator' binary
2015-07-31 13:09:02 -04:00
9e9f3aa36b
Merge pull request #15185 from aboch/vnd_lbn_1.8
...
Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
2015-07-31 08:58:41 -07:00
David Calavera
Josh Hawn
Tibor Vass
Srini Brahmaroutu
Brian Goff
Sally O'Malley
Arnaud Porterie
moxiegirl
Alexander Morozov
evalle
Vincent Demeester
Stephen Rust
Lei Jitang
Qiang Huang
Sebastiaan van Stijn
Charles Chan
Antonio Murdaca
Harald Albers
Nicolás Hock Isaza
Mohammed Aaqib Ansari
Derek McGowan
John Howard
Tianon Gravi
Michael Crosby