Lei Jitang
c8a46cb0b2
Fix docker daemon start with old running container which user volume plugin. Fixes #15720
...
Signed-off-by: Lei Jitang <leijitang@huawei>
2015-08-21 11:29:53 +08:00
Doug Davis
90ebc3b455
Merge pull request #14928 from brahmaroutu/lint_daemon_graphdriver
...
daemon/graphdriver fix lint errors/warnings
2015-08-20 03:25:00 -07:00
Phil Estes
70c4b6e619
Merge pull request #15695 from lmesz/deviceset_warn_fix
...
deviceset.go: fixed link in warning about udex sync is not supported
2015-08-19 08:05:27 -07:00
Sebastiaan van Stijn
59e49e1db0
Merge pull request #12927 from lindenlab/custom-host-port-ranges
...
Proposal: Change --publish=SPEC to allow binding to custom host port ranges
2015-08-19 17:04:23 +02:00
Laszlo Meszaros
78676f19c1
deviceset.go: fixed link in warning about udex sync is not supported
...
Signed-off-by: Laszlo Meszaros <lacienator@gmail.com>
2015-08-19 14:16:40 +02:00
David Calavera
215a1136f7
Merge pull request #15662 from cpuguy83/noisy_blkio_warning
...
Quiet sysinfo warnings on container create/start
2015-08-18 11:47:17 -07:00
David Calavera
8aa520b8c0
Merge pull request #15649 from LK4D4/syslog_validation
...
Syslog validation
2015-08-18 11:14:31 -07:00
Brian Goff
e9d8e38c47
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>
2015-08-18 10:01:52 -04:00
Zhang Kun
1ed15550f5
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>
2015-08-18 10:06:36 +08:00
Brian Goff
fd2e945d15
Merge pull request #15650 from LK4D4/fix_max_file_error
...
Fix error message in max-file validation
2015-08-17 20:27:12 -04:00
Brian Goff
1c916dbd83
Merge pull request #15632 from mountkin/fix-15626
...
a quick fix to #15626
2015-08-17 20:26:47 -04:00
Alexander Morozov
cde607108b
Fix error message in max-file validation
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-08-17 15:34:39 -07:00
Alexander Morozov
3f61002b05
Fix LogConfig.Config in inspect
...
Also add test for daemon-wide log-opt.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-08-17 15:27:44 -07:00
Alexander Morozov
960791ba60
Check syslog config on daemon start
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-08-17 14:29:45 -07:00
Alexander Morozov
b7a6d14bdc
Do not allow corrupted syslog-address
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-08-17 14:19:06 -07:00
Srini Brahmaroutu
9e1a41aae5
daemon/graphdriver fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-08-17 19:27:36 +00:00
Alexander Morozov
5aeb48af77
Merge pull request #15635 from cpuguy83/15633_allow_logconfig_empty_driver
...
Fix `inspect` output when no log driver specified
2015-08-17 11:03:37 -07:00
David Calavera
2e7b088164
Merge pull request #15579 from Microsoft/10662-graph
...
Windows: Graph remove custom interface, add central store
2015-08-17 10:45:48 -07:00
Brian Goff
2f2779b6a5
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>
2015-08-17 11:35:34 -04:00
Shijiang Wei
3977f30869
a quick fix to #15626
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-08-17 21:35:57 +08:00
Sebastiaan van Stijn
e1f3a5ad0a
Merge pull request #14113 from dit4c/10348-exec-privileged
...
Remerge of `docker exec --privileged` with better tests
2015-08-16 00:20:41 +02:00
Stefan J. Wernli
dfbb5520e3
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>
2015-08-14 23:45:53 -07:00
Don Kjer
47272f9cc5
Adding support to publish on custom host port ranges
...
Signed-off-by: Don Kjer <don.kjer@gmail.com>
Changing vendor/src/github.com/docker/libnetwork to match lindenlab/libnetwork custom-host-port-ranges-1.7 branch
2015-08-15 02:41:29 +00:00
Tibor Vass
3e523ae015
Merge pull request #14530 from Microsoft/10662-serversidevalidation
...
Windows: [TP3] Move netmode validation to server
2015-08-14 16:05:59 -04:00
John Howard
f6ed590596
Move netmode validation to server
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-14 12:17:41 -07:00
Madhu Venugopal
703e2264ba
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>
2015-08-14 05:57:47 -07:00
John Starks
ec5a73d18e
Windows: new hcsshim stdin/out/err handling
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-13 13:09:42 -07:00
Tim Dettrick
03f65b3d0d
Revert "Revert "Add docker exec run a command in privileged mode""
...
This reverts commit 40b71adee3
.
Original commit (for which this is effectively a rebased version) is
72a500e9e5
and was provided by Lei Jitang
<leijitang@huawei.com>.
Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
2015-08-13 16:36:44 +10:00
Arnaud Porterie
72e55cb0ec
Merge pull request #15399 from Microsoft/10662-portmapping
...
Windows: [TP3] Enable NAT port mapping
2015-08-12 19:07:14 -07:00
John Howard
4393be7100
Windows: Enable NAT port mapping
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-12 13:17:27 -07:00
Alexander Morozov
d8ff9ef2b5
Merge pull request #15504 from kolyshkin/zfs-nitpicks
...
zfs nitpicks
2015-08-12 11:54:35 -07:00
Jessie Frazelle
d3198fa8c4
Merge pull request #15446 from cpuguy83/better_err_on_exec_err
...
Return better errors from exec
2015-08-12 11:13:29 -07:00
Kir Kolyshkin
15a232fd06
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>
2015-08-11 18:16:11 -07:00
Kir Kolyshkin
f5f7fee2ec
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>
2015-08-11 18:16:08 -07:00
Alexander Morozov
0bfad28b86
Merge pull request #15422 from kolyshkin/graphtest-fix
...
graphtest: filter out lost+found dir entry
2015-08-10 12:21:21 -07:00
Alexander Morozov
6f89a8ee1b
Merge pull request #15404 from vbatts/vbatts-dm-zero-sized-field
...
devicemapper: fix zero-sized field access
2015-08-10 09:16:11 -07:00
Vincent Batts
f83d05c3be
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>
2015-08-10 11:11:58 -04:00
Brian Goff
51249a3aa0
Merge pull request #15445 from hqhq/hq_use_docker_daemon
...
Change all docker -d to docker daemon
2015-08-10 10:35:19 -04:00
Brian Goff
f078f75bf2
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>
2015-08-10 09:53:19 -04:00
David Calavera
650d5d5d7a
Merge pull request #15437 from calavera/remove_wrong_doc
...
Remove doc that doesn't apply to Journald.
2015-08-10 08:44:08 -05:00
Qiang Huang
81cc8ebc93
Change all docker -d to docker daemon
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-08-10 20:48:08 +08:00
Yibai Zhang
fa9e54fbf1
fix typo mistake
...
Signed-off-by: Yibai Zhang <xm1994@gmail.com>
2015-08-10 16:30:48 +08:00
David Calavera
f1412f2942
Remove doc that doesn't apply to Journald.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-09 22:12:42 -05:00
Kir Kolyshkin
158c536267
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>
2015-08-09 10:23:36 -07:00
David Calavera
f1f6738d97
Fix typo in Overlay documentation.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-08 15:11:09 -07:00
Brian Goff
764aa1a583
Merge pull request #15074 from coolljt0725/14756_enable_golint_2
...
Enable golint in pkg/jsonlog and pkg/jsonmessage part of #14756
2015-08-08 07:14:53 -04:00
Arnaud Porterie
bf892dcfcc
Merge pull request #15420 from vlajos/typofixes-vlajos-20150807
...
typofix - https://github.com/vlajos/misspell_fixer
2015-08-08 01:08:49 -07:00
Lei Jitang
5220f3b535
Enable golint in pkg/jsonlog and pkg/jsonmessage.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-08 11:28:22 +08:00
David Calavera
196aa6d62d
Merge pull request #14965 from stefanberger/nohidevols2
...
Have network files mounted read-only when -v parameter has 'ro' passed
2015-08-07 19:10:59 -07:00
Veres Lajos
5146232723
typofix - https://github.com/vlajos/misspell_fixer
...
Signed-off-by: Veres Lajos <vlajos@gmail.com>
2015-08-07 23:25:49 +01:00