Commit Graph

20819 Commits

Author SHA1 Message Date
382aba32a8 Make docker load to output json when the response content type is json.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9fd2c0feb0c131d01d727d50baa7183b976c7bdc
Component: engine
2015-12-22 19:00:27 -05:00
13048f0ce1 Merge pull request #18831 from calavera/test_event_observer
Extract event processing to a common function for testing.
Upstream-commit: eacedcbe21e15f396ea1d9f620047718cce03df7
Component: engine
2015-12-22 15:04:32 -08:00
6fc9c2e476 Merge pull request #18757 from thaJeztah/patch-release-process
Document process for patch-releases
Upstream-commit: 45033c0bdee09d63c6f92de6d71028a5b0a152d2
Component: engine
2015-12-22 23:42:34 +01:00
8bcec320d6 Merge pull request #18858 from thaJeztah/adieu-vieux
Move Victor to alumni
Upstream-commit: 319d488e6e66112ddf0f14072591fe0bf4461ec3
Component: engine
2015-12-22 14:38:54 -08:00
143c9b690b Merge pull request #18762 from calavera/runconfig_to_types
Move container configuration types to api/types/container.
Upstream-commit: 030347c3c9505fa80eed0ecfde5d1e9af05c3cbc
Component: engine
2015-12-22 14:22:08 -08:00
dadaf8ff90 Extract event processing to a common function for testing.
We keep only one logic to test event related behavior that will help us
diagnose flacky event errors.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: af51df20bdd9962b1aaa79819cafefc715290d28
Component: engine
2015-12-22 17:10:06 -05:00
a9fe9a6c5b Merge pull request #18857 from calavera/catch_pipeline_error
Catch command pipeline error.
Upstream-commit: 9f228b37fc1108bee544973841513ffd0d06035c
Component: engine
2015-12-22 13:34:56 -08:00
db95b6f873 Merge pull request #18856 from albers/completion-network-rm
remove `--format` from bash completion for `docker network rm`
Upstream-commit: 0bbed98bc0f4456f8e2be8e91e978dd167113678
Component: engine
2015-12-22 12:38:11 -08:00
8e30598fab Merge pull request #18855 from rhatdan/volume-tmpfs
No options to tmpfs is valid
Upstream-commit: 9c89e83ff1b8d6598b487bebbbc29cef58840cc0
Component: engine
2015-12-22 12:24:51 -08:00
608da884be Catch command pipeline error.
Rather than ignoring errors in the pipeline, return an execution error
and do not proceed with the latest command in the pipeline.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f38257308b12ecf6de7ce72895a6430d6a3dc775
Component: engine
2015-12-22 15:17:15 -05:00
d09f09929b remove --format from bash completion for docker network rm
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f03695efc100a8f35e73bf51fc694e370e019d25
Component: engine
2015-12-22 11:35:41 -08:00
47e00eae65 No options to tmpfs is valid
If you run a

docker run command with --tmpfs /mountpoint:noexec

Or certain options that get translated into mount options, the mount command can get passed "" for mount data.
So this should be valid.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 89a775d2dc596b9ac86873edf447fff2f7012ef3
Component: engine
2015-12-22 14:15:07 -05:00
027f002cb3 Move Config and HostConfig from runconfig to types/container.
- Make the API client library completely standalone.
- Move windows partition isolation detection to the client, so the
  driver doesn't use external types.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 7ac4232e70fe7cf7318333cd0890db7f95663079
