toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,751 Commits 3 Branches 295 Tags
3ee024f4250595eecaabd91b0bf5cc5a6885923a
Commit Graph

1948 Commits

Author SHA1 Message Date
David Calavera
2415190b1c Merge pull request #15662 from cpuguy83/noisy_blkio_warning 
Quiet sysinfo warnings on container create/start
Upstream-commit: 215a1136f7a65a68a2b2999bdb00d05758882073
Component: engine
 2015-08-18 11:47:17 -07:00
David Calavera
57a4ccd575 Merge pull request #15649 from LK4D4/syslog_validation 
Syslog validation
Upstream-commit: 8aa520b8c020dd78055fbf4423ca0c086f3e4bf4
Component: engine
 2015-08-18 11:14:31 -07:00
Brian Goff
5ec41f4690 Quiet sysinfo warnings on container create/start 
This was making logrus warn on each container create and start.
These warnings are not needed as the code below already warns when these
various cgroup settings aren't supported but have been set.
Warnings were originally introduced by #15381, which appear to be a
side-effect of that change and not the intention.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e9d8e38c4758fdc0ebca5b54cdc1ba253cbbd438
Component: engine
 2015-08-18 10:01:52 -04:00
Zhang Kun
a3521c2e7e fix in daemon side 
Signed-off-by: Zhang Kun <zkazure@gmail.com>

goformat

Signed-off-by: Zhang Kun <zkazure@gmail.com>

fix small

Signed-off-by: Zhang Kun <zkazure@gmail.com>

change to rm

Signed-off-by: Zhang Kun <zkazure@gmail.com>

handler other error

Signed-off-by: Zhang Kun <zkazure@gmail.com>

unique ERR

Signed-off-by: Zhang Kun <zkazure@gmail.com>

setHostConfig_fail_test

Signed-off-by: Zhang Kun <zkazure@gmail.com>

format

Signed-off-by: Zhang Kun <zkazure@gmail.com>

err handle and modify test

Signed-off-by: Zhang Kun <zkazure@gmail.com>

golint error

Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: 1ed15550f57ae822bb30263ce81174cabeb794ec
Component: engine
 2015-08-18 10:06:36 +08:00
Brian Goff
7a8e3f26ae Merge pull request #15650 from LK4D4/fix_max_file_error 
Fix error message in max-file validation
Upstream-commit: fd2e945d155e7506ece7f3ada867b06a2eff7656
Component: engine
 2015-08-17 20:27:12 -04:00
Brian Goff
39fa3c5eb8 Merge pull request #15632 from mountkin/fix-15626 
a quick fix to #15626
Upstream-commit: 1c916dbd8359beb9db14f2688879977db86b2c1d
Component: engine
 2015-08-17 20:26:47 -04:00
Alexander Morozov
3107abf81b Fix error message in max-file validation 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: cde607108badc84ddb6a7e2d2f75ce31be9967a5
Component: engine
 2015-08-17 15:34:39 -07:00
Alexander Morozov
8deea878c7 Fix LogConfig.Config in inspect 
Also add test for daemon-wide log-opt.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3f61002b05794eb5e4262a39e29f8a45c7260ba3
Component: engine
 2015-08-17 15:27:44 -07:00
Alexander Morozov
03328caba1 Check syslog config on daemon start 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 960791ba60621ef2b182379e7b237e681b602694
Component: engine
 2015-08-17 14:29:45 -07:00
Alexander Morozov
acbee0eb90 Do not allow corrupted syslog-address 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: b7a6d14bdc56e9397be8c9bef9c3d991ff30fe77
Component: engine
 2015-08-17 14:19:06 -07:00
Alexander Morozov
c19232ca91 Merge pull request #15635 from cpuguy83/15633_allow_logconfig_empty_driver 
Fix `inspect` output when no log driver specified
Upstream-commit: 5aeb48af7702be78774c36cfabbda1b3bf1c7b34
Component: engine
 2015-08-17 11:03:37 -07:00
