5df863af84
update systemd article to reference dropin file
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 35e7a7c3e2f0e7329ef666b0e5078b39626befd2
Component: engine
2015-08-04 11:03:43 -07:00
78c95b1e80
Include apparmor/docker only when it exists.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 408cffac942f7c3efa3a51bdcfac694298ae0c17
Component: engine
2015-08-03 17:34:04 -07:00
3e038be591
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 >
Upstream-commit: dab0447ae0c6d1355cf4708743973121cd55462a
Component: engine
2015-08-03 16:37:01 -07:00
3700154a99
Merge pull request #15114 from hqhq/hq_exedriver_win_lint
...
Fix golint warnings for daemon/execdriver/windows
Upstream-commit: ff3adb135deef895e4726a720b8f72d631eb0177
Component: engine
2015-08-03 16:28:47 -07:00
ee0574ea56
Merge pull request #15261 from LK4D4/fix_fluentd_vendor
...
Fix vendoring for fluent-logger-golang
Upstream-commit: 8d3bc4b98c00d6ec41d99e3d4b73a8d48726c8ba
Component: engine
2015-08-03 16:13:05 -07:00
bff805c3fb
Merge pull request #15273 from calavera/remove_new_key_path_on_error
...
Remove key file when migration fails.
Upstream-commit: 40bd10dc958cdc9a7ef58f61504ec3d65e74d5d8
Component: engine
2015-08-03 16:07:22 -07:00
2ed38fa3eb
Merge pull request #15255 from crosbymichael/lxc-dep
...
Add LXC built in support deprecation notice
Upstream-commit: dfb63b042568b0f4fd42bc2710761e5897a4f133
Component: engine
2015-08-03 15:36:43 -07:00
f99b218f2a
Remove key file when migration fails.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 07c45e499d5dc04b009d522ebbdcbfebe7e7aba9
Component: engine
2015-08-03 15:29:54 -07:00
2bffc18a77
Add LXC built in support deprecation notice
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 06f6c0c7e50ea0df588d1d873783f326c23f195a
Component: engine
2015-08-03 14:54:42 -07:00
ef1e59f5e4
Merge pull request #15222 from jlhawn/error_on_v2pull_hash_mismatch
...
[Re]Enforce manifest/layer digest verification
Upstream-commit: e84a938f2ee700886fa05f9f4970ac0e9b8f6231
Component: engine
2015-08-03 13:02:52 -07:00
8b27766210
Merge pull request #15092 from brahmaroutu/lint_daemon_graphdriver_vfs
...
daemon/graphdriver/vfs fix lint errors/warnings
Upstream-commit: 00c1874b8eda52d56e658ea0bda11eb14062cde9
Component: engine
2015-08-03 11:50:05 -07:00
d08d95f41d
[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)
Upstream-commit: de52a3bcaa1742054be184cc3465f0933f6d383a
Component: engine
2015-08-03 11:41:23 -07:00
a4a7851f11
Merge pull request #13698 from cpuguy83/split_api_routes_from_setup
...
Move api handlers to separate file
Upstream-commit: 102724700bf816a826da30d4eb35b51486413ccc
Component: engine
2015-08-03 14:03:15 -04:00
4244c48345
daemon/graphdriver/vfs fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 3e7f9c636a4c74610a0da72937e54fb5a8000c25
Component: engine
2015-08-03 17:46:42 +00:00
331aa42849
Fix vendoring for fluent-logger-golang
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ef7bb7242f1155f7c87912d154a0493a36f23bb0
Component: engine
2015-08-03 10:23:50 -07:00
da245c81bd
Merge pull request #15257 from sallyom/manTypo
...
Typo fix: man/docker-tag.1.md
Upstream-commit: b9aaf8c7589ff5d67ea873c9b81ad9aa481ff169
Component: engine
2015-08-03 12:53:04 -04:00
79561d0a17
Typo fix: man/docker-tag.1.md
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: 70ac38025cdd58bbf795b3a0bc47814dc4fd937d
Component: engine
2015-08-03 12:51:10 -04:00
c16ee87f87
Merge pull request #15233 from srust/add_blockbridge_volume_plugin
...
Docs: Add Blockbridge volume plugin
Upstream-commit: 637cf3a4b73fd5684a965c877d678387f5a7146c
Component: engine
2015-08-03 09:46:33 -07:00
2fb5eae4bb
Merge pull request #15229 from albers/completion-inspect-filter-by-type
...
Filter completions of `docker inspect` by `--type`
Upstream-commit: 137995cb94532ab5aaff6752e75f314246d4df2a
Component: engine
2015-08-03 09:45:21 -07:00
4cc2a3f443
Merge pull request #15215 from dmcgowan/notary-update
...
Notary updates
Upstream-commit: 67bca8ab8adf1e99c2be7f9b170a140b4c27ab3d
Component: engine
2015-08-03 09:06:09 -07:00
5e11aab67e
Merge pull request #15249 from Evalle/15198-fix-path-to-routing-menu
...
Fix wrong path to YaST's 'Routing' menu for openSUSE Tumbleweed
Upstream-commit: 1367bb41fc8d46891af470b444c694de81f171b5
Component: engine
2015-08-03 09:04:10 -07:00
74d2bf6a9c
Merge pull request #15248 from vdemeester/userguide-fixes
...
Fix "Getting started" link in userguide
Upstream-commit: cc5cd65e6d67311d862b853f2ec5960f82dc3e41
Component: engine
2015-08-03 09:00:18 -07:00
eb14818dc3
Merge pull request #15102 from moxiegirl/fix-run-headings
...
Several fixes in formatting
Upstream-commit: d136f5e027e30ac1f92938c7e5ea72b00f49dfc0
Component: engine
2015-08-03 08:46:15 -07:00
255ee9aa6c
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 >
Upstream-commit: 70aa63b92a1aba21a0276904c9447ac7c5114f50
Component: engine
2015-08-03 08:45:25 -07:00
dc8515ec8a
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
Upstream-commit: 69f3def58de3a4d8172f1c64996a2d2d117e4bd3
Component: engine
2015-08-03 08:40:44 -07:00
127013774a
Merge pull request #15244 from hqhq/hq_remove_closeOnce
...
Remove unused variable
Upstream-commit: 3f23ae663bd59891e86791057067c60e6651f94d
Component: engine
2015-08-03 08:39:43 -07:00
0cd1b722f7
Split API handlers into domain specific files
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 1a77580030439cef25e8f987b03733f173662746
Component: engine
2015-08-03 11:12:44 -04:00
f0e94927fa
Fix wrong path to YaST's 'Routing' menu for openSUSE Tumbleweed
...
Signed-off-by: evalle <shmarnev@gmail.com >
Upstream-commit: 5f1593c7b8cba267fb044156e152b7afcbcc2cd4
Component: engine
2015-08-03 12:01:25 +02:00
0ae7f92229
Fix "Getting started" link in userguide
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5d57f56362448908e518922032aac297a1f2c4db
Component: engine
2015-08-03 11:48:59 +02:00
5947da9f2e
Merge pull request #15013 from coolljt0725/14756_enbale_golint_1
...
Enable golint, part of #14756
Upstream-commit: dce1488ae56df8c4fe8cac4dde1858745f7f8cbf
Component: engine
2015-08-02 22:14:18 -04:00
0711faa61b
Fix golint warnings for daemon/execdriver/windows
...
Addresses: #14756
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: f9b5eb0cacf87b9e1c5b2aaea30c9774cf60897a
Component: engine
2015-08-03 09:54:02 +08:00
2e4a0c6586
Docs: Add Blockbridge volume plugin
...
Signed-off-by: Stephen Rust <srust@blockbridge.com >
Upstream-commit: 8b15b7958a9bb1298f8d82676c1ddef47fdc054d
Component: engine
2015-08-02 21:48:46 -04:00
e840b8ec78
Enable golint part of #14756
...
pkg/broadcastwriter
pkg/graphdb
pkg/httputils
pkg/ioutils
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 27a8f9937ece67015d06b219bb8aa5cc4f6b7d32
Component: engine
2015-08-03 09:45:05 +08:00
ed793e492c
Remove unused variable
...
Introduced by #15209 unintentionally.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: f5557f4f43ba89a448131fbca8094f9cf8ddb097
Component: engine
2015-08-03 09:14:52 +08:00
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
ba8c4244c7
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 >
Upstream-commit: af59c80b4afb2448927f56df2029eec0ae81b00c
Component: engine
2015-08-02 11:14:01 +02: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
7a79af52b9
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 >
Upstream-commit: 69cde5a3024b04a59125512ebe9c504ebea2c1ac
Component: engine
2015-08-01 08:36:00 -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
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
dd73699a9b
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)
Upstream-commit: 6ce76cd9ed0e014e109ec632fa21b7e853f56951
Component: engine
2015-07-31 17:32:35 -07:00
cb79d90bc2
Vendor latest notary
...
Use updated notary to pick up updates from security review
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: d594c6fcd8fbe295a87cfc2af70456be4e58c24d
Component: engine
2015-07-31 17:32:35 -07: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