Component: engine
2015-12-22 13:34:30 -05:00
2ecbc5b7f6 Remove usage of runconfig.ConvertKVStringsToMap in the API client library.
It's a very simple function that we can duplicate.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 747dccde41762f10d0afcdd9b243fb1ea85cbd9f
Component: engine
2015-12-22 13:31:46 -05:00
f1f019f89d Move ExecConfig to types.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 839f73c3028629ac1dde6617d6466b98f2bde416
Component: engine
2015-12-22 13:31:46 -05:00
b006691148 Replace usage of pkg/nat with go-connections/nat.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 056e7449039af522fa0a1567ef67916eaa0de93e
Component: engine
2015-12-22 13:31:46 -05:00
3b25d376dd Move blkiodev package to types.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0aab83d996f645a2e1e28b1e2c03b530c13a5fc1
Component: engine
2015-12-22 13:31:46 -05:00
d6be4062df Vendor new connections library.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: ad7fa0110206de6ff53825afb17cb8bbf181785d
Component: engine
2015-12-22 13:31:46 -05:00
7e8fcbf740 Move StrSlice to types.
This is a very docker concept that nobody elses need.
We only maintain it to keep the API backwards compatible.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f9b857a200696b07b67e6a7f94ede32487f5649d
Component: engine
2015-12-22 13:31:43 -05:00
7bdc187f53 Merge pull request #18765 from Mashimiao/update-blkio-weight-device-test
update Blkio Tests name
Upstream-commit: 81c8e4d4c8937980f16ef7ac95d1710b5122aa46
Component: engine
2015-12-22 09:53:22 -08:00
56e3702320 Merge pull request #18844 from hqhq/hq_mv_oom_disable
Move OomKillDisable to resource
Upstream-commit: ac1187dc8d5b264bfa06a91ae3a300bdf4e7adbc
Component: engine
2015-12-22 18:52:24 +01:00
bcd4ff1dab Merge pull request #18837 from thaJeztah/remove-darwin-i386
Don't build Darwin 32-bit binaries
Upstream-commit: ff796e5bf740dba44c88132406892bf4c7050a92
Component: engine
2015-12-22 09:51:29 -08:00
455533c9e7 Merge pull request #18851 from thaJeztah/update-contributing
Update contributing.md
Upstream-commit: b5fb5b9d006a7a392396fcdbc9490b89634dce63
Component: engine
2015-12-22 09:49:53 -08:00
7572160b03 Merge pull request #18852 from errordeveloper/master
Update link for Weave Net plugin docs
Upstream-commit: 61e28f17a3524f2efffbd9c4f999b16ccf1c9236
Component: engine
2015-12-22 18:32:38 +01:00
89fa05b282 Update link for Weave Net plugin docs
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
Upstream-commit: 45241d36d349e0802cf12a2437a732b8c8c18479
Component: engine
2015-12-22 16:45:54 +00:00
8da2c14d42 Merge pull request #18847 from albers/completion-rename-functions
Better function names in bash completion
Upstream-commit: 5b913de5e68690c79563feb9a5082d5915371dcf
Component: engine
2015-12-22 08:43:08 -08:00
563cdbee11 Merge pull request #18821 from oyld/script_fix
Fix syntax error in init script
Upstream-commit: eafecff25894cdf030f7c1994b384afce183881e
Component: engine
2015-12-22 06:48:22 -08:00
bca02abda3 Update contributing.md
- Add a link to the new procedures for adding maintainers
- Remove section about monthly IRC meetings, which are in flux

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6150157e8f00d957b279483a7b21e4f299318a98
Component: engine
2015-12-22 15:42:36 +01:00
03d3eb96c2 Move Victor to alumni
Victor is now a maintainer for Docker Swarm, and no
longer active as a maintainer for this repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ff3687c965dc544df6cbe9c4616f2aa601a13853
Component: engine
2015-12-22 15:00:21 +01:00
2d930c1a34 Better function names in bash completion
The new names make it easier to distinguish between helper functions and
functions that actually perform completion by modifying the global COMPOPT
variable.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e715daab3d531725dc4faef2265337d133bd16bc
Component: engine
2015-12-22 13:38:02 +01:00
02f28288ea Fix syntax error in init script
Signed-off-by: oyld <oyld0210@163.com>
Upstream-commit: bbbc01b86edf9a5676ad735d008097942e0a93ac
Component: engine
2015-12-22 04:00:00 -08:00
885ff722b9 Move OomKillDisable to resource
1. It's a cgroup api, fit the general defination that we take
cgroup options as kind of resource options.
2. It's common usage and very helpful as explained here:
https://github.com/docker/docker/pull/18270#issuecomment-160561316
3. It's already in `Resource` struct in
daemon/execdriver/driver_unix.go

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8498ed73f7b35da807b5d5dcf532114c7b3df52d
Component: engine
2015-12-22 16:08:04 +08:00
8c2d6245d9 upate TestRunWithBlkioInvalidWeightDevice with clearly invalid device name
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 673f2b8697727a0f0bfb3c4bd049cdac89a5a508
Component: engine
2015-12-22 12:43:42 +08:00
73614850c7 Don't build Darwin 32-bit binaries
The last 32-bit OS X computers were built in 2006,
so we probably don't need these anymore.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 814ce44d5ad442b940e44b41eff00bac0e579fc6
Component: engine
2015-12-22 00:08:18 +01:00
161c03c6c1 Merge pull request #15879 from Mashimiao/add-support-blkio_throtte_iops
Add support for blkio read/write iops device
Upstream-commit: 312c82677bdc86d50b483d642ad8c61f1c840c55
Component: engine
2015-12-21 23:45:18 +01:00
a9aa983363 Merge pull request #18809 from thaJeztah/EOL-ubuntu-15.04-vivid
Remove Ubuntu 15.04 (Vivid) from DEB build for 1.10 as it will be EOL
Upstream-commit: eff810aed688879f67a3730c41d9adce4637470f
Component: engine
2015-12-21 22:02:18 +01:00
8ae70ed554 Merge pull request #18811 from runcom/fix-volume-debug
volume: store: store.go: fix debug message
Upstream-commit: 8537501ebd433d19eeae99664d78dc9f2cecf05c
Component: engine
2015-12-21 13:18:39 -05:00
c127109fa3 volume: store: store.go: remove debug message
When driver is `local` an empty string is given to the debug message.
This patch removes the debug statement.