David Calavera
d9d9dff9a7 Merge pull request #15579 from Microsoft/10662-graph 
Windows: Graph remove custom interface, add central store
Upstream-commit: 2e7b088164960b7981a058f34336c05dc52f2c53
Component: engine
 2015-08-17 10:45:48 -07:00
Brian Goff
f403372672 Fix inspect output when no log driver specified 
Config options were being ignored in the inspect output when no driver
was specified.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2f2779b6a5c8f6efcd2ba55bf7cb0db54c259726
Component: engine
 2015-08-17 11:35:34 -04:00
Shijiang Wei
e353ad2a0e a quick fix to #15626 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 3977f30869fad2c679d7913ce968add7c7987282
Component: engine
 2015-08-17 21:35:57 +08:00
Sebastiaan van Stijn
f2f5327a6e Merge pull request #14113 from dit4c/10348-exec-privileged 
Remerge of `docker exec --privileged` with better tests
Upstream-commit: e1f3a5ad0aade527c1b00385652aec21d1cf09ac
Component: engine
 2015-08-16 00:20:41 +02:00
Stefan J. Wernli
73f39654a9 Windows: Graph remove custom interface and add central store 
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>

Windows: add support for images stored in alternate location.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: dfbb5520e3b35030f3eef38d5a2d86ad20ea0a2f
Component: engine
 2015-08-14 23:45:53 -07:00
Tibor Vass
809e0fd73f Merge pull request #14530 from Microsoft/10662-serversidevalidation 
Windows: [TP3] Move netmode validation to server
Upstream-commit: 3e523ae015750be4893b9c5a4f77361fbb0e9849
Component: engine
 2015-08-14 16:05:59 -04:00
John Howard
da7258ee55 Move netmode validation to server 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f6ed590596cbf73764b40ff4f32f90b1cdb8b213
Component: engine
 2015-08-14 12:17:41 -07:00
Madhu Venugopal
89380524e8 Vendoring in libnetwork 22dc04d06067b40a9e7ef575aee6d1bb69d4dcc3 
Notable changes include :
- #285 : Fix required for https://github.com/docker/docker/pull/12927
- #283 : Code re-architecture/tech-debt in bridge driver
- Upgraded to latest Netlink library
- Fixed certain race-conditions

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 703e2264bae99784496794365ea72348715e7c70
Component: engine
 2015-08-14 05:57:47 -07:00
John Starks
84c4707817 Windows: new hcsshim stdin/out/err handling 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ec5a73d18eb6a5241cdaa0b5d473abb085d6f491
Component: engine
 2015-08-13 13:09:42 -07:00
Tim Dettrick
337be087f4 Revert "Revert "Add docker exec run a command in privileged mode"" 
This reverts commit 40b71adee390e9c06471b89ed845132b4ec80177.

Original commit (for which this is effectively a rebased version) is
72a500e9e5929b038816d8bd18d462a19e571c99 and was provided by Lei Jitang
<leijitang@huawei.com>.

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
Upstream-commit: 03f65b3d0d66ccdc8b69a447b75508d594007600
Component: engine
 2015-08-13 16:36:44 +10:00
Arnaud Porterie
6bdf36a6da Merge pull request #15399 from Microsoft/10662-portmapping 
Windows: [TP3] Enable NAT port mapping
Upstream-commit: 72e55cb0eca82017cd696e0a0d41e40be43086a1
Component: engine
 2015-08-12 19:07:14 -07:00
John Howard
3c87acb006 Windows: Enable NAT port mapping 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4393be71005e63ab305f4d87481dbd23b7594d18
Component: engine
 2015-08-12 13:17:27 -07:00
Alexander Morozov
187778eec2 Merge pull request #15504 from kolyshkin/zfs-nitpicks 
zfs nitpicks
Upstream-commit: d8ff9ef2b5349b111d09d791fcbc81e1d9deab30
Component: engine
 2015-08-12 11:54:35 -07:00
