219c1dc7e6
Vendor new syslog library with TLS support.
...
The syslog package in the stdlib is not maintained anymore.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 145f020122681d4868f717d64dfa556db22ac83d
Component: engine
2016-01-08 12:35:35 -05:00
c67324aed2
Merge pull request #19180 from coolljt0725/fix_flaky_test
...
Fix flaky testTestStatsAllNewContainersAdded
Upstream-commit: 3a8d694e01d8c3353f49a3f220ee861769f8b4a5
Component: engine
2016-01-08 13:10:27 +01:00
68fdf5d8eb
Merge pull request #19058 from dnephin/move_opts_to_runconfig_opts
...
Move some opts validators to runconfig/opts where they are used
Upstream-commit: 018081d5a9acadb218e1284b11b200418aef5e0f
Component: engine
2016-01-08 12:34:49 +01:00
04c25bef6f
Merge pull request #19131 from cpuguy83/fix_plugin_error_handling
...
Don't error out on plugin err with json
Upstream-commit: f4f848b7a55f142befd13b76803d7d884f815419
Component: engine
2016-01-08 12:22:45 +01:00
1857956503
Fix flaky test TestStatsAllNewContainersAdded
...
Wait the new created container for running and then check if it
is in the docker stats to avoid flaky test.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 71d6e71cff4122a987a4655723d50a296916f523
Component: engine
2016-01-08 17:02:08 +08:00
6c383a05bb
Fix btrfs subvolume snapshot dir perms for user namespaces
...
Make sure btrfs mounted subvolumes are owned properly when a remapped
root exists (user namespaces are enabled, for example)
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 72e65e87935e5b82de76a6ef9b8160900f4724b7
Component: engine
2016-01-07 23:05:28 -05:00
083a35097b
Merge pull request #19173 from calavera/vendor_engine_api_0_1_2
...
Vendor engine-api 0.1.3
Upstream-commit: 611d5e4eebc4c6153e49a319360df8de5bdd2e7c
Component: engine
2016-01-07 19:19:19 -08:00
dbccbefa60
Make sure docker api client implements engine-api client.
...
- Use the master interface in the new repo.
- Use new structures for container create, update and network connect.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: e73ab750edc006324d1019b828c8ec9c551b9717
Component: engine
2016-01-07 21:02:19 -05:00
14985d55be
Vendor engine-api 0.1.3.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1feeecf6e58c3690347efed9c0712a698ff426f0
Component: engine
2016-01-07 21:02:19 -05:00
6ac9b9caaf
Merge pull request #19165 from shishir-a412ed/man_page_fix
...
man page fix: remove -e/--exec-drive=native related description
Upstream-commit: 6213cc9d0476ee43bc92e554f4775e33c3c4d38f
Component: engine
2016-01-07 16:47:07 -08:00
edc9578a83
Merge pull request #18378 from tonistiigi/content-addressability-storage-docs
...
Update storage docs for content-addressability
Upstream-commit: b12ef0fe00245ca549be5822d8b26033b59cff7a
Component: engine
2016-01-07 16:44:29 -08:00
f22c8d297c
Merge pull request #19145 from vdemeester/vendor-my-precious
...
Add a validate-vendor script
Upstream-commit: d76640d78a1a14b1f7f772c100a95cacfd30248c
Component: engine
2016-01-07 13:53:01 -08:00
5831ef280d
man page fix: remove -e/--exec-drive=native related description
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 50305d66f56774488b6fec2534fd592c263c91e0
Component: engine
2016-01-07 14:21:01 -05:00
3dff9074e8
Merge pull request #18768 from hqhq/hq_remove_dup_error
...
Remove redundant error messages
Upstream-commit: ff3b551d2d9c3f955509504b3cfc629c660909cb
Component: engine
2016-01-07 14:13:50 -05:00
183cea761e
Merge pull request #19059 from jfrazelle/seccomp-docs
...
add syscalls we purposely block to docs
Upstream-commit: cceac7da358c3e25130ce851312c44dd4418c1b2
Component: engine
2016-01-07 11:13:07 -08:00
40d1466ce7
Add a validate-vendor script
...
Makes sure that if ./hack/vendor.sh has been updated, it has been used
to update the vendor folder.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4c22c566e25ff2bc6fa80cd9627c59512a1f768d
Component: engine
2016-01-07 19:57:50 +01:00
6a1af5c70c
Merge pull request #19144 from LK4D4/fix_parent_systemd
...
Choose default-cgroup parent by cgroup driver
Upstream-commit: 938d28e772ec32ed3b09bfb8907852e497990076
Component: engine
2016-01-07 10:24:51 -08:00
4db7c3289b
add syscalls we purposely block to docs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 52f32818df8bad647e4c331878fa44317e724939
Component: engine
2016-01-07 10:22:16 -08:00
d19e17505e
Merge pull request #19156 from HackToday/19152-fix-voldoc
...
Remove the old reference link
Upstream-commit: 374a9596b22819ddcb1a981ea05a8ba3f4d4f0ed
Component: engine
2016-01-07 09:21:58 -08:00
d9a92e1dc3
Choose default-cgroup parent by cgroup driver
...
It's "/docker" for cgroupfs and "system.slice" for systemd.
Fix #19140
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c1cd45d547ef26cf988dc72d456430361dafcf08
Component: engine
2016-01-07 08:56:26 -08:00
3ccd6b28f2
Merge pull request #19068 from calavera/vendor_engine_api
...
Introduce the new engine-api library.
Upstream-commit: 131e2bf12b2e1b3ee31b628a501f96bbb901f479
Component: engine
2016-01-07 11:14:37 -05:00
c4d25ca65c
added documentation for groupadd within hostConfig that was added in remote api 1.20
...
Signed-off-by: Oliver Neal <ItsVeryWindy@users.noreply.github.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ade71ace7df285795381d1317f8069f14e099bb3
Component: engine
2016-01-07 12:30:27 +01:00
33bcd44d7d
Remove the old reference link
...
Fixes : #19152
As issue #14214 closed, so this old link is not needed.
We can remove it now.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: ca7b69016a13739db74eb09046d8344762a2caa4
Component: engine
2016-01-07 10:23:36 +00:00
25ac09e895
Merge pull request #19090 from thaJeztah/fix-api-markdown
...
fix markdown and typos in API docs
Upstream-commit: 3442339b98dccc7137ea8d49393eff44166a67ec
Component: engine
2016-01-07 08:32:01 +01:00
3e3964af2f
Merge pull request #19115 from cpuguy83/volume_plugin_docs_change.md
...
Add docs for volume plugin ls/get
Upstream-commit: af6c6dbf8748b0e09d48a788cb17cb6d3c30c7a4
Component: engine
2016-01-06 20:04:09 -08:00
e1187bdd34
Merge pull request #19127 from thaJeztah/use-the-f-luke
...
Add -f flag to cURL install instructions
Upstream-commit: dd2981c26dba1f6d87a2099b886c87aec259031d
Component: engine
2016-01-06 20:02:53 -08:00
6ca1360018
Remove types and lib packages from the engine.
...
They live in github.com/docker/engine-api now.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: c7d811c8161b1acc677b15f56b02c773824dfb87
Component: engine
2016-01-06 19:49:00 -05:00
4ec2693c9e
Modify import paths to point to the new engine-api package.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 907407d0b2e5863f0e1b40b93a356bbf03c7b9fb
Component: engine
2016-01-06 19:48:59 -05:00
e49de6ef58
Vendor engine-api project.
...
Use latest tag for both, engine-api and go-connections.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9927e712c0c5a04c2d802e160e27d3c16c650cf2
Component: engine
2016-01-06 19:46:06 -05:00
d39715c705
Merge pull request #19099 from calavera/replace_docker_only_trust_enabled
...
Do not perform build context switch when content trust is not enabled.
Upstream-commit: 7fab93175d605f98cddf811819d9ab081bb4f90e
Component: engine
2016-01-06 18:09:30 -05:00
f720f8755b
Merge pull request #19110 from brahmaroutu/update_openc
...
update runc to the latest code base to fix gccgo builds
Upstream-commit: 4ee3048fa8382f9e9af2418029b8e53885bb906a
Component: engine
2016-01-06 15:09:11 -08:00
57528b213f
Merge pull request #19141 from duglin/FixVendor
...
Update src with latest vendor.sh stuff
Upstream-commit: d2b8160513e8b43ce3b0e3a79df676f4a10a7974
Component: engine
2016-01-06 14:45:58 -08:00
371d581281
Merge pull request #19143 from duglin/AddMorgan
...
Add Morgan Bauer to docker/docker/MAINTAINERS
Upstream-commit: 18fdbdb07b7843eb2867fd8572fae5b0f4922049
Component: engine
2016-01-06 16:44:29 -05:00
19ff957d28
Update src with latest vendor.sh stuff
...
I **think** someone forgot to run vendor.sh after it was updated so
this just syncs things up.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 1698d49abcfb004c3665a9e039be3ba2cf09451d
Component: engine
2016-01-06 13:26:49 -08:00
a950282c26
Merge pull request #19142 from thaJeztah/update-runcom-email
...
Update antonio's e-mail address
Upstream-commit: 60e577c3b94aef656dad70e3c5f0e61aa41e5867
Component: engine
2016-01-06 22:21:56 +01:00
0aefc813f1
Add Morgan Bauer to docker/docker/MAINTAINERS
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: af0117cc8f3c3faa6017097977ed9bc484966f9a
Component: engine
2016-01-06 13:19:04 -08:00
b6c1a9dfa1
Update antonio's e-mail address
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bdce7dd5c87e76f41a0d8c129645c84d0779f5c0
Component: engine
2016-01-06 22:18:47 +01:00
419320ca33
Merge pull request #19039 from duglin/Issue19012
...
Add default PATH to 'scratch' images
Upstream-commit: f2036d1108951ad6e99b661ba52ee9200286add1
Component: engine
2016-01-06 11:19:39 -08:00
8a5a35e6dc
Merge pull request #16704 from manchoz/16695_manchoz_archarm
...
Add support for Arch Linux ARM base images generation (#16695 ).
Upstream-commit: 837de957177363947d5f303d82c972f304d8096b
Component: engine
2016-01-06 11:16:40 -08:00
b5c416d01d
Merge pull request #19136 from albers/completion-update
...
bash completion for `docker update`
Upstream-commit: 7104f58ac21b120d94357a736872c34c33018a4e
Component: engine
2016-01-06 10:36:15 -08:00
3f5eac3ef8
bash completion for docker update
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 97f84b5dc1d5326c4c56e5057a8c330725247b9d
Component: engine
2016-01-06 10:20:33 -08:00
69f0af2128
Add default PATH to 'scratch' images
...
Closes #19012
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: d3ea7e80e879b506bddffd51c3ab65b8078a34f4
Component: engine
2016-01-06 09:50:35 -08:00
07c9d25d11
Merge pull request #19093 from estesp/userns-root-rework
...
Allow root non-userns metadata backwards compatibility
Upstream-commit: fe550a1f17f9ef65e03db65241378d8f89ef4525
Component: engine
2016-01-06 09:48:37 -08:00
11307815af
Add docs for volume plugin ls/get
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5d1dd8069bd8217f946da531c2575280a68bc085
Component: engine
2016-01-06 12:42:44 -05:00
289db2e235
Merge pull request #19132 from icecrime/maintainer_add_tonis
...
Add Tõnis Tiigi to MAINTAINERS
Upstream-commit: 8420366e7c4c75c7ca540b2178a1748e619933aa
Component: engine
2016-01-06 09:34:38 -08:00
3cadddd18d
Merge pull request #18979 from jfrazelle/make-whitelist
...
Change seccomp blacklist to a whitelist
Upstream-commit: 4b1872f1ef08209426d7b9bd7fcbd703cf2c4b48
Component: engine
2016-01-06 09:15:25 -08:00
e18d559bb3
Add Tõnis Tiigi to MAINTAINERS
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 178806d2b8b1e3c2cebebacc2199128ec2c280d0
Component: engine
2016-01-06 08:51:52 -08:00
6262193ba3
Don't error out on plugin err with json
...
We don't want to error out when there is a json unmarshal error since
the `old way` will cause this to error.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 279dd092b6e9d5f6bb405440fa8d407349f5ad84
Component: engine
2016-01-06 11:34:14 -05:00
0cad98a56c
Add -f flag to cURL install instructions
...
From the -f description:
(HTTP) Fail silently (no output at all) on server errors. This is mostly done
to better enable scripts etc to better deal with failed attempts. In normal
cases when an HTTP server fails to deliver a document, it returns an HTML
document stating so (which often also describes why and more). This flag will
prevent curl from outputting that and return error 22.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9cf29be0ee0b19c25471c19c224f9af150beaf1e
Component: engine
2016-01-06 16:05:16 +01:00
7e1567846e
Do not perform build context switch when content trust is not enabled.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 18d15babefb4e89ac581a0b75455f83c6e7aae25
Component: engine
2016-01-05 19:23:20 -05:00
