6aeaa4026b
Merge pull request #15999 from cpuguy83/15994_ext_volume_bind
...
Set bind driver after volume is created
Upstream-commit: 7c667f9d6e506fb502426f2d98db8c0c124fe03b
Component: engine
2015-09-04 09:47:10 -07:00
e579f48cbf
Merge pull request #15845 from calavera/refactor_daemon_list
...
Refactor daemon container list.
Upstream-commit: c8c1c472b21fbe7079f5fccbbda8d9652c7c00d3
Component: engine
2015-09-03 20:48:54 -04:00
c7a363d08b
Merge pull request #15846 from ZJU-SEL/11646-fix-path-validations
...
fix 11646 to check volume path in server side
Upstream-commit: 057f53f503d21e004ec4f75eeafa10de1ceecc63
Component: engine
2015-09-03 20:42:37 -04:00
b5219c6311
Merge pull request #16041 from runcom/portmapping-doc-cleaning
...
Clean latest api doc from PortMapping and outdated error check
Upstream-commit: 2d605ce53bc45f6d83f3d1c873d57d207d84b7d4
Component: engine
2015-09-03 19:37:34 -04:00
140037e825
Merge pull request #16025 from sallyom/overlayfsSelinux
...
selinux/overlay incompatible err
Upstream-commit: 9d0eef55eabeb36ae1f182ed954411f00275f96e
Component: engine
2015-09-03 16:08:55 -04:00
2f2b355be9
Merge pull request #16038 from aboch/sbx
...
Vendor libnetwork dc52820147f40fe424c8959987af3b396f842639
Upstream-commit: 288275ab60c049fa644f1ce5d36c0c005e8dd02c
Component: engine
2015-09-03 11:48:02 -07:00
3b4e85f885
Clean latest api doc from PortMapping and outdated error check
...
Regarding the outdated error check, there's no `docker.PortMapping`
struct anymore and this is linked to something really old #1334
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 137c12f19a6838eeebfd45c459b883bb69f53d36
Component: engine
2015-09-03 11:01:55 +02:00
357660a251
Docker changes for libnetwork Sandbox
...
- Ground-work for integrating with user namespace support
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 56fdb05258d1ab2153fec268ed22cf9d1227c356
Component: engine
2015-09-02 17:24:56 -07:00
ee5c0b914e
Set bind driver after volume is created
...
When using a named volume without --volume-driver, the driver was
hardcoded to "local".
Even when the volume was already created by some other driver (and
visible in `docker volume ls`), the container would store in it's own
config that it was the `local` driver.
The external driver would work perfecly fine until the daemon is
restarted, at which point the `local` driver was assumed because that is
as it was set in the container config.
Set the bind driver to the driver returned by createVolume.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 39be36658d559d0fe28c902ad0f45287868c7ebb
Component: engine
2015-09-02 20:13:20 -04:00
4da3ed2f74
Merge pull request #16030 from Microsoft/fix-golint-commit
...
Windows: Fix golint daemon breaking commit
Upstream-commit: fb4cce5e53061d8a0f4bd228e1a0286ccace0d8e
Component: engine
2015-09-02 20:10:33 -04:00
bcf9624e7a
Merge pull request #16002 from Microsoft/10662-workdir-platformsemantics
...
Windows: Ensure workdir handled in platform semantics
Upstream-commit: c6dd4510736dbbf3166b1eb7715b51fb15ca1678
Component: engine
2015-09-02 16:09:35 -07:00
8925b7fcf4
selinux/overlay incompatible err
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: 04329e0b3e47e411ebf0a4ba8947be6e87014737
Component: engine
2015-09-02 18:52:10 -04:00
851cbff030
Windows: Fix golint daemon breaking commit
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: cfddca2bf90764757a436720361cda674071ba4f
Component: engine
2015-09-02 14:36:45 -07:00
262b85d1ce
Remove PortMapping from container NetworkSettings
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: db4f20404d2b8c4da5a15e447f52cd634445cfe3
Component: engine
2015-09-02 14:32:53 +02:00
d965c25392
Windows: Ensure workdir handled in platform semantics
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6c56f917d3facec1438d03712f8a26d929fbe5ea
Component: engine
2015-09-01 18:50:41 -07:00
852f919527
Merge pull request #15834 from Microsoft/10662-fixdockercp
...
Windows: Fix docker cp
Upstream-commit: be8e126a0f301c3bebf01e50349632670c9ab938
Component: engine
2015-09-01 08:41:59 -07:00
c60fcca7ee
Merge pull request #15913 from mountkin/abstract
...
abstract the string slice struct to stringutils package
Upstream-commit: 4bb2449188a7d09de5fd35d1be4b35dd5780c825
Component: engine
2015-09-01 17:06:13 +02:00
180469a2a4
daemon/commit: remove unneeded code
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: ab868ad79c631b2606b479edf12d287b986c72d4
Component: engine
2015-09-01 16:34:07 +08:00
cd128eab1d
Merge pull request #15606 from jlhawn/img_delete
...
[daemon] Refactor image_delete.go
Upstream-commit: 96974170f8ca82dedffbfe54e84b6b1b2f5661d2
Component: engine
2015-08-31 18:22:48 +02:00
aa64926347
Merge pull request #15807 from coolljt0725/remove_remove_redundant_tag_name
...
Minor fix: remove redundant tag name in error message of create failed.
Upstream-commit: 754c10430b1d0e6247e2cdd150bc15291ff87de0
Component: engine
2015-08-31 11:34:40 -04:00
743472f299
Warning message for lvm devmapper running on top of loopback devices
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 4870fb36d4ab1ef221cdcd95644cb19f6da0217a
Component: engine
2015-08-31 10:35:48 -04:00
f2ca32df70
Refactor daemon container list.
...
Separate container iteration, filtering and reducing.
This will make easier in the future to improve the implementation of
docker ps as we know it.
The end goal is to unify the objects returned by the api for docker ps
and docker inspect, leaving all docker ps transformations to the client.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 06699f73fb6d779894a875f9177afc5a1f3bc5b3
Component: engine
2015-08-31 04:24:08 -04:00
d30ce2eec5
just check -v /src:dest and test it
...
Signed-off-by: xlgao <xlgao@zju.edu.cn >
Upstream-commit: 50be74ba1479278cc220633365cdd1c5a21d7cda
Component: engine
2015-08-31 10:50:49 +08:00
58471ed642
Minor fix: remove redundant tag name in error message of create failed.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 16220e06810c38b8e531c3508221458ffb330e97
Component: engine
2015-08-30 10:43:33 +08:00
a9bff20ad7
Don't hold lock around volume driver for volume create.
...
Signed-off-by: Stephen Rust <srust@blockbridge.com >
Upstream-commit: 0ef740a5bf093aa544802ccfbb0612e04ed8492a
Component: engine
2015-08-28 16:28:28 -04:00
f6d5f51a76
[daemon] Refactor image_delete.go
...
This file was not well documented and had very high cyclomatic complexity.
This patch completely rearranges this file and the ImageDelete method to
be easier to follow and more maintainable in the future.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 111d2f348767692a34366ff5cd01f607cf54ad57
Component: engine
2015-08-28 11:01:24 -07:00
aaf90d6259
Merge pull request #14570 from vdemeester/13365-ps-image-filter
...
Add docker ps ancestor filter for image
Upstream-commit: b1cb1b1df493b3e0b739b9f374b6c82e306dede8
Component: engine
2015-08-28 19:47:43 +02:00
6190aee4a2
abstract the string slice struct to stringutils package
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: ea4a06740b6d4579f77507c1d7e0897a870fd72d
Component: engine
2015-08-29 01:08:40 +08:00
2eb78e33c8
Merge pull request #15910 from mimoralea/patch-1
...
Typo fix then -> than
Upstream-commit: e6e210164e48684c80008bbcce917de349253758
Component: engine
2015-08-28 18:09:26 +02:00
eeab72d8f5
Typo fix then -> than
...
Signed-off-by: Miguel Morales <mimoralea@hp.com >
Upstream-commit: 95e3a4ca6d7635e11d606a1011e0a55146c68460
Component: engine
2015-08-28 10:44:39 -05:00
d5c2dfe3ee
Merge pull request #15310 from MHBauer/demon-lint-squash
...
golint fixes for daemon/ package
Upstream-commit: 433956cc47c4cf7a52068c0518bd30ad044fa3b7
Component: engine
2015-08-28 17:34:36 +02:00
5950954f43
Merge pull request #15023 from hqhq/hq_add_status_in_inspect
...
Add status string to State field for inspect
Upstream-commit: 6caaa8a63544c052d757aecee93d3488b7b3d9e2
Component: engine
2015-08-28 08:27:36 -07:00
1870e3919c
golint fixes for daemon/ package
...
- some method names were changed to have a 'Locking' suffix, as the
downcased versions already existed, and the existing functions simply
had locks around the already downcased version.
- deleting unused functions
- package comment
- magic numbers replaced by golang constants
- comments all over
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: abd72d4008dde7ee8249170d49eb4bc963c51e24
Component: engine
2015-08-27 22:07:42 -07:00
a8d6119113
Finish linting opts and trust package.
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0bd016b1c31f807169019d10a496144c34698431
Component: engine
2015-08-27 17:36:11 +02:00
cd1363a47b
golint: trust
...
contributes to #14756
Signed-off-by: Sevki Hasirci <s@sevki.org >
Upstream-commit: 5572148477ad069989bc3301e662cd6ee44832d2
Component: engine
2015-08-27 11:40:27 +02:00
248e0595b9
Merge pull request #15801 from jfrazelle/btrfs-rm-subvolume-recursion
...
remove btrfs subvolumes when destroying containers (recursive)
Upstream-commit: 459c2c66c3c168364f90532811c96c80e8153822
Component: engine
2015-08-26 14:00:53 -07:00
e191a06015
Add 'ancestor' ps filter for image
...
Makes it possible to filter containers by image, using
--filter=ancestor=busybox and get all the container running busybox
image and image based on busybox (to the bottom).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c1af0ac0820d1385fe2ee65593b0558840395c7b
Component: engine
2015-08-26 22:59:48 +02:00
20b02657f2
Merge pull request #15865 from Microsoft/10662-isabs
...
Windows: Fix use of IsAbs check
Upstream-commit: 47cdae243a7e0108d487e88cab966ff09e8d94c0
Component: engine
2015-08-26 13:29:24 -07:00
05f2bb7d8b
Merge pull request #14242 from cpuguy83/add_volume_api
...
Add volume api
Upstream-commit: fa13f7cde81d1d92c17740efb05823e7f9cc5468
Component: engine
2015-08-26 21:57:12 +02:00
799fa64220
Windows: Fix use of IsAbs check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f11ba3135b19006a47cf80861f3c291a3211eb1e
Component: engine
2015-08-26 12:38:28 -07:00
bfe1bbc7d2
Add volume API/CLI
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b3b7eb2723461b1eb4be692f4bced0ae8ea9cb58
Component: engine
2015-08-26 13:37:52 -04:00
34f99e4291
Merge pull request #15848 from calavera/revert_ipc_mounts
...
DO NOT MERGE: Check if these commits broke the builds.
Upstream-commit: 5dadfa8b697f83619f4782eb2421c161a779b859
Component: engine
2015-08-26 10:29:25 -07:00
c1608c666a
Merge pull request #13304 from coolljt0725/restart_daemon_with_paused_containers
...
Fix restart docker daemon with paused containers
Upstream-commit: 2cec06fbcd0b4cb6107ae432d92c3997075a4035
Component: engine
2015-08-26 09:04:14 -04:00
8c106c9224
Revert "Add support for sharing /dev/shm/ and /dev/mqueue between containers"
...
This reverts commit d88fe447df0e87b3a57f9d08b108b141dd72678c.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 688dd8477e907ca1899c6c2863775b3af2c30174
Component: engine
2015-08-26 05:23:00 -04:00
45c63177a1
Windows: Fix docker cp
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f950de575483f562bc56b7f42b67b00b3df1387b
Component: engine
2015-08-25 13:26:49 -07:00
5b4a0b8a4c
cleanup and fix btrfs subvolume recursion deletion
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: bd06432ba32a6cc555de82e08b125992aaec25fb
Component: engine
2015-08-25 13:00:41 -07:00
b498641d47
Merge pull request #14665 from coolljt0725/fix_build_with_resource_limit
...
Fix build with resource limit which system not support.
Upstream-commit: 6f8c4480e4f99b08c84d25f1611d6b12ee646066
Component: engine
2015-08-25 16:42:13 +02:00
ef9b8937c0
Fix docker daemon restart with paused container.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 9a9724ad5616dc1a29efabe8082bde043c1a2bc9
Component: engine
2015-08-25 09:42:58 +08:00
322a07231d
Merge pull request #12159 from mrunalp/feature/ipc_share_dev
...
ipc: Share /dev/shm and /dev/mqueue when --ipc container:<id/name> is used
Upstream-commit: 903cd2b9e3e2cea8b5ee7c0b74d52ff4a3beafb5
Component: engine
2015-08-24 17:55:03 -07:00
02b562a357
Merge pull request #15702 from LK4D4/fix_events_tests_15
...
Make events test more deterministic in go1.5
Upstream-commit: 562cc6254fbeae24be2cc7ab5b4a608bcb06ac5f
Component: engine
2015-08-24 20:15:09 -04:00