```
Dec 20 19:07:01 localhost.localdomain docker[19734]:
time="2015-12-20T19:07:01.872021857+01:00" level=debug msg="Registering
new volume reference: driver , name
c2291b964b4d7b1b51ec51d2ccfe2544f83fd23404709225a43743c5faadad55"
```

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 23a18b5f93b4dfbed419509589687220e5aff487
Component: engine
2015-12-21 19:14:27 +01:00
8ec62ec94b Merge pull request #18830 from calavera/tls_verify_godoc
Add godoc comment about client tls verification.
Upstream-commit: 1a8e8f2967c8f17072d4f2b43ad0c69dd6952ac8
Component: engine
2015-12-21 10:02:32 -08:00
f15d9f32b3 Merge pull request #18828 from albers/completion-plugins
Use computed plugin lists in bash completion
Upstream-commit: 88c4d4a94306f6cd6e415eb0ddd887f3fabe8a0e
Component: engine
2015-12-21 09:57:48 -08:00
306ef7b263 Merge pull request #17692 from vdemeester/images-format
Add --format support to images command
Upstream-commit: 42460b6772323552bfb58ae703124145ffd8a56b
Component: engine
2015-12-21 09:57:29 -08:00
141f74a2b0 Add godoc comment about client tls verification.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 4e2c0f385c3032b0b15105c81b18e3981e6e40ad
Component: engine
2015-12-21 12:55:37 -05:00
3e4663395d Use computed plugin lists in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2033c09705dc14ea32a23a9fa78d5b7d0cac1229
Component: engine
2015-12-21 18:30:23 +01:00
e025e5f279 Merge pull request #17428 from ripcurld00d/cli_ninja_build
Change the quiet flag behavior in the build command [closes #17623]
Upstream-commit: f4ea3b2cb1d864ac6f1c7063da87b62b9191aaac
Component: engine
2015-12-21 17:59:16 +01:00
f41d29a49b Add --format support to images command
- rename `api/client/ps` to `api/client/formatter`
- add a a image formatter

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 34a3c3cacf2fd827f13a5e37541acff1409658c4
Component: engine
2015-12-21 17:38:07 +01:00
1c5df6581b Change the quiet flag behavior in the build command
Right now, the quiet (-q, --quiet) flag ignores the output
generated from within the container.

However, it ought to be quiet in a way that all kind
of diagnostic output should be ignored, unless the build
process fails.

This patch makes the quiet flag behave in the following way:
 1. If the build process succeeds, stdout contains the image ID
    and stderr is empty.
 2. If the build process fails, stdout is empty and stderr
    has the error message and the diagnostic output of that process.

If the quiet flag is not set, then everything goes to stdout
and error messages, if there are any, go to stderr.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 60b4db7eb17f4eb509be4a4968364ada2075d60c
Component: engine
2015-12-21 16:38:50 +02:00
fc63a9d65d Merge pull request #18820 from vdemeester/oups-fix-api-ps-unit-tests
Fix the api/client/ps unit tests.
Upstream-commit: 67620bc0288ae7ecb12511879e6eb605e98594a1
Component: engine
2015-12-21 14:01:27 +01:00
3dcfd49f35 Fix the api/client/ps unit tests.
TestFormat was depending on the time so (comparing again
1970-01-01).. at some point it was bounded to fail >_<. Updating it to
be *not* time-dependent :).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: bb853137bea8481037b88d16eeb6499b8ed63a81
Component: engine
2015-12-21 11:07:14 +01:00
7363973c86 Merge pull request #18804 from mqliang/patch-6
Update selectadriver.md
Upstream-commit: 6d04d9cda8061456b921569266ca9f996c4b7eae
Component: engine
2015-12-21 09:56:05 +01:00
51d11f3a43 update document
Signed-off-by: mqliang <mqliang.zju@gmail.com>
Upstream-commit: 41c2dab459ff9e4075e15889b7aea03cab58ce71
Component: engine
2015-12-21 11:53:38 +08:00