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
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
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
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
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
Stefan Staudenmeyer
b3d66ff010
Use grep -qE instead of egrep which is deprecated.
...
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com>
2016-02-05 18:55:39 +01:00
Sebastiaan van Stijn
1573960dca
Merge pull request #20041 from calavera/missing_debug_client_info_doc
...
Add missing debug client mode info in docs.
2016-02-05 18:35:01 +01:00
David Calavera
4aac8a60b2
Add missing debug client mode info in docs.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-05 12:29:54 -05:00
Stefan Staudenmeyer
996ca75413
Grep for installed AND held packages.
...
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com>
2016-02-05 17:41:57 +01:00
moxiegirl
e59922a557
Merge pull request #20032 from thaJeztah/fix-systemd-404
...
Fix incorrect alias for systemd docs
2016-02-05 08:26:15 -08:00
Dan Walsh
ba38d58659
Make mqueue container specific
...
mqueue can not be mounted on the host os and then shared into the container.
There is only one mqueue per mount namespace, so current code ends up leaking
the /dev/mqueue from the host into ALL containers. Since SELinux changes the
label of the mqueue, only the last container is able to use the mqueue, all
other containers will get a permission denied. If you don't have SELinux protections
sharing of the /dev/mqueue allows one container to interact in potentially hostile
ways with other containers.
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-02-05 16:50:35 +01:00
Sebastiaan van Stijn
039a155ffa
Merge pull request #20031 from hypriot/fix-typo-chocolatey
...
Fix typo in Chocolatey
2016-02-05 16:25:21 +01:00
Sebastiaan van Stijn
50dba63845
Fix incorrect alias for systemd docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-05 16:18:26 +01:00
Stefan Scherer
4688efc3ed
Fix typo in Chocolatey
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-02-05 16:15:20 +01:00
Sebastiaan van Stijn
d13e8d8446
Merge pull request #20028 from tomxtobin/fix-man-typo
...
Fix typo in config-json man page
2016-02-05 15:56:06 +01:00
Tom X. Tobin
c75581c855
Fix typo in config-json man page
...
In the NAME section: "confg.json" -> "config.json"
Signed-off-by: Tom X. Tobin <tomxtobin@tomxtobin.com>
2016-02-05 09:52:01 -05:00
Lei Jitang
fae09e2569
Add progress bar to docker load
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-02-05 02:24:23 -05:00
David Calavera
98aa1d24a3
Merge pull request #20010 from thaJeztah/update-release-checklist
...
Release checklist - bump versions earlier
2016-02-04 18:07:06 -08:00
David Calavera
d4c8d0519d
Merge pull request #20011 from Microsoft/MinimalBaseImage
...
Move base image selection to a utility function
2016-02-04 18:06:30 -08:00
Aaron Lehmann
4d437a29d2
Vendor updated distribution for resumable downloads
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-02-04 17:33:37 -08:00
Brian Goff
675fe313ee
Merge pull request #20009 from anusha-ragunathan/to-slash
...
Fix ReadAll to run on Windows.
2016-02-04 19:58:20 -05:00