Jessie Frazelle
60f12fa9b0 Merge pull request #15446 from cpuguy83/better_err_on_exec_err 
Return better errors from exec
Upstream-commit: d3198fa8c4f704a2ddd4d876003757b30a61c00c
Component: engine
 2015-08-12 11:13:29 -07:00
Kir Kolyshkin
baa28c0e1c graphdriver/zfs: fix GetMetadata() comment 
Commit e27c904 added a wrong and misleading comment
to GetMetadata(). Fix it using the wording from
commit 407a626 which introduced GetMetadata().

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Upstream-commit: 15a232fd06e062f8aae4e89e1f520f44c875daeb
Component: engine
 2015-08-11 18:16:11 -07:00
Kir Kolyshkin
9192baac2d graphdriver/zfs: privatize mountPath and zfsPath 
These functions are not part of the graphdriver.Driver
interface and should therefore be private.

Also, remove comments added by commit e27c904 as they are
* pretty obvious
* no longer required by golint

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Upstream-commit: f5f7fee2ecc964314b2a7b910fda71a157c90f16
Component: engine
 2015-08-11 18:16:08 -07:00
Alexander Morozov
cbeaee68d7 Merge pull request #15422 from kolyshkin/graphtest-fix 
graphtest: filter out lost+found dir entry
Upstream-commit: 0bfad28b867a8dc4d20a15c73588672ae861eaab
Component: engine
 2015-08-10 12:21:21 -07:00
Alexander Morozov
7a08f892e2 Merge pull request #15404 from vbatts/vbatts-dm-zero-sized-field 
devicemapper: fix zero-sized field access
Upstream-commit: 6f89a8ee1ba6b598dc1f76e829d6db6f830cdb8e
Component: engine
 2015-08-10 09:16:11 -07:00
Vincent Batts
48bf8fcaf6 devicemapper: fix zero-sized field access 
Fixes: #15279

Due to
7904946eeb
the devices field is dropped.

This solution works on go1.4 and go1.5

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: f83d05c3be3c3bcc84f6fa229504848ee8078321
Component: engine
 2015-08-10 11:11:58 -04:00
Brian Goff
2db4446de9 Merge pull request #15445 from hqhq/hq_use_docker_daemon 
Change all docker -d to docker daemon
Upstream-commit: 51249a3aa09b8e1ade07ed6be0029a190b978b05
Component: engine
 2015-08-10 10:35:19 -04:00
Brian Goff
978d8e86f8 Return better errors from exec 
Also cleans up some of the API side of exec.
Was writing the header twice (two different headers).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f078f75bf25353720f28f9f1ea180374fe205302
Component: engine
 2015-08-10 09:53:19 -04:00
David Calavera
beef462220 Merge pull request #15437 from calavera/remove_wrong_doc 
Remove doc that doesn't apply to Journald.
Upstream-commit: 650d5d5d7a06f4d8bfa0e09b974c4c6351c0af21
Component: engine
 2015-08-10 08:44:08 -05:00
Qiang Huang
8120b4d8fe Change all docker -d to docker daemon 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 81cc8ebc93c20537d5fab4c016a3774f58b3e483
Component: engine
 2015-08-10 20:48:08 +08:00
Yibai Zhang
761dc54167 fix typo mistake 
Signed-off-by: Yibai Zhang <xm1994@gmail.com>
Upstream-commit: fa9e54fbf112c44de05a66330fc22303b1681d05
Component: engine
 2015-08-10 16:30:48 +08:00
David Calavera
8adfc237c0 Remove doc that doesn't apply to Journald. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f1412f29423def166b0d77e162eec867afc56a8c
Component: engine
 2015-08-09 22:12:42 -05:00
Kir Kolyshkin
280de502d3 graphtest: filter out lost+found dir entry 
Ploop graph driver provides its own ext4 filesystem to every
container. It so happens that ext4 root comes with lost+found
directory, causing failures from DriverTestCreateEmpty() and
DriverTestCreateBase() tests on ploop.

