Commit Graph

22112 Commits

Author SHA1 Message Date
39a54ff7ac Cleanup WriteFlusher
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 96f1a1a10b63ac446f0d9da8521cd871212a1063
Component: engine
2016-02-09 14:02:26 -05:00
d2b4b76ae0 Merge pull request #19983 from srust/volume_get_compat_hack
[1.10] Fix volume driver API compatibility mode (a little)
Upstream-commit: 10226ac845e5a13350c5c4e5667cc2602c196112
Component: engine
2016-02-09 10:47:30 -08:00
cb2b73c937 Merge pull request #20157 from chadswen/fix-typo-toolbox-upgrade
Fix typo in Docker Toolbox upgrade section
Upstream-commit: a03c2a005a0928e7e847be26c8fefd4f30a8d816
Component: engine
2016-02-09 18:14:30 +00:00
c2c6a44646 Merge pull request #20090 from albers/completion-map-values
Improve key specific bash subcompletions
Upstream-commit: 9f2f52de8e6412738457b7b6846d2d9037bef6a1
Component: engine
2016-02-09 17:39:35 +00:00
5934d3cb06 Fix typo in Docker Toolbox upgrade section
Signed-off-by: Chad Swenson <chadswen@gmail.com>
Upstream-commit: 1435c9ea21d6c76a923c2501abb840e899b5ed1e
Component: engine
2016-02-09 11:36:45 -06:00
7c786e7b60 Merge pull request #20117 from twistlock/userns_tests
Move userns cli test to a separate file, remove experimental flag
Upstream-commit: d2a2f5bedc1c3bfca6423b647c0186f65cd31012
Component: engine
2016-02-09 09:10:44 -08:00
23e36e7084 Merge pull request #20130 from Microsoft/sjw/windows_save_fix
Fixing 'docker save' on Windows.
Upstream-commit: 01a19257923af7fc02bb24113148818a0facb441
Component: engine
2016-02-09 07:47:58 -08:00
d6af17ee30 Merge pull request #20116 from muthu-r/master
Add Horcrux volume plugin to plugins.md
Upstream-commit: f5ed72c931d373bd56069d44ba3b7370acd1f475
Component: engine
2016-02-09 09:59:26 +00:00
67892dedf8 Move userns cli test to a separate file, remove experimental flag
Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: df636ef45addcb6ff2555e3da2bc61fc25cc5603
Component: engine
2016-02-09 09:31:09 +02:00
4075818bf4 Fix volume driver API compatibility mode (a little)
Signed-off-by: Stephen Rust <srust@blockbridge.com>
Upstream-commit: c3985bdf797a4526eac5fb0bd92047ac0f8513d9
Component: engine
2016-02-08 23:12:29 -05:00
0b639e2753 Fixing 'docker save' on Windows.
Save was failing file integrity checksums due to bugs in both
Windows and Docker. This commit includes fixes to file time handling
in tarexport and system.chtimes that are necessary along with
the Windows platform fixes to correctly support save. With this
change, sysfile_backups for windowsfilter driver are no longer
needed, so that code is removed.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: 041a9510c671ecf4724bf15388fdb9de549b04ed
Component: engine
2016-02-08 18:08:49 -08:00
eca7daefb9 Add Horcrux volume plugin to plugins.md
Signed-off-by: Muthukumar R <muthur@gmail.com>
Upstream-commit: 58427fd8a684f0e4b999d99d6a123b40112d2094
Component: engine
2016-02-08 15:16:56 -08:00
bef9eb0770 Merge pull request #20118 from aditirajagopal/20110-update-client-lib-projects
Update List of Client Library Projects
Upstream-commit: ac9d1b7b47c8fb429f7f84477a042dd9d58e858f
Component: engine
2016-02-08 15:06:53 -08:00
5f7a1b8686 Merge pull request #19772 from calavera/decouple-server-routers
[Carry 19133] Decouple server routers from the daemon package.
Upstream-commit: 8c6887c54d033107d66ca70f0c84736fe4b90775
Component: engine
2016-02-08 17:54:49 -05:00
5bd791913c Merge pull request #20106 from jfrazelle/go-generate-json-default-profile
add default seccomp profile as json
Upstream-commit: 3846951fce14d7e66a9e51fefcaadece47bd5ab4
Component: engine
2016-02-08 14:48:34 -08:00
87068955df Update List of Client Library Projects
Resolves: #20110
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: 47dbb59e5b5d3472f9391e965131015d83d614a4
Component: engine
2016-02-08 16:16:42 -06:00
71232b661d Merge pull request #19711 from coolljt0725/fix_19679
Clean up container rootf mounts on daemon start, fixes #19679
Upstream-commit: 54b67fe12fb20bdd920d0335f70720ca3e60f505
Component: engine
2016-02-08 16:21:50 -05:00
cb9f693ca8 add validation for generating default secccomp profile
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 9bc771af9d09026111916191394eb2896608eb59
Component: engine
2016-02-08 13:04:52 -08:00
d40e26fc39 Merge pull request #20109 from thaJeztah/add_tcp_tls_proto
Fix 'tcp+tls' protocol not being accepted
Upstream-commit: 14c63189a1dec205b9e2d64482cff30a1af6b5ac
Component: engine
2016-02-08 11:22:33 -08:00
d3f629ad43 Merge pull request #20112 from endophage/notary_go15
adding note about go version 1.5 requirement for hardware signing
Upstream-commit: 4c807379cbd7e18a7072e458c4b1692cfaa873c3
Component: engine
2016-02-08 14:19:42 -05:00
a332573aa7 adding note about go version 1.5 requirement for hardware signing
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
Upstream-commit: 1cc950b52ecd990016275f7df3bb21685284c79a
Component: engine
2016-02-08 10:25:02 -08:00
68180e8e6f Merge pull request #20068 from ilkka/patch-1
Tweak VM volume mapping paragraph
Upstream-commit: efdbe2ba5a3b73b61d19393c87c5da0807f5f2a9
Component: engine
2016-02-08 09:54:23 -08:00
b8acba957f Move backend types to their own package.
- Remove duplicated structs that we already have in engine-api.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 06d8f504f7b1883f490b5deda5a30ef9acd99f95
Component: engine
2016-02-08 12:42:17 -05:00
48e4739308 Fix 'tcp+tls' protocol not being accepted
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 878a0dc85cacfcf0005d3d2487f6d3266c31552d
Component: engine
2016-02-08 17:34:39 +00:00
d5f0b4ca87 Merge pull request #20002 from twistlock/19575_authz_plugin_support_events
Fix 19575: Docker events doesn't work with authorization plugin
Upstream-commit: 862f073694e3b60b89e099cdf12cfb8ec1a6a9e8
Component: engine
2016-02-08 09:10:39 -08:00
353831dee0 Decouple the "container" router from the actual daemon implementation.
This is done by moving the following types to api/types/config.go:
  - ContainersConfig
  - ContainerAttachWithLogsConfig
  - ContainerWsAttachWithLogsConfig
  - ContainerLogsConfig
  - ContainerStatsConfig

