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
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
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
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
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
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
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
1386bb7cb2
Merge pull request #20006 from tiborvass/merge_release_v1.10.0
...
Merge release v1.10.0
Upstream-commit: 9a9bbacae56d55b45c39751148d967e7d5dfcdfc
Component: engine
2016-02-04 12:48:10 -08: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
15e0185e69
Merge pull request #19727 from pandrew/improve_test-deb-install
...
improve test-deb-install
Upstream-commit: 61464701fabb6b013506ad555daaab84723663b4
Component: engine
2016-02-04 10:09:47 -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
