b8e884831a
Use busybox in 'pause' tests
...
Don't assume that any random image will have 'top' and explicitely use
the busybox image for testing.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 3529e3dac78a18df46d4010a58c9f9d741b42fab
Component: engine
2015-08-05 17:35:20 -07:00
acc8db8b85
Merge pull request #15305 from vdemeester/contribution-docs-updates
...
Update some contributions documentations
Upstream-commit: 6206cbe19350d8df7199573c79c981af5fc72b1d
Component: engine
2015-08-05 08:46:53 -07:00
5dd4ca1927
Windows: Fix docker/master daemon compile again
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 67e670b79f1ed372b62058ebadd5821fa85cd737
Component: engine
2015-08-04 19:32:05 -07:00
aa73b79fe2
Merge pull request #14921 from aaronlehmann/int64
...
Fix uses of "int" where "int64" should be used instead
Upstream-commit: 7374852be9def787921aea2ca831771982badecf
Component: engine
2015-08-04 19:16:13 -07:00
9f7d6bbf8a
Merge pull request #15241 from vdemeester/api-test-coverage
...
Add more unit tests (coverage) to package api
Upstream-commit: b985dca5783f8e5bc067b9f79d8a7f53f71536e6
Component: engine
2015-08-04 18:41:35 -07:00
a1cfc26eb3
Merge pull request #15269 from brahmaroutu/lint_daemon_graphdriver_zfs
...
daemon/graphdriver/zfs fix lint errrors/warnings
Upstream-commit: 2c3cd949c8db8f8bacccbd79c3f5650c8b32cabc
Component: engine
2015-08-04 18:41:02 -07:00
ff1d8010b3
Merge pull request #15302 from LK4D4/update_libcontainer
...
Update runc to v0.0.3
Upstream-commit: 7b077c16d6f657309b48b05b941d3b09a705c827
Component: engine
2015-08-04 18:40:32 -07:00
db1c12e1e7
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
Upstream-commit: 58121c59ffb3cf4795225dc1f71f3ccb1f5cf7c9
Component: engine
2015-08-04 14:16:20 -07:00
47e71fa895
Merge pull request #15303 from Microsoft/10662-fixdaemonbuild
...
Windows: Daemon compile was broken
Upstream-commit: 63940145a465ff76b856648b570a367e5c614a54
Component: engine
2015-08-04 16:48:11 -04:00
40a95ce695
only sign the files that were changed in the last 2 hours
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: efd47654dd923577b6694f8ef3dddb3ac3b51816
Component: engine
2015-08-04 13:16:57 -07:00
5f1a727f3d
Merge pull request #15301 from jfrazelle/fix-systemd-docs
...
update systemd article to reference dropin file
Upstream-commit: d4d3504122211812401456e69cf4852365977a32
Component: engine
2015-08-04 22:12:36 +02:00
bc9b99ad99
Update some contributions documentations
...
- Add a golint entry to coding-style.md
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b30492002172a525513a2c411ebae22149dd4476
Component: engine
2015-08-04 22:04:11 +02:00
e94fbdc264
Windows: Daemon compile was broken
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: fe8cfc5b39ffca9f15bc5f005164aa31754ee991
Component: engine
2015-08-04 12:42:41 -07:00
f031716448
Merge pull request #14840 from HuKeping/golint-pkg-sysinfo
...
Fix golint warning on pkg/sysinfo
Upstream-commit: 23dab01ed245c5a5132a2deb7ea26c0a984ec198
Component: engine
2015-08-04 20:57:39 +02:00
cc6eee4f4a
daemon/graphdriver/zfs fix lint errrors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: e27c904b99e49e82f8d527e78161118d2b800523
Component: engine
2015-08-04 18:30:55 +00:00
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
4b1fbc6af4
Add more unit tests (thus coverage) to pkg api
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f7e43d45b396d6c1f7d8f3f0606917501f466015
Component: engine
2015-08-04 19:51:02 +02:00
772d6ad7e5
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 >
Upstream-commit: a4ddf0e3624c9e05172d1ad7841f87720a4c9c87
Component: engine
2015-08-04 10:47:59 -07:00
2d50f13b4a
Merge pull request #15300 from l0rd/test-and-docs-fix
...
Removed `docs-test` from Makefile rules list
Upstream-commit: 0f491411500eeb18a6be2416fecfcd200e02db08
Component: engine
2015-08-04 19:41:48 +02:00
3b294e8970
Merge pull request #15260 from albers/completion-config
...
Add `--config` to bash completion
Upstream-commit: c4b9884ab511801d446e5f63bcb1604d9bc775c2
Component: engine
2015-08-04 10:14:15 -07:00
dd5a03a657
Merge pull request #15291 from duglin/FixInspectExecId
...
Another try to fix InspectExecID
Upstream-commit: 2c6fa8375ba1b124abf46d8ea6fd874146b8db60
Component: engine
2015-08-04 10:13:42 -07:00
b6bee43e0c
Another try to fix InspectExecID
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: fe6a7c8e57c1cf7cf7cbc501fa2006c8eaf412f1
Component: engine
2015-08-04 09:21:41 -07:00
5866811776
Merge pull request #15297 from lerignoux/15296-updating-docs-README-new-md-file
...
Removing deprecated notice to update mkdocs.yml in docs README
Upstream-commit: c5e0ea02f77b2249a5a452ae6a37511ef20e15af
Component: engine
2015-08-04 09:04:21 -07:00
ce6d511a95
Removed docs-test from Makefile rules list
...
Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com >
Upstream-commit: 5237670b5b9b1953a93e0f5ab83a0140ef037186
Component: engine
2015-08-04 15:57:42 +00:00
ea3fc05262
Merge pull request #15259 from sallyom/manFixes
...
make man/docker.1.md consistent with docker --help
Upstream-commit: be07c53d2d2d5aafde85068ed98a8e4b202e8978
Component: engine
2015-08-04 08:34:52 -07:00
5d5181b3aa
Removing deprecated notice to update mkdocs.yml in docs README
...
Signed-off-by: Laurent Erignoux <lerignoux@gmail.com >
Upstream-commit: ac1794d3e299cb3b69edfd4241f22501b7282320
Component: engine
2015-08-04 15:15:46 +02:00
6d8b655cbf
Merge pull request #15236 from charleswhchan/patch-1
...
Fix #15212 : Add "Label" key to output of /containers/json
Upstream-commit: bc1209425117b6e1e80b3dba0259a24ff87835dc
Component: engine
2015-08-04 21:48:39 +10:00
fcc2624be6
Break long command to avoid cropping
...
Fixes docker/docker#14558
Signed-off-by: Francesc Campoy <campoy@google.com >
Upstream-commit: 16b5b6e49f3ee1a327216ec9b6fe4b857f3ea7a2
Component: engine
2015-08-03 18:36:32 -07:00
e2641596d8
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 >
Upstream-commit: b245bcd458492c9b348b790a9422dd7478f9af83
Component: engine
2015-08-03 18:11:33 -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
4b0a938070
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 >
Upstream-commit: f3bea61c8011e177e9035325e2007865994d838d
Component: engine
2015-08-03 15:12:33 -04: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
b601aef207
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 >
Upstream-commit: b898111d3aac00305e93cec15c5ba8fe8decd0a1
Component: engine
2015-08-03 19:03:43 +02: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