Remove dependency on "version" package from types.ContainerStatsConfig.
Decouple the "container" router from the "daemon/exec" implementation.

* This is done by making daemon.ContainerExecInspect() return an interface{}
value. The same trick is already used by daemon.ContainerInspect().

Improve documentation for router packages.
Extract localRoute and router into separate files.
Move local.router to image.imageRouter.

Changes:
  - Move local/image.go to image/image_routes.go.
  - Move local/local.go to image/image.go
  - Rename router to imageRouter.
  - Simplify imports for image/image.go (remove alias for router package).

Merge router/local package into router package.
Decouple the "image" router from the actual daemon implementation.
Add Daemon.GetNetworkByID and Daemon.GetNetworkByName.
Decouple the "network" router from the actual daemon implementation.

This is done by replacing the daemon.NetworkByName constant with
an explicit GetNetworkByName method.

Remove the unused Daemon.GetNetwork method and the associated constants NetworkByID and NetworkByName.

Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: dd93571c69cc5284f695a21d5504fb57b1a4891a
Component: engine
2016-02-08 11:30:57 -05:00
a45e7dc118 add default seccomp profile as json
profile is created by go generate

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: d57816de0293e18ecfa68ac6e8c288a888912e33
Component: engine
2016-02-08 08:19:21 -08:00
a385c08b38 Merge pull request #19876 from rhatdan/mqueue
Make mqueue container specific
Upstream-commit: e6573a5d18c3045fb021668f3c7539ffa52696fe
Component: engine
2016-02-08 10:57:15 -05:00
f6007e8d5b Merge pull request #20060 from mavenugo/cos
Vendor libnetwork v0.6.1-rc1
Upstream-commit: c30a8f42cb11b0db07ae1c4eadcd6bf453f6f7dd
Component: engine
2016-02-07 19:06:49 -08:00
87401e3ef1 Improve key specific bash subcompletions
The obscure `case "${words[$cword-2]}$prev=" in` idiom is no
longer used for key specific completions in options with map values.

The `__docker_map_key_of_current_option()` function does a much
better job.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 7e31a96d220fe53e101c35332f5772ff42bcd092
Component: engine
2016-02-07 11:19:04 -08:00
1a879946b7 Check key specific bash subcompletions first
This is a refactoring in preparation of cleaning up the handling
of key specific subcompletions.

The new `__docker_map_key_of_current_option()` function will be used
instead of the `__docker_map_key_of_current_option()` idiom in the
following commit.
As this function is very specific, checks using it should be executed
before those checking for `$prev`.

