Commit Graph

22109 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
a03c2a005a Merge pull request #20157 from chadswen/fix-typo-toolbox-upgrade
Fix typo in Docker Toolbox upgrade section
2016-02-09 18:14:30 +00:00
Sebastiaan van Stijn
9f2f52de8e Merge pull request #20090 from albers/completion-map-values
Improve key specific bash subcompletions
2016-02-09 17:39:35 +00:00
Chad Swenson
1435c9ea21 Fix typo in Docker Toolbox upgrade section
Signed-off-by: Chad Swenson <chadswen@gmail.com>
2016-02-09 11:36:45 -06:00
Alexander Morozov
d2a2f5bedc Merge pull request #20117 from twistlock/userns_tests
Move userns cli test to a separate file, remove experimental flag
2016-02-09 09:10:44 -08:00
David Calavera
01a1925792 Merge pull request #20130 from Microsoft/sjw/windows_save_fix
Fixing 'docker save' on Windows.
2016-02-09 07:47:58 -08:00
Sebastiaan van Stijn
f5ed72c931 Merge pull request #20116 from muthu-r/master
Add Horcrux volume plugin to plugins.md
2016-02-09 09:59:26 +00:00
Liron Levin
df636ef45a Move userns cli test to a separate file, remove experimental flag
Signed-off-by: Liron Levin <liron@twistlock.com>
2016-02-09 09:31:09 +02:00
Stefan J. Wernli
041a9510c6 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>
2016-02-08 18:08:49 -08:00
Muthukumar R
58427fd8a6 Add Horcrux volume plugin to plugins.md
Signed-off-by: Muthukumar R <muthur@gmail.com>
2016-02-08 15:16:56 -08:00
David Calavera
ac9d1b7b47 Merge pull request #20118 from aditirajagopal/20110-update-client-lib-projects
Update List of Client Library Projects
2016-02-08 15:06:53 -08:00
Tibor Vass
8c6887c54d Merge pull request #19772 from calavera/decouple-server-routers
[Carry 19133] Decouple server routers from the daemon package.
2016-02-08 17:54:49 -05:00
David Calavera
3846951fce Merge pull request #20106 from jfrazelle/go-generate-json-default-profile
add default seccomp profile as json
2016-02-08 14:48:34 -08:00
Aditi Rajagopal
47dbb59e5b Update List of Client Library Projects
Resolves: #20110
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2016-02-08 16:16:42 -06:00
Tibor Vass
54b67fe12f Merge pull request #19711 from coolljt0725/fix_19679
Clean up container rootf mounts on daemon start, fixes #19679
2016-02-08 16:21:50 -05:00
Jessica Frazelle
9bc771af9d add validation for generating default secccomp profile
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-08 13:04:52 -08:00
David Calavera
14c63189a1 Merge pull request #20109 from thaJeztah/add_tcp_tls_proto
Fix 'tcp+tls' protocol not being accepted
2016-02-08 11:22:33 -08:00
Jess Frazelle
4c807379cb Merge pull request #20112 from endophage/notary_go15
adding note about go version 1.5 requirement for hardware signing
2016-02-08 14:19:42 -05:00
David Lawrence
1cc950b52e adding note about go version 1.5 requirement for hardware signing
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2016-02-08 10:25:02 -08:00
David Calavera
efdbe2ba5a Merge pull request #20068 from ilkka/patch-1
Tweak VM volume mapping paragraph
2016-02-08 09:54:23 -08:00
David Calavera
06d8f504f7 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>
2016-02-08 12:42:17 -05:00
Sebastiaan van Stijn
878a0dc85c Fix 'tcp+tls' protocol not being accepted
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-08 17:34:39 +00:00
Alexander Morozov
862f073694 Merge pull request #20002 from twistlock/19575_authz_plugin_support_events
Fix 19575: Docker events doesn't work with authorization plugin
2016-02-08 09:10:39 -08:00
Lukas Waslowski
dd93571c69 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>
2016-02-08 11:30:57 -05:00
Jessica Frazelle
d57816de02 add default seccomp profile as json
profile is created by go generate

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-08 08:19:21 -08:00
Jess Frazelle
e6573a5d18 Merge pull request #19876 from rhatdan/mqueue
Make mqueue container specific
2016-02-08 10:57:15 -05:00
David Calavera
c30a8f42cb Merge pull request #20060 from mavenugo/cos
Vendor libnetwork v0.6.1-rc1
2016-02-07 19:06:49 -08:00
Harald Albers
7e31a96d22 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>
2016-02-07 11:19:04 -08:00
Harald Albers
6f9bd6c1b8 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>
2016-02-07 10:57:46 -08:00
Alexander Morozov
415dd86886 Merge pull request #20078 from cpuguy83/carry_17329
Carry 17329
2016-02-07 08:59:36 -08:00
Sebastiaan van Stijn
534bad6010 Merge pull request #20075 from eallrich/20074-fix-docker-inspect-command
Adding --format= flag
2016-02-07 16:34:12 +00:00
Brian Goff
e9ab596238 carry 17329
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-02-06 13:46:21 -05:00
Evan Allrich
78ba5d58e6 Adding --format= flag
Signed-off-by: Evan Allrich <evan@unguku.com>
2016-02-06 09:39:20 -06:00
Ilkka Laukkanen
a3c290536a 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>
2016-02-06 13:35:02 +02:00
Antonio Murdaca
78f2b8d87d Merge pull request #20058 from tonistiigi/fix-parent-reset
Clear old parent reference on resetting image parent
2016-02-06 10:38:35 +01:00
Madhu Venugopal
2da61086ea Vendor libnetwork v0.6.1-rc1
- Fixes #20026. Programming iptables in container use native API.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-02-05 18:20:22 -08:00
Brian Goff
a70d9957c3 Merge pull request #20049 from kesarion/patch-1
added dockerizer library
2016-02-05 20:52:07 -05:00
Tonis Tiigi
4852932494 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>
2016-02-05 17:05:19 -08:00
Jess Frazelle
b3bacb42af Merge pull request #20054 from jfrazelle/fix-generation
fix deb generate
2016-02-05 15:40:27 -08:00
David Calavera
a93cb2b856 Merge pull request #20045 from estesp/zfs-userns-permissions-fix
Fix ZFS permissions bug with user namespaces
2016-02-05 15:32:43 -08:00
Jessica Frazelle
f5afe02b69 fix deb generate
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-05 15:31:12 -08:00
David Calavera
fa8f4aa539 Merge pull request #20050 from tomxtobin/fix-at-sign-docs
Fix mention of at sign in docs
2016-02-05 14:08:20 -08:00
Alexandru Sfirlogea
1cceb854a7 added dockerizer library
Signed-off-by: Kesarion <alexandru.sfirlogea@gmail.com>
Signed-off-by: Alexandru Sfirlogea <alexandru.sfirlogea@gmail.com>
2016-02-05 23:49:36 +02:00
Tom X. Tobin
7f275315ed 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>
2016-02-05 16:47:57 -05:00
Brian Goff
25941b5020 Merge pull request #20003 from liubogithub/btrfs
Graphdriver/btrfs: Avoid using single d.Get()
2016-02-05 16:35:12 -05:00
David Calavera
f7f1730316 Merge pull request #20038 from doertedev/master
Grep for installed AND held packages.
2016-02-05 13:31:30 -08:00
Alexander Morozov
9f0095f14a Merge pull request #19887 from aaronlehmann/vendor-resumable-downloads
Vendor updated distribution for resumable downloads
2016-02-05 12:58:53 -08:00
Sebastiaan van Stijn
66af3cad7a Merge pull request #20035 from thaJeztah/add-seccomp-compatibility-note
Add note that seccomp 2.2.1 or higher is required
2016-02-05 21:36:35 +01:00
Liron Levin
5ffc810df2 Fix 19575: Docker events doesn't work with authorization plugin
To support the requirement of blocking the request after the daemon
responded the authorization plugin use a `response recorder` that replay
the response after the flow ends.

This commit adds support for commands that hijack the connection and
flushes data via the http.Flusher interface. This resolves the error
with the event endpoint.

Signed-off-by: Liron Levin <liron@twistlock.com>
2016-02-05 22:30:01 +02:00
Sebastiaan van Stijn
6ab52f9f00 Add note that seccomp 2.2.1 or higher is required
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-05 21:26:03 +01:00
Phil Estes
aef0995b02 Fix ZFS permissions bug with user namespaces
Fix root directory of the mountpoint being owned by real root. This is
unique to ZFS because of the way file mountpoints are created using the
ZFS tooling, and the remapping that happens at layer unpack doesn't
impact this root (already created) holding directory for the layer.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-02-05 14:37:33 -05:00