85cfba650a
Merge pull request #15235 from charleswhchan/patch-1
...
Update docker_remote_api.md
Upstream-commit: 05529ab584f7ba245e9e522717b5e81acc103c9d
Component: engine
2015-08-02 19:17:22 +02:00
091a1141be
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 >
Upstream-commit: 084d46408160cf309bb7730a0ccb7fdd2f71c84e
Component: engine
2015-08-02 10:11:18 -07:00
6154bc2582
Merge pull request #15181 from Microsoft/10662-registermountpoints
...
Windows: Tidy/godoc volume*.go
Upstream-commit: ef24b8e485df8f5f165e501a131695d33b5f67b3
Component: engine
2015-08-02 13:04:48 -04:00
52775fed20
Merge pull request #15226 from vdemeester/3745-remote-TEST-env-test-from-daemon
...
Remove daemon check for TEST
Upstream-commit: bf384a3e4f6cde9613d251f0058b4de96a0d2f33
Component: engine
2015-08-01 13:10:02 -04:00
3022ea2e8f
Merge pull request #14539 from nhocki/improve-docs-for-execstart
...
Adding information about ExecStart configuration for systemd
Upstream-commit: 7feb176233f2cc86f249de8aa4c2e98095e8d324
Component: engine
2015-08-01 09:23:59 -07:00
4d3de26aff
Merge pull request #15209 from cpuguy83/15199_fix_tailing_more_than_available
...
Ensure reader position is at the end after tailing
Upstream-commit: d080d262b3f6c56f159f3ac714f207bac31c9b8e
Component: engine
2015-08-01 09:02:44 -07:00
53438e8738
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 >
Upstream-commit: 9af6b57a5d466ab3fdea0db8ba8d9a417519a63e
Component: engine
2015-08-01 15:13:38 +02:00
5ba7d4ff3b
Merge pull request #15220 from maaquib/15217-skip-TestRunCapAddSYSTIME-on-lxc
...
Skipping test TestRunCapAddSYSTIME on lxc
Upstream-commit: f9a2b3650b46136666aabdfb5a3bd325efbc13eb
Component: engine
2015-08-01 09:04:16 -04:00
23023fa5ed
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 >
Upstream-commit: c57faa91e2dab72a0a0905dc10e5cbdf55b545f5
Component: engine
2015-08-01 08:00:28 -04:00
7eec334052
Adding information about ExecStart configuration for systemsd
...
Closes #14491
Signed-off-by: Nicolás Hock Isaza <nhocki@gmail.com >
Upstream-commit: 6b44c05205a89e3208cd3a962d06641c7d52e512
Component: engine
2015-07-31 21:28:30 -05:00
9e93b28f16
skipping test TestRunCapAddSYSTIME on lxc
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
Upstream-commit: 84c9a6684ff159081850a60dd9cfa1f4d50ee6b8
Component: engine
2015-07-31 22:07:40 -04:00
03122f024f
Merge pull request #15144 from aaronlehmann/graph-cleanup
...
Documentation improvements and code cleanups for graph package
Upstream-commit: 8f2dca538619372663a94bc5141dbc7f121defb8
Component: engine
2015-07-31 15:11:34 -07:00
66c7ee5c73
Merge pull request #14960 from MHBauer/faq-links
...
Fix FAQ links
Upstream-commit: bb2039c9259581a1b445df584b53597f83bd1d91
Component: engine
2015-08-01 00:05:53 +02:00
14e1d4c1cc
Merge pull request #15207 from calavera/fix_index_locking
...
Remove read index that causes dead lock.
Upstream-commit: 3e0b0c59e6ae56454c3e68876cc1936f04999920
Component: engine
2015-07-31 14:55:00 -07:00
1169168d8c
Merge pull request #15005 from WeiZhang555/stats-block
...
Docker stats: display Block IO stats
Upstream-commit: 6fbacc6edb3db405a2e9acc5313cad4ef3d447b0
Component: engine
2015-07-31 13:59:55 -07:00
df2916dab1
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 >
Upstream-commit: 5ed84009b33642ca1f1eac8b99001842d93e2494
Component: engine
2015-07-31 13:53:17 -07:00
804da3f9c2
Tidy volume*.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 72c04ab87ce16ab592e66da1753c0dc6cdc89517
Component: engine
2015-07-31 13:13:40 -07:00
cd6fed98de
Merge pull request #15208 from albers/daemon-completion-fixes
...
Fixes to bash completion for docker daemon
Upstream-commit: ce99a462f82f163afb486abb6804c7293f09324a
Component: engine
2015-07-31 11:56:11 -07:00
6739612157
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 >
Upstream-commit: aab82c5c2230fa328bfac3c156b482634a42b73c
Component: engine
2015-07-31 20:16:33 +02:00
fceb28a0c5
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 >
Upstream-commit: e0dad9a153fb8aad44cc36aa4bd14e297b5f120c
Component: engine
2015-07-31 20:06:45 +02:00
f32577e8c4
Merge pull request #15201 from moul/names-generator-bin
...
pkg/namesgenerator: add a 'names-generator' binary
Upstream-commit: 0659ceb0d0a27d23d727d8d8e3428f59aa039d37
Component: engine
2015-07-31 13:09:02 -04:00
da82af9892
Merge pull request #15185 from aboch/vnd_lbn_1.8
...
Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
Upstream-commit: 9e9f3aa36b5286556c8f99557d8bcc66946598d3
Component: engine
2015-07-31 08:58:41 -07:00
f8cb968c76
Merge pull request #14463 from sunyuan3/TestRunCapAddSYSTIME
...
Add TestRunCapAddSYSTIME test case.
Upstream-commit: 5276655b694bec1125c4c119adb941a2b7531433
Component: engine
2015-07-31 09:40:12 -04:00
712ef17493
Docker stats: display Block IO stats
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 6a4ac63aaac829e94c7d6cbb31a8d36b93757620
Component: engine
2015-07-31 21:26:32 +08:00
2f7ecc6177
Merge pull request #15193 from jfrazelle/fix-lxc
...
fix lxc test machine
Upstream-commit: 1032202b88145478c2206873056497a03a758bb9
Component: engine
2015-07-31 09:13:52 -04:00
8b2de70434
Merge pull request #15191 from duglin/TlsTest
...
Add a test to make sure that --tlsverify=false turns on tls in daemon
Upstream-commit: 468bc7d819f37badde32fd6e45dae41149695a92
Component: engine
2015-07-31 08:54:35 -04:00
8a201393ad
pkg/namesgenerator: add a 'names-generator' binary
...
Signed-off-by: Manfred Touron <m@42.am >
Upstream-commit: 08006506651498cd8647123daadc7abde37ecb7d
Component: engine
2015-07-31 13:07:40 +02:00
e9bd79ecdf
Add TestRunCapAddSYSTIME test case.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: a5e2fa2b2e30cf515d22dee532ae33d5ab695008
Component: engine
2015-07-31 12:53:46 +08:00
4d212c22a0
fix lxc test machine
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: f12e18d7ef9b1a354c10038874f0e7be0a8bb66f
Component: engine
2015-07-30 21:30:47 -07:00
1d4ee6ca42
Add a test to make sure that --tlsverify=false turn on tls in daemon
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 5ced3ab3236bfe8ade1b5b6663599518086af7da
Component: engine
2015-07-30 21:21:24 -07:00
0514f6080b
Merge pull request #15179 from Microsoft/10662-yetmoretodos
...
Windows: Tidy verifyContainerSettings
Upstream-commit: 500a314713b9c2382c77d1d57cab960ce94f3661
Component: engine
2015-07-30 23:58:16 -04:00
6d44ed4263
Merge pull request #15175 from MHBauer/cliconfig-lint
...
additional lint fix and enable linter for cliconfig package
Upstream-commit: b48d744b07c5894a7c958f99320ea8a8b608308a
Component: engine
2015-07-30 23:07:19 -04:00
c85fe1e185
Merge pull request #14970 from tiborvass/windows-registry-endpoint
...
registry: Change default endpoint on windows to a windows-specific one
Upstream-commit: ad96fc310b52b41463ecc52f0a03c2022866e867
Component: engine
2015-07-30 22:41:34 -04:00
935ca110b9
Merge pull request #15123 from ewindisch/seed-pkgrand-cryptorand
...
Prefer crypto rand seed for pkg/rand
Upstream-commit: 9a9a12b35168c3b4391139982bc613db2ff97834
Component: engine
2015-07-30 22:41:17 -04:00
385c38be8c
Merge pull request #15146 from kolyshkin/mkdirall
...
Simplify and fix MkdirAll usage
Upstream-commit: 8d2739df980a1af76ad50e5c423134815186b61c
Component: engine
2015-07-30 22:40:57 -04:00
69fe9b7219
Merge pull request #15186 from brahmaroutu/btrfs_test_failure
...
fix unit test breakage due to lint changes
Upstream-commit: 0b089bc7d5bc8c70bb18c45bb4b6615038d7f7cf
Component: engine
2015-07-30 22:39:40 -04:00
512f9525b2
Merge pull request #15190 from tiborvass/bump-distrib
...
Update distribution to fix uuid.Loggerf initialization logic
Upstream-commit: e49ab10556366c6911c4fcbc36ec8d6bcd08e6a7
Component: engine
2015-07-30 19:19:36 -07:00
4e1e66e774
Merge pull request #15189 from jrabbit/fix-restart-policy-link
...
Docs: Actually link to restart policy information
Upstream-commit: e496d40107a4f6d12f2f154e5ca5a5f73403feef
Component: engine
2015-07-30 21:44:16 -04:00
61c2d57722
Use default no-op uuid.Loggerf for client cli
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 3face3c521127cb86570c68d5f2a8f55e7633146
Component: engine
2015-07-30 21:19:51 -04:00
b6aee824ae
Add missing LICENSE files for docker/notary
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 084af30f39ce4f00d2e3c379b8c5cc4f4d345ee0
Component: engine
2015-07-30 21:19:18 -04:00
0ed74d6e3a
Actually link to the information
...
Signed-off-by: jrabbit <jackjrabbit@gmail.com >
Upstream-commit: d2cd142ce1da96589902d07fddf3a12e63631d78
Component: engine
2015-07-30 21:16:45 -04:00
36d21e417b
Vendor docker/distribution to 7dc8d4a26b689bd4892f2f2322dbce0b7119d686
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 0cce1fb37ffbcb209826fdc98c3148fc5b1e2abd
Component: engine
2015-07-30 21:14:39 -04:00
40d1455b2e
Add test code to cover issue #14859
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 4964ab08218f3b40f5c3a6bf19fe74f7fb39562a
Component: engine
2015-07-30 17:37:11 -07:00
3f5b1423ad
Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 91274625ba43b5d059ac239bd3ca53006158b7a7
Component: engine
2015-07-30 17:28:40 -07:00
bdce5e6b99
fix unit test breakage due to lint changes
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 22873eae3153f93b55b3b09eff887a3bfdc8eb54
Component: engine
2015-07-31 00:22:28 +00:00
0a94a03fa6
Merge pull request #15184 from jfrazelle/fix-install
...
fix regression
Upstream-commit: ffeec2bdd1334fbef040e0536196f77feb156c73
Component: engine
2015-07-30 16:59:13 -07:00
ac2320f2b1
Merge pull request #15180 from tiborvass/fix-v1-mirror-fallback
...
registry: allow fallback on unknown errors
Upstream-commit: e2b2c2ae819890d123c4569f1167ad2faa491d58
Component: engine
2015-07-30 19:54:48 -04:00
9b3fa793ce
Merge pull request #15174 from Microsoft/10662-top
...
Windows: Top (non-)implementation
Upstream-commit: 044b56e94fcb1def77efda36a2cf60f97e82e866
Component: engine
2015-07-30 19:49:15 -04:00
d1ebdf9030
fix regression
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: b0af811272c7cf9d7694ab5a21ded776a46a7d7a
Component: engine
2015-07-30 16:38:51 -07:00
5a700e39a6
Merge pull request #15154 from stefanberger/apparmor-engine
...
contrib: Extend engine apparmor profile for tools needed by devicemapper
Upstream-commit: f8f4deb0b2c52d97322a9c66d05ee8d4d8a4d665
Component: engine
2015-07-30 19:22:28 -04:00