This commit just moves the checks without any modification.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6f9bd6c1b87ca876617b349e00f5e51cc3ef716c
Component: engine
2016-02-07 10:57:46 -08:00
ae271f1f31 Merge pull request #20078 from cpuguy83/carry_17329
Carry 17329
Upstream-commit: 415dd8688618ac2b3872c6a5b5af3afcef2c3e10
Component: engine
2016-02-07 08:59:36 -08:00
1aaf0d0ece Merge pull request #20075 from eallrich/20074-fix-docker-inspect-command
Adding --format= flag
Upstream-commit: 534bad6010fffd66ed07a84eaf96d8b63cd51ecf
Component: engine
2016-02-07 16:34:12 +00:00
e933ac3b82 carry 17329
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e9ab5962384f743cb880add60ff27407a1098869
Component: engine
2016-02-06 13:46:21 -05:00
2f283a92ed Adding --format= flag
Signed-off-by: Evan Allrich <evan@unguku.com>
Upstream-commit: 78ba5d58e6280f879fa45dd4c73f8284dd4ec031
Component: engine
2016-02-06 09:39:20 -06:00
1297aa4525 Tweak VM volume mapping paragraph
The wording looked like there was maybe a copy-paste error there, I tried to make it a bit more clear.

Signed-off-by: Ilkka Laukkanen <ilkka@ilkka.io>
Upstream-commit: a3c290536a844fd57326a2c2776adbfdc84cc984
Component: engine
2016-02-06 13:35:02 +02:00
67040f6b2a Merge pull request #20058 from tonistiigi/fix-parent-reset
Clear old parent reference on resetting image parent
Upstream-commit: 78f2b8d87d0fb952d7998d38d48c35ccf4233c0f
Component: engine
2016-02-06 10:38:35 +01:00
289b56d094 Vendor libnetwork v0.6.1-rc1
- Fixes #20026. Programming iptables in container use native API.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2da61086ea0f7d06108f1ec4ba082f74d2c1c671
Component: engine
2016-02-05 18:20:22 -08:00
feece77ee7 Merge pull request #20049 from kesarion/patch-1
added dockerizer library
Upstream-commit: a70d9957c360bf137d20ff4e65b84465362e0686
Component: engine
2016-02-05 20:52:07 -05:00
c9beb1316c Clear old parent reference on resetting image parent
On migration 2 different images can end up with same
content addressable ID, meaning `SetParent` will be called
multiple times. Previous version did not clear the old
in-memory reference.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4852932494b6e13b669937c0e27f0434513f5ad5
Component: engine
2016-02-05 17:05:19 -08:00
bf50db5f84 Merge pull request #20054 from jfrazelle/fix-generation
fix deb generate
Upstream-commit: b3bacb42afeb66f7de594ef5b0433a23697f6753
Component: engine
2016-02-05 15:40:27 -08:00
aac2fbc608 Merge pull request #20045 from estesp/zfs-userns-permissions-fix
Fix ZFS permissions bug with user namespaces
Upstream-commit: a93cb2b856381dcedbada4fc5b3d3855cfa32fb9
Component: engine
2016-02-05 15:32:43 -08:00
fe8a0bc1b8 fix deb generate
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: f5afe02b695c7c286f035087cb645efcf69ffcd3
Component: engine
2016-02-05 15:31:12 -08:00
ee799f3413 Merge pull request #20050 from tomxtobin/fix-at-sign-docs
Fix mention of at sign in docs
Upstream-commit: fa8f4aa5395349fafc9e20e579e4973ededb2d9e
Component: engine
2016-02-05 14:08:20 -08:00
05c81423d8 added dockerizer library
Signed-off-by: Kesarion <alexandru.sfirlogea@gmail.com>
Signed-off-by: Alexandru Sfirlogea <alexandru.sfirlogea@gmail.com>
Upstream-commit: 1cceb854a7526eeb5b91be72cedf571af01bc009
Component: engine
2016-02-05 23:49:36 +02:00
2c81aeb705 Fix mention of at sign in docs
The at sign (`@`) was being referred to in the documentation as an
ampersand (`&`).

Signed-off-by: Tom X. Tobin <tomxtobin@tomxtobin.com>
Upstream-commit: 7f275315edc73027b3d144da439b00fa6565baec
Component: engine
2016-02-05 16:47:57 -05:00
a2052e7ea0 Merge pull request #20003 from liubogithub/btrfs
Graphdriver/btrfs: Avoid using single d.Get()
Upstream-commit: 25941b50206db3311f83a532ecfa8725b0b8ffab
Component: engine
2016-02-05 16:35:12 -05:00
e6f8a347a4 Merge pull request #20038 from doertedev/master
Grep for installed AND held packages.
Upstream-commit: f7f1730316d97d7077e3d311e54278f46e440d95
Component: engine
2016-02-05 13:31:30 -08:00
2c1fe5f691 Merge pull request #19887 from aaronlehmann/vendor-resumable-downloads
Vendor updated distribution for resumable downloads
Upstream-commit: 9f0095f14a007950a17b000f268bb29ac5a5fa5c
Component: engine
2016-02-05 12:58:53 -08:00
3fd697d9e1 Merge pull request #20035 from thaJeztah/add-seccomp-compatibility-note
Add note that seccomp 2.2.1 or higher is required
Upstream-commit: 66af3cad7a291219595b88935c76225cdeefe520
Component: engine
2016-02-05 21:36:35 +01:00