While I am not yet ready to submit ploop graph driver for review,
this change looks simple enough to push.

Note that filtering is done without any additional allocations,
as described in https://github.com/golang/go/wiki/SliceTricks.

[v2: added a comment about lost+found]

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Upstream-commit: 158c536267a6530082cd60ba8f79a86444f0d2eb
Component: engine
 2015-08-09 10:23:36 -07:00
David Calavera
f05efc7f51 Fix typo in Overlay documentation. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f1f6738d974a5bb4f798a1f01fd074bfb45f681f
Component: engine
 2015-08-08 15:11:09 -07:00
Brian Goff
89ab9698f7 Merge pull request #15074 from coolljt0725/14756_enable_golint_2 
Enable golint in pkg/jsonlog and pkg/jsonmessage part of #14756
Upstream-commit: 764aa1a583ba6f73a32af1ba064401967cb716b6
Component: engine
 2015-08-08 07:14:53 -04:00
Arnaud Porterie
755087c2f9 Merge pull request #15420 from vlajos/typofixes-vlajos-20150807 
typofix - https://github.com/vlajos/misspell_fixer
Upstream-commit: bf892dcfcc002ee374057033a940ce2250181066
Component: engine
 2015-08-08 01:08:49 -07:00
Lei Jitang
305eb65786 Enable golint in pkg/jsonlog and pkg/jsonmessage. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5220f3b535ce38edbff616bc78f1eb92148d310e
Component: engine
 2015-08-08 11:28:22 +08:00
David Calavera
3cfa964774 Merge pull request #14965 from stefanberger/nohidevols2 
Have network files mounted read-only when -v parameter has 'ro' passed
Upstream-commit: 196aa6d62d7084033a37f7085c2b2f55cd744d34
Component: engine
 2015-08-07 19:10:59 -07:00
Veres Lajos
2c6e673ce7 typofix - https://github.com/vlajos/misspell_fixer 
Signed-off-by: Veres Lajos <vlajos@gmail.com>
Upstream-commit: 514623272398574c8fd7ef3fe42c5b2ae161349a
Component: engine
 2015-08-07 23:25:49 +01:00
Srini Brahmaroutu
d20356ab98 daemon/graphdriver/overlay/ fix lint errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: de3944219f23ffe3ac83add4c1f2b0ec0a4cd5c0
Component: engine
 2015-08-07 18:34:59 +00:00
David Calavera
c8706706f4 Merge pull request #14897 from WeiZhang555/golint-api-types 
fix golint warnings/errors on package api/types/
Upstream-commit: 0a0e9701f7bbe58e75eff9d1934fde0a5038ee9c
Component: engine
 2015-08-07 10:51:27 -07:00
David Calavera
2781bd4bd9 Add platformSupported flag to enable daemon mode by platform. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 10d30c64579639f30aa857a881cd813a75193887
Component: engine
 2015-08-07 09:45:24 -07:00
David Calavera
5024eec3d4 Merge pull request #15386 from jfrazelle/remove-docker-unconfined-profile 
remove docker-unconfined profile we were not using it
Upstream-commit: b9094633f361c1881172fc38e4f91de5659f671b
Component: engine
 2015-08-06 20:06:33 -07:00
Zhang Wei
502a6d4faf fix golint warnings/errors on package api/types/ 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 3d6617ffe7d9242107ac09eab4f2d8ce87acb95c
Component: engine
 2015-08-07 09:43:43 +08:00
Stefan Berger
70e2333c7e Have network files mounted read-only when -v parameter has 'ro' passed 
Have network files mounted read-only when mounted using the -v
open and -v parameter has 'ro' passed.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 38295d4b48fed3d9569100543a25e46b21deba46
Component: engine
 2015-08-06 20:37:28 -04:00
Jessica Frazelle
59f2aefefe remove docker-unconfined profile we were not using it and it breaks apparmor on wheezy 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: e542238f2a4ba9d77bf8ebc77e319dd6b321925f
Component: engine
 2015-08-06 16:51:01 -07:00