342ff0d65d
Overlay Network needs Unique Hostname
...
Resolves : #19301
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com >
Upstream-commit: 3024604054a588f213b671c7f1ec5eed2c99b78a
Component: engine
2016-02-08 15:14:38 -06: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
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
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
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
3e59ad891c
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 >
Upstream-commit: 5ffc810df22c3779b4df8ce28d94e4bf89d34e2f
Component: engine
2016-02-05 22:30:01 +02:00
4d6bf1bcd0
Add note that seccomp 2.2.1 or higher is required
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6ab52f9f00968e15e8dcae145dbaea04da394d83
Component: engine
2016-02-05 21:26:03 +01:00
bbeb7c1fa4
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)
Upstream-commit: aef0995b02a5a90ad74e6d91901d7bc8a9713796
Component: engine
2016-02-05 14:37:33 -05:00
18d20ed26a
Use grep -qE instead of egrep which is deprecated.
...
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com >
Upstream-commit: b3d66ff010268e1f63f5555508833dcf3604f0b6
Component: engine
2016-02-05 18:55:39 +01:00
d9738f7f93
Merge pull request #20041 from calavera/missing_debug_client_info_doc
...
Add missing debug client mode info in docs.
Upstream-commit: 1573960dca09e789be7cd18cfeaaf024a1e03bd5
Component: engine
2016-02-05 18:35:01 +01:00
178f5e51dc
Add missing debug client mode info in docs.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 4aac8a60b2c969639a96a1c245a18e457d5db4dd
Component: engine
2016-02-05 12:29:54 -05:00
2a6ce914c6
Grep for installed AND held packages.
...
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com >
Upstream-commit: 996ca75413f4072c03cca9229dc5901bd690c4f8
Component: engine
2016-02-05 17:41:57 +01:00
e7e0f7886a
Merge pull request #20032 from thaJeztah/fix-systemd-404
...
Fix incorrect alias for systemd docs
Upstream-commit: e59922a55745894fd2c9a7c3babd923de5c5ca2f
Component: engine
2016-02-05 08:26:15 -08:00
1a4e7d1b20
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 >
Upstream-commit: ba38d58659cc155aebf89a2ea4cfc3cd7ba04a64
Component: engine
2016-02-05 16:50:35 +01:00
4edab8430f
Merge pull request #20031 from hypriot/fix-typo-chocolatey
...
Fix typo in Chocolatey
Upstream-commit: 039a155ffaf4f92dc209f41ca24068bc6aabccf8
Component: engine
2016-02-05 16:25:21 +01:00
18bade81af
Fix incorrect alias for systemd docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 50dba638455954161215bd2b30c924cf61446eee
Component: engine
2016-02-05 16:18:26 +01:00
1f7a83c1d4
Fix typo in Chocolatey
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: 4688efc3eddf5aead4bd59ec13e2ca419ef96b28
Component: engine
2016-02-05 16:15:20 +01:00
b086f7f061
Merge pull request #20028 from tomxtobin/fix-man-typo
...
Fix typo in config-json man page
Upstream-commit: d13e8d84463025a82a59caaf8da1f25d2ab06bd6
Component: engine
2016-02-05 15:56:06 +01:00
b523e91022
Fix typo in config-json man page
...
In the NAME section: "confg.json" -> "config.json"
Signed-off-by: Tom X. Tobin <tomxtobin@tomxtobin.com >
Upstream-commit: c75581c8552745f989d0ff6ed7dff86e26e55767
Component: engine
2016-02-05 09:52:01 -05:00
311dc4f8a6
Add progress bar to docker load
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: fae09e25698006a190d14fe64f1576f68431fabf
Component: engine
2016-02-05 02:24:23 -05:00
21c826245f
Merge pull request #20010 from thaJeztah/update-release-checklist
...
Release checklist - bump versions earlier
Upstream-commit: 98aa1d24a3d7274a8056e57f385945e9829bd612
Component: engine
2016-02-04 18:07:06 -08:00
78c9a12642
Merge pull request #20011 from Microsoft/MinimalBaseImage
...
Move base image selection to a utility function
Upstream-commit: d4c8d0519d2e521fd8b364d7231973455963e0ba
Component: engine
2016-02-04 18:06:30 -08:00
d323843da1
Vendor updated distribution for resumable downloads
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 4d437a29d28ec2d47ff7cf0868390b921ededa03
Component: engine
2016-02-04 17:33:37 -08:00
55587c7354
Merge pull request #20009 from anusha-ragunathan/to-slash
...
Fix ReadAll to run on Windows.
Upstream-commit: 675fe313ee89bba42965edbed2b10b62d432b8e0
Component: engine
2016-02-04 19:58:20 -05:00
dc25bc1e26
Merge pull request #20005 from Microsoft/jjh/testrunrestartmaxretries
...
Windows CI: Up timeout TestRunRestartMaxRetries
Upstream-commit: 2da5ad3bb0fb553112751a683ac861ab8fd5b8e2
Component: engine
2016-02-04 16:07:42 -08:00
4976c603c9
Merge pull request #20013 from thaJeztah/fix-migration-header
...
Fix Header on migration page
Upstream-commit: 3f869bfe785428d3bfc9d73952b25fec79dc9753
Component: engine
2016-02-05 00:51:13 +01:00
58fa4d85d1
Fix Header on migration page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0a6e0c43d9442926691cd7a842dcf55fc555c505
Component: engine
2016-02-05 00:35:49 +01:00
