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
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
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
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
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
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
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
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
495762f74d
Move base image selection to a utility function
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 96c522162634ff4d5e55ddf2ff841921a99b7b09
Component: engine
2016-02-04 15:06:34 -08:00
5afda05713
Release checklist - bump versions earlier
...
Bump both API and VERSION directly after the release
branch is created. All changes to master after that
are (by default) for the *next* release.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 354dabf3cafa89634057f42d1490fb1b1e3f8963
Component: engine
2016-02-04 23:45:49 +01:00
48fc690295
Fix ReadAll to run on Windows.
...
filepath.Clean converts filenames to filenames with native path
separators. Use ToSlash to normalize.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 691555fc8b070a40d3e35922fda681394bdfa173
Component: engine
2016-02-04 14:01:17 -08:00
36dd8337c1
Merge pull request #19357 from chenchun/internal
...
Display `internal` flag on `network inspect`
Upstream-commit: 18204ea61690797930efcf2d0a638961664ba0df
Component: engine
2016-02-04 16:31:12 -05:00
9a586d64c2
Merge pull request #19984 from calavera/vendor_engine_api_master
...
Vendor engine-api with client context changes.
Upstream-commit: da58ee42bb1d4e17c5b525d161f29ad8efc0569e
Component: engine
2016-02-04 16:20:06 -05:00
975855b6af
Change version to 1.11.0-dev
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 91028ad8f4aa72945b766ca4c952b8c3d8521c9f
Component: engine
2016-02-04 15:44:35 -05:00
3b1e259c19
Bump version to v1.10.0
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 05adb0bdbbb4a4f6c1520dd625bd4e91b7744bae
Component: engine
2016-02-04 15:39:02 -05:00
1262ec37e1
Windows CI: Up timeout TestRunRestartMaxRetries
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4a2122e020f2f4637b2a32e1ba2bfa3511988f8f
Component: engine
2016-02-04 11:59:13 -08:00
a840e6953f
Merge pull request #19918 from WeiZhang555/restarting
...
Fix error for restarting container
Upstream-commit: 8038e32237e2afbb20233218efb179b61eda759a
Component: engine
2016-02-04 11:36:32 -08:00
32fac24f32
Apply context changes to the client.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: fe53be4e1785ab4d8cadf246e5f2de419f337adc
Component: engine
2016-02-04 13:59:57 -05:00
3f9e0313b7
Vendor engine-api, go-connections and go-winio.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: d8355ead9ee301718563faa947fac8b62d11b9e9
Component: engine
2016-02-04 13:59:57 -05:00
f06d92067d
Graphdriver/btrfs: Avoid using single d.Get()
...
For btrfs driver, in d.Create(), Get() of parentDir is called but not followed
by Put().
If we apply SElinux mount label, we need to mount btrfs subvolumes in d.Get(),
without a Put() would end up with a later Remove() failure on
"Device resourse is busy".
This calls the subvolume helper function directly in d.Create().
Signed-off-by: Liu Bo <bo.li.liu@oracle.com >
Upstream-commit: b2e27fee53c269f9659bdab66852eaba4ffbe9c7
Component: engine
2016-02-04 10:25:24 -08:00
4506ff3119
improve test-deb-install
...
This PR adds support for using the DOCKER_BUILD_PKGS env var to
better help defining what packege to build. It also adds support
for the integration-daemon so we can run it as a bundle.
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com >
add directory test
Adds missing directory test. This helps verifying that
DOCKER_BUILD_PKGS is a directory and exists before continueing.
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com >
fix indent
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com >
Upstream-commit: 620b8250e85abbe284eb8d34799df1bb73d82d6a
Component: engine
2016-02-04 18:14:08 +01:00
f6dfa135ec
Merge pull request #19997 from boucher/patch-2
...
Pass KEEPBUNDLE in Docker build environment.
Upstream-commit: 60821c6dfd13d170cce6308f10287cf2f0c0b072
Component: engine
2016-02-04 08:37:12 -08:00
d572e76048
Merge pull request #19994 from runcom/fix-test-for-19936
...
integration-cli: fix minimum and default api version test
Upstream-commit: 3329c94e256d7816ec20edb215d5c3614504e403
Component: engine
2016-02-04 08:33:07 -08:00
b5450bbcc0
Merge pull request #19998 from estesp/remove-stray-printf
...
Remove stray printf
Upstream-commit: e2bfedbc40245dcf39ab5e0cb5756784e4f508c7
Component: engine
2016-02-04 08:29:11 -08:00
49068064e4
dont try to install journald driver on wheezy
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 6c2b014d5e3d4a6eb37df0edc1fc552b05406ede
Component: engine
2016-02-04 16:22:23 +01:00
25898f320a
Remove stray printf
...
This came in with the Windows CI work and I assume was meant for local
debug, but adds a bare printf line to the test output.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 77590d4dae9223ccd8edf9b153c669f631747f24
Component: engine
2016-02-04 10:13:31 -05:00
42f201b0c3
Pass KEEPBUNDLE in Docker build environment.
...
This is an alternate solution to the problem described in #19969 .
Signed-off-by: Ross Boucher <rboucher@gmail.com >
Upstream-commit: d23778168d158e0813420ffc2d10fdddba6a12b6
Component: engine
2016-02-04 09:42:41 -05:00
83fc309845
integration-cli: fix minimum and default api version test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: fe6b88e3fa12810b2eaad45c613742c1eeb7290e
Component: engine
2016-02-04 13:58:08 +01:00
4aae2e5565
Fix error for restarting container
...
Fix error message for `--net container:b` and `--ipc container:b`,
container `b` is a restarting container.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 3c0a91d227a04e146d24e35d2f71d8c5343cfc77
Component: engine
2016-02-04 20:14:50 +08:00
76c413d163
Merge pull request #19949 from Microsoft/jjh/testapiresize
...
Windows CI: Port docker_api_resize_test.go
Upstream-commit: 38e774d32caf29155d27aad4fad964b082246a73
Component: engine
2016-02-04 10:11:32 +01:00
e109e016c1
Display internal flag on network inspect
...
Also adds internal network tests for bridge network
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: c199506b59f60ac456cb0448ddd86e6dec92bc0a
Component: engine
2016-02-04 15:28:37 +08:00
96b7f387ba
Windows CI: Port docker_api_resize_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4080ce35e0ffec4703c04e8d9fa0e2def41fddfe
Component: engine
2016-02-03 20:30:06 -08:00
e7c326da3c
Merge pull request #19702 from tiborvass/host-specific-passthru-token
...
Add test to make sure the new registry pass-thru token is only sent to the intended hosts
Upstream-commit: 66a4e557f955713adea5c97e42202fdbc0f5c06c
Component: engine
2016-02-03 21:57:32 -05:00
54169c11ac
Merge pull request #19877 from HackToday/fixdoc
...
Add support details for storage driver
Upstream-commit: a03e85b4482ab741000159f3e911c8729b387cd8
Component: engine
2016-02-04 03:07:15 +01:00
a2042aca33
Merge pull request #19886 from AndrewGuenther/185160-init-socket-fix
...
Wait to fire start event until socket is created
Upstream-commit: d47812dd1d1de206e29a644e125a0a0f28655c6c
Component: engine
2016-02-03 17:38:52 -08:00
d95ef1e6ea
Merge pull request #19952 from WeiZhang555/fix-err-restarting-1
...
Fix error message for pause a restarting container
Upstream-commit: dcde68b955a8f75119573ec6011cb1b1a9457f60
Component: engine
2016-02-03 17:34:19 -08:00
9044b5c3c7
Merge pull request #19979 from mavenugo/gccgoci
...
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
Upstream-commit: f0a58947abceb524044d7aa88aeae61523c0bc9b
Component: engine
2016-02-03 20:33:52 -05:00
8cc70508c1
Merge pull request #19980 from tonistiigi/fix-microsoft-vendor-dir
...
Remove case sensitive duplicate dir in vendor
Upstream-commit: e74c07b947adf2d6d804068e4a647265e6e419f2
Component: engine
2016-02-03 17:32:14 -08:00
David Calavera
Tom X. Tobin
Brian Goff
Alexander Morozov
Sebastiaan van Stijn
Phil Estes
Stefan Staudenmeyer
moxiegirl
Stefan Scherer
Aaron Lehmann
Jess Frazelle
Darren Stahl
Anusha Ragunathan
Tibor Vass
Tibor Vass
John Howard
Liu Bo
Paul Liljenberg
Ross Boucher
Antonio Murdaca
Zhang Wei
Antonio Murdaca
Chun Chen
Sebastiaan van Stijn