3e720579c6
Merge pull request #16162 from cpuguy83/16071_fix_lstat_errors
...
Ignore stat errors on volume rm.
Upstream-commit: d3338494598c6d25153cd3e97a0a783ccd4e06d5
Component: engine
2015-09-09 11:55:14 -07:00
154c412ece
Merge pull request #15798 from calavera/volume_driver_host_config
...
Move VolumeDriver to HostConfig to make containers portable.
Upstream-commit: 9ca4aa479788867cd2dce161efa1e43ea5dfc14f
Component: engine
2015-09-08 22:05:40 -04:00
52da61961a
Ignore stat errors on volume rm.
...
Underlying volume data may have been removed by some other tool.
Ignore and remove the reference in this case.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 8d27417bfeff316346d00c07a456b0e1b056e788
Component: engine
2015-09-08 22:01:02 -04:00
2272874ccb
Merge pull request #16113 from Mashimiao/fix-bug-daemon-delete-link-remove
...
record the error of removing volumes when removing containers
Upstream-commit: 25418010efc695e695e6f86352f5f535d2e0a3be
Component: engine
2015-09-08 19:44:56 -04:00
22903b10c1
Merge pull request #16096 from vdemeester/14756-final-golints
...
Final bits of enabling golint on the code base 🐹
Upstream-commit: 634a848b8e3bdd8aed834559f3b2e0dfc7f5ae3a
Component: engine
2015-09-08 15:25:55 -07:00
da721c9eef
Merge pull request #16148 from Microsoft/10662-fixlogging
...
Windows: Fix logging
Upstream-commit: 5c22cb5741fc3897734ef375150a8e9a4925cb06
Component: engine
2015-09-08 14:28:28 -07:00
74847cecc0
Merge pull request #16151 from LK4D4/light_stats
...
Don't read CPU usage if there is no subscribers for stats
Upstream-commit: fd32c471121d7dfc80b64201a98c10acbb9419fc
Component: engine
2015-09-08 14:26:54 -07:00
364794e2fe
Windows: Fix logging
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1d52c53eea22e413a42856154cc21a9f92cd5117
Component: engine
2015-09-08 12:18:50 -07:00
13060be786
Don't read CPU usage if there is no subscribers for stats
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c486a3a6dc960dd0e6f977865a43ae0117f1545d
Component: engine
2015-09-08 11:57:22 -07:00
8b42f11b4c
Merge pull request #16142 from cpuguy83/stats_pass_container
...
Don't lookup container 4 times for stats
Upstream-commit: 451f4d0d3b5708108807429d6795248871b175a8
Component: engine
2015-09-08 11:19:33 -07:00
1b5a4c8c22
Merge pull request #16098 from thaJeztah/fix-16095-reverse-dangling
...
Fix docker volume dangling filter
Upstream-commit: 3a539c6db9c1fdaf528731dd0af7e53d5ecf49cf
Component: engine
2015-09-08 10:17:07 -04:00
4a380ba714
Don't lookup container 4 times for stats
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: dc8a39036b8c9da4c21c48f492cdbb795170bb21
Component: engine
2015-09-08 10:12:46 -04:00
936e7392bc
Merge pull request #16110 from Mashimiao/daemon-create-fix-return-and-adjust
...
before adjusting should check whether need return or not
Upstream-commit: c1c4ccefcdbb3cf8eb00c10b21e3f0aabc005b2a
Component: engine
2015-09-07 09:16:23 -07:00
cfca396ca7
record the error of removing volumes
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 49da0290309771891a2ea9238709bc5a248609c9
Component: engine
2015-09-07 16:38:05 +08:00
b9c2a00198
daemon/daemon: fix typo
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 89f99343ff3df3cc5ac243a3a056f136885d012b
Component: engine
2015-09-07 14:43:22 +08:00
e97d8f4a03
before adjusting should check whether need return or not
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 73d8af9319cb3f6183d693a4abc0ef93dabf9b97
Component: engine
2015-09-07 11:09:39 +08:00
1e6922e84b
Fix docker volume dangling filter
...
The docker volume ls -f dangling=true filter was
inverted; the filtered results actually returned all
non-dangling volumes.
This fixes the filter and adds some integration tests
to test the correct behavior.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 1cbf9047b3be1bee39a72e96808581ff3c312a6c
Component: engine
2015-09-06 20:17:56 +02:00
05ac4217a0
Lint package pkg/devicemapper
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6990b76a696dd265674f4c2973f25755a6485f05
Component: engine
2015-09-05 23:15:13 +02:00
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
350911ed1c
Move VolumeDriver to HostConfig to make containers portable.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 6549d6517bf9a7c79d21a86cbf36af10fcdbfbe0
Component: engine
2015-09-04 12:42:44 -04: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
