summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22048 from thaJeztah/docs-update-api-for-labelsv1.8.2Vincent Demeester2016-04-182-21/+85
|\ | | | | docs: update API for features added in 1.11
| * docs: update API for features added in 1.11Sebastiaan van Stijn2016-04-162-21/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | Docker 1.11 added a feature to set labels on volumes, networks and images (during build), but these changes were not documented in the API documentation. This adds the new features to the documentation. Also fixes some minor formatting, and options that were not used in the examples. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | Merge pull request #22086 from aboch/docVincent Demeester2016-04-181-1/+3
|\ \ | | | | | | Clarify container external connectivity in multi-network scenario
| * | Clarify container external connectivity in multi-network scenarioAlessandro Boch2016-04-181-1/+3
| | | | | | | | | | | | Signed-off-by: Alessandro Boch <aboch@docker.com>
* | | Merge pull request #22115 from yorkie/fix/doc-typoSebastiaan van Stijn2016-04-181-1/+1
|\ \ \ | | | | | | | | doc: fix typo
| * | | doc: fix typoyorkie2016-04-181-1/+1
|/ / / | | | | | | | | | Signed-off-by: yorkie <yorkiefixer@gmail.com>
* | | Merge pull request #22098 from thaJeztah/cherry-pick-21998Vincent Demeester2016-04-182-2/+2
|\ \ \ | | | | | | | | cherry-pick "runc install path changed from /usr/local/bin to /usr/local/sbin"
| * | | runc install path changed from /usr/local/bin to /usr/local/sbinTibor Vass2016-04-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tibor Vass <tibor@docker.com> (cherry picked from commit 3d85e51ef4284f572cb658cfe69edc92ac3a53bb) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | Merge pull request #22097 from mavenugo/tp5Vincent Demeester2016-04-187-20/+74
|\ \ \ \ | |/ / / |/| | | Vendoring libnetwork v0.8.0-dev.1
| * | | Vendoring libnetwork v0.8.0-dev.1Madhu Venugopal2016-04-177-20/+74
|/ / / | | | | | | | | | | | | | | | | | | - Fixes docker/docker#16964 - Added maximum egress bandwidth qos for Windows Signed-off-by: Madhu Venugopal <madhu@docker.com>
* | | Merge pull request #22085 from thaJeztah/remove-unused-query-parameterSebastiaan van Stijn2016-04-167-7/+0
|\ \ \ | | | | | | | | docs: remove unused "registry" parameter
| * | | docs: remove unused "registry" parameterSebastiaan van Stijn2016-04-167-7/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "registry" query-param was in added 10c0e990371e065d4fc1c9b680f03a46e5bacc5e, and removed in docker 0.5.0 via 66a9d06d9fa7a382c6852cf047e1448e0d3e1782. Aparently, it was never removed from the documentation, and included in all versions of the API docs. This removes it from the documentation. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | Merge pull request #21817 from tkopczynski/20784-builder-dockerfile-supportVincent Demeester2016-04-162-0/+68
|\ \ \ | | | | | | | | Unit tests for builder/dockerfile/support
| * | | Unit tests for builder/dockerfile/supportTomasz Kopczynski2016-04-162-0/+68
| | | | | | | | | | | | | | | | Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
* | | | Merge pull request #20835 from cpuguy83/handle_stats_client_errorsDoug Davis2016-04-164-23/+26
|\ \ \ \ | |_|/ / |/| | | Do not remove containers from stats list on err
| * | | Do not remove containers from stats list on errBrian Goff2016-04-134-23/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this patch, containers are silently removed from the stats list on error. This patch instead will display `--` for all fields for the container that had the error, allowing it to recover from errors. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
* | | | Merge pull request #22078 from yongtang/04152016-docs-remote-api-SecurityOptBrian Goff2016-04-152-4/+4
|\ \ \ \ | | | | | | | | | | Fix incorrect docs in remote API for the option of `SecurityOpt`
| * | | | Fix incorrect docs in remote API for the option of `SecurityOpt`Yong Tang2016-04-152-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix tries to fix the issue in remote API docs for v1.15 (Docker 1.3.x) and v1.16 (Docker 1.4.x) where `SecurityOpts` was used but the actual field should be `SecurityOpt`. This `SecurityOpt` field is verified through the source code in v1.3.0 and v1.4.0: https://github.com/docker/docker/blob/v1.3.0/runconfig/config.go#L35 https://github.com/docker/docker/blob/v1.4.0/runconfig/hostconfig.go#L98 Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
* | | | | Merge pull request #21939 from calavera/events_until_pastBrian Goff2016-04-1512-133/+289
|\ \ \ \ \ | | | | | | | | | | | | Get events until a time in the past.
| * | | | | Get events until a time in the past.David Calavera2016-04-1412-133/+289
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allow to filter events that happened in the past without waiting for future events. Example: docker events --since -1h --until -30m Signed-off-by: David Calavera <david.calavera@gmail.com>
* | | | | | Merge pull request #22079 from allencloud/fix-typos-in-CHANGELOGDavid Calavera2016-04-151-10/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix typos in changelog
| * | | | | | fix typos in changelogallencloud2016-04-161-10/+10
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: allencloud <allen.sun@daocloud.io>
* | | | | | Merge pull request #22066 from thaJeztah/fail-on-unsupported-kernelsDavid Calavera2016-04-151-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Produce fatal error when running on kernel < 3.10.0
| * | | | | Produce fatal error when running on kernel < 3.10.0Sebastiaan van Stijn2016-04-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running on kernel versions older than 3.10 has not been supported for a while (as it's known to be unstable). With the containerd integration, this has become more apparent, because kernels < 3.4 don't support PR_SET_CHILD_SUBREAPER, which is required for containerd-shim to run. Change the previous "warning" to a "fatal" error, so that we refuse to start. There's still an escape-hatch for users by setting "DOCKER_NOWARN_KERNEL_VERSION=1" so that they can run "at their own risk". Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | | Merge pull request #22050 from tophj-ibm/increase-timeout-stdin-close-testAlexander Morozov2016-04-151-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix flaky test TestRunExitOnStdinClose
| * | | | | | Fix flaky test TestRunExitOnStdinCloseChristopher Jones2016-04-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was flaky on ppc64le, where the average time to close was around 1 second. This bumps that timeout to 60 seconds which should be plently. Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
* | | | | | | Merge pull request #22009 from rhvgoyal/docker-cp-fixDavid Calavera2016-04-151-0/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Mount volumes rprivate for archival and other use cases
| * | | | | | | Mount volumes rprivate for archival and other use casesVivek Goyal2016-04-151-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | People have reported following problem. - docker run -ti --name=foo -v /dev/:/dev/ fedora bash - docker cp foo:/bin/bash /tmp Once the cp operation is complete, it unmounted /dev/pts on the host. /dev/pts is a submount of /dev/. This is completely unexpected. Following is the reson for this behavior. containerArchivePath() call mountVolumes() which goes through all the mounts points of a container and mounts them in daemon mount namespace in /var/lib/docker/devicemapper/mnt/<containerid>/rootfs dir. And once we have extracted the data required, these are unmounted using UnmountVolumes(). Mounts are done using recursive bind (rbind). And these are unmounted using lazy mount option on top level mount. (detachMounted()). That means if there are submounts under top level mounts, these mount events will propagate and they were "shared" mounts with host, it will unmount the submount on host as well. For example, try following. - Prepare a parent and child mount point. $ mkdir /root/foo $ mount --bind /root/foo /root/foo $ mount --make-rshared /root/foo - Prepare a child mount $ mkdir /root/foo/foo1 $ mount --bind /root/foo/foo1 /root/foo/foo1 - Bind mount foo at bar $ mkdir /root/bar $ mount --rbind /root/foo /root/bar - Now lazy unmount /root/bar and it will unmount /root/foo/foo1 as well. $ umount -l /root/bar This is not unintended. We just wanted to unmount /root/bar and anything underneath but did not have intentions of unmounting anything on source. So far this was not a problem as docker daemon was running in a seprate mount namespace where all propagation was "slave". That means any unmounts in docker daemon namespace did not propagate to host namespace. But now we are running docker daemon in host namespace so that it is possible to mount some volumes "shared" with container. So that if container mounts something it propagates to host namespace as well. Given mountVolumes() seems to be doing only temporary mounts to read some data, there does not seem to be a need to mount these shared/slave. Just mount these private so that on unmount, nothing propagates and does not have unintended consequences. Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
* | | | | | | | Merge pull request #21006 from cpuguy83/volume_inspect_metaVincent Demeester2016-04-159-4/+62
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allow volume drivers to provide a `Status` field
| * | | | | | | | Allow volume drivers to provide a `Status` fieldBrian Goff2016-04-159-4/+62
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Status` field is a `map[string]interface{}` which allows the driver to pass back low-level details about the underlying volume. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
* | | | | | | | Merge pull request #21633 from tkopczynski/20784-builder-tarsum-testsTibor Vass2016-04-151-0/+351
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Builder/tarsum unit tests
| * | | | | | | | Builder/tarsum unit testsTomasz Kopczynski2016-03-301-0/+351
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
* | | | | | | | | Merge pull request #21726 from aaronlehmann/tarsum-filename-normalizationTõnis Tiigi2016-04-153-2/+62
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix build cache false positives when build context tar contains unnormalized paths
| * | | | | | | | | Fix build cache false positives when build context tar contains unnormalized ↵Aaron Lehmann2016-04-143-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | paths If a build context tar has path names of the form 'x/./y', they will be stored in this unnormalized form internally by tarsum. When the builder walks the untarred directory tree and queries hashes for each relative path, it will query paths of the form 'x/y', and they will not be found. To correct this, have tarsum normalize path names by calling Clean. Add a test to detect this caching false positive. Fixes #21715 Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
* | | | | | | | | | Merge pull request #22060 from hqhq/hq_remove_tmp_codeVincent Demeester2016-04-157-14/+28
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | Remove template code for runc and containerd
| * | | | | | | | | Remove template code for runc and containerdQiang Huang2016-04-157-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
* | | | | | | | | | Merge pull request #22063 from graingert/patch-1Vincent Demeester2016-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | Fix security documentation, XSS -> CSRF
| * | | | | | | | | Fix security documentation, XSS -> CSRFThomas Grainger2016-04-151-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Grainger <tagrain@gmail.com>
* | | | | | | | | Merge pull request #20924 from Microsoft/10662-CPUResourceControlsVincent Demeester2016-04-156-4/+39
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Add CPU count and maximum resource controls for Windows
| * | | | | | | | Add CPU count and maximum resource controls for WindowsDarren Stahl2016-04-146-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Darren Stahl <darst@microsoft.com>
* | | | | | | | | Merge pull request #21172 from yongtang/20909-seccomp-in-docker-infoVincent Demeester2016-04-154-1/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Show "seccomp" in docker info (#20909).
| * | | | | | | | | Show "seccomp" in docker info (#20909).Yong Tang2016-03-304-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pull request added a `SecurityOptions` field in the `GET /info` output to show if there is `apparmor`, `seccomp`, or `selinux` suport. The API changes are updated in the documentation and the update in `GET /info` is covered by the test case in `TestInfoApi`. This pull request fixes #20909. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
* | | | | | | | | | Merge pull request #21634 from ↵Vincent Demeester2016-04-141-15/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cpuguy83/add_beter_logging_for_TestDaemonNoSpaceleftOnDeviceError More logs for `TestDaemonNoSpaceleftOnDeviceError`
| * | | | | | | | | | More logs for `TestDaemonNoSpaceleftOnDeviceError`Brian Goff2016-03-291-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Brian Goff <cpuguy83@gmail.com>
* | | | | | | | | | | Merge pull request #21861 from jfrazelle/apparmor-examples-for-the-apparmor-godsSebastiaan van Stijn2016-04-141-23/+158
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add example to apparmor docs
| * | | | | | | | | | | Add example to apparmor docsJess Frazelle2016-04-141-23/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jess Frazelle <jess@mesosphere.com>
* | | | | | | | | | | | Merge pull request #22040 from thaJeztah/bump-version-to-v1.12.0-devTibor Vass2016-04-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Bump version to v1.12.0-dev
| * | | | | | | | | | | | Bump version to v1.12.0-devSebastiaan van Stijn2016-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | | | | | | | | | Merge pull request #22022 from AkihiroSuda/fixunusedDavid Calavera2016-04-144-62/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | Clean up unused code
| * | | | | | | | | | | | Clean up unused codeAkihiro Suda2016-04-144-62/+1
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Akihiro Suda <suda.kyoto@gmail.com>
View Lorry Controller Status