Commit Graph

22171 Commits

Author SHA1 Message Date
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
Darren Stahl 6791230320 Combine SetupWorkingDirectory for Linux and Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-02-05 10:27:10 -08: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
Jess Frazelle 2da5ad3bb0 Merge pull request #20005 from Microsoft/jjh/testrunrestartmaxretries
Windows CI: Up timeout TestRunRestartMaxRetries
2016-02-04 16:07:42 -08:00
Sebastiaan van Stijn 3f869bfe78 Merge pull request #20013 from thaJeztah/fix-migration-header
Fix Header on migration page
2016-02-05 00:51:13 +01:00
Sebastiaan van Stijn 0a6e0c43d9 Fix Header on migration page
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-05 00:35:49 +01:00
Darren Stahl 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
Sebastiaan van Stijn 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
Anusha Ragunathan 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
Brian Goff 18204ea616 Merge pull request #19357 from chenchun/internal
Display `internal` flag on `network inspect`
2016-02-04 16:31:12 -05:00
Tibor Vass 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
Jess Frazelle 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
Tibor Vass 91028ad8f4 Change version to 1.11.0-dev
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-02-04 15:44:35 -05:00
Tibor Vass 05adb0bdbb Bump version to v1.10.0
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-02-04 15:39:02 -05:00
John Howard 4a2122e020 Windows CI: Up timeout TestRunRestartMaxRetries
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-04 11:59:13 -08:00
Jess Frazelle 8038e32237 Merge pull request #19918 from WeiZhang555/restarting
Fix error for restarting container
2016-02-04 11:36:32 -08:00
David Calavera fe53be4e17 Apply context changes to the client.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-04 13:59:57 -05:00
David Calavera 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
Liu Bo 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
unclejack 49a45d80f2 Dockerfile,contrib,hack: remove buildpack-deps
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2016-02-04 20:22:34 +02:00
Tianon Gravi 61464701fa Merge pull request #19727 from pandrew/improve_test-deb-install
improve test-deb-install
2016-02-04 10:09:47 -08:00
Paul Liljenberg 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
Jess Frazelle 60821c6dfd Merge pull request #19997 from boucher/patch-2
Pass KEEPBUNDLE in Docker build environment.
2016-02-04 08:37:12 -08:00
David Calavera 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
David Calavera e2bfedbc40 Merge pull request #19998 from estesp/remove-stray-printf
Remove stray printf
2016-02-04 08:29:11 -08:00
Jess Frazelle 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
Sebastiaan van Stijn 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