a70d9957c3
Merge pull request #20049 from kesarion/patch-1
...
added dockerizer library
2016-02-05 20:52:07 -05:00
b3bacb42af
Merge pull request #20054 from jfrazelle/fix-generation
...
fix deb generate
2016-02-05 15:40:27 -08:00
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
f5afe02b69
fix deb generate
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-05 15:31:12 -08:00
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
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
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
25941b5020
Merge pull request #20003 from liubogithub/btrfs
...
Graphdriver/btrfs: Avoid using single d.Get()
2016-02-05 16:35:12 -05:00
f7f1730316
Merge pull request #20038 from doertedev/master
...
Grep for installed AND held packages.
2016-02-05 13:31:30 -08:00
9f0095f14a
Merge pull request #19887 from aaronlehmann/vendor-resumable-downloads
...
Vendor updated distribution for resumable downloads
2016-02-05 12:58:53 -08:00
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
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
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
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
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
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
996ca75413
Grep for installed AND held packages.
...
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com>
2016-02-05 17:41:57 +01:00
e59922a557
Merge pull request #20032 from thaJeztah/fix-systemd-404
...
Fix incorrect alias for systemd docs
2016-02-05 08:26:15 -08:00
039a155ffa
Merge pull request #20031 from hypriot/fix-typo-chocolatey
...
Fix typo in Chocolatey
2016-02-05 16:25:21 +01:00
50dba63845
Fix incorrect alias for systemd docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-05 16:18:26 +01:00
4688efc3ed
Fix typo in Chocolatey
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-02-05 16:15:20 +01:00
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
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
98aa1d24a3
Merge pull request #20010 from thaJeztah/update-release-checklist
...
Release checklist - bump versions earlier
2016-02-04 18:07:06 -08:00
d4c8d0519d
Merge pull request #20011 from Microsoft/MinimalBaseImage
...
Move base image selection to a utility function
2016-02-04 18:06:30 -08:00
4d437a29d2
Vendor updated distribution for resumable downloads
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-02-04 17:33:37 -08:00
675fe313ee
Merge pull request #20009 from anusha-ragunathan/to-slash
...
Fix ReadAll to run on Windows.
2016-02-04 19:58:20 -05:00
2da5ad3bb0
Merge pull request #20005 from Microsoft/jjh/testrunrestartmaxretries
...
Windows CI: Up timeout TestRunRestartMaxRetries
2016-02-04 16:07:42 -08:00
3f869bfe78
Merge pull request #20013 from thaJeztah/fix-migration-header
...
Fix Header on migration page
2016-02-05 00:51:13 +01:00
0a6e0c43d9
Fix Header on migration page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-05 00:35:49 +01:00
96c5221626
Move base image selection to a utility function
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-02-04 15:06:34 -08:00
354dabf3ca
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>
2016-02-04 23:45:49 +01:00
691555fc8b
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>
2016-02-04 14:01:17 -08:00
18204ea616
Merge pull request #19357 from chenchun/internal
...
Display `internal` flag on `network inspect`
2016-02-04 16:31:12 -05:00
da58ee42bb
Merge pull request #19984 from calavera/vendor_engine_api_master
...
Vendor engine-api with client context changes.
2016-02-04 16:20:06 -05:00
9a9bbacae5
Merge pull request #20006 from tiborvass/merge_release_v1.10.0
...
Merge release v1.10.0
2016-02-04 12:48:10 -08:00
91028ad8f4
Change version to 1.11.0-dev
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-02-04 15:44:35 -05:00
05adb0bdbb
Bump version to v1.10.0
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-02-04 15:39:02 -05:00
4a2122e020
Windows CI: Up timeout TestRunRestartMaxRetries
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-04 11:59:13 -08:00
8038e32237
Merge pull request #19918 from WeiZhang555/restarting
...
Fix error for restarting container
2016-02-04 11:36:32 -08:00
fe53be4e17
Apply context changes to the client.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-04 13:59:57 -05:00
d8355ead9e
Vendor engine-api, go-connections and go-winio.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-04 13:59:57 -05:00
b2e27fee53
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>
2016-02-04 10:25:24 -08:00
61464701fa
Merge pull request #19727 from pandrew/improve_test-deb-install
...
improve test-deb-install
2016-02-04 10:09:47 -08:00
620b8250e8
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>
2016-02-04 18:14:08 +01:00
60821c6dfd
Merge pull request #19997 from boucher/patch-2
...
Pass KEEPBUNDLE in Docker build environment.
2016-02-04 08:37:12 -08:00
3329c94e25
Merge pull request #19994 from runcom/fix-test-for-19936
...
integration-cli: fix minimum and default api version test
2016-02-04 08:33:07 -08:00
e2bfedbc40
Merge pull request #19998 from estesp/remove-stray-printf
...
Remove stray printf
2016-02-04 08:29:11 -08:00
a1b07a8010
Merge pull request #19999 from thaJeztah/carry-19668-wheezy-journald
...
(carry 19668) don't try to install journald driver on wheezy
2016-02-04 07:44:42 -08:00
6c2b014d5e
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>
2016-02-04 16:22:23 +01:00
Brian Goff