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
Srini Brahmaroutu
de3944219f
daemon/graphdriver/overlay/ fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-08-07 18:34:59 +00:00
David Calavera
0a0e9701f7
Merge pull request #14897 from WeiZhang555/golint-api-types
...
fix golint warnings/errors on package api/types/
2015-08-07 10:51:27 -07:00
David Calavera
10d30c6457
Add platformSupported flag to enable daemon mode by platform.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-07 09:45:24 -07:00
David Calavera
b9094633f3
Merge pull request #15386 from jfrazelle/remove-docker-unconfined-profile
...
remove docker-unconfined profile we were not using it
2015-08-06 20:06:33 -07:00
Zhang Wei
3d6617ffe7
fix golint warnings/errors on package api/types/
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-08-07 09:43:43 +08:00
Stefan Berger
38295d4b48
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 >
2015-08-06 20:37:28 -04:00
Jessica Frazelle
e542238f2a
remove docker-unconfined profile we were not using it and it breaks apparmor on wheezy
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-06 16:51:01 -07:00
Antonio Murdaca
4177b0bae0
Add hostConfig check before starting a container
...
It may happen that host system settings are changed while the daemon is running.
This will cause errors at libcontainer level when starting a container with a
particular hostConfig (e.g. hostConfig with memory swappiness but the memory
cgroup was umounted).
This patch adds an hostConfig check on container start to prevent the daemon
from even calling libcontainer with the wrong configuration as we're already
doing on container's creation).
Signed-off-by: Antonio Murdaca <runcom@linux.com >
(cherry picked from commit 0d2628cdf19783106ae8723f51fae0a7c7f361c6)
2015-08-06 15:46:10 -07:00
Antonio Murdaca
b2d06b6fba
Move sysinfo out of daemon struct
...
sysinfo struct was initialized at daemon startup to make sure
kernel configs such as device cgroup are present and error out if not.
The struct was embedded in daemon struct making impossible to detect
if some system config is changed at daemon runtime (i.e. someone
umount the memory cgroup). This leads to container's starts failure if
some config is changed at daemon runtime.
This patch moves sysinfo out of daemon and initilize and check it when
needed (daemon startup, containers creation, contaienrs startup for
now).
Signed-off-by: Antonio Murdaca <runcom@linux.com >
(cherry picked from commit 472b6f66e03f9a85fe8d23098dac6f55a87456d8)
2015-08-06 15:46:09 -07:00
David Calavera
9ce0a20c01
Merge pull request #15320 from hqhq/hq_add_cgroup_check
...
Check sysinfo for Cpuset cpu.shares and blkio
2015-08-06 14:23:37 -07:00
Jessica Frazelle
ed248207d7
revert apparmor changes back to how it was in 1.7.1, but keep tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-06 12:49:25 -07:00
Lei Jitang
08b3dc8d9f
Adapt container settings after verify platform container settings.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-06 19:56:51 +08:00
Tibor Vass
3273209a9c
Merge pull request #15075 from hqhq/hq_move_cpushare_change
...
Cleanup: Merge adjustCpuShares to adoptContainerSettings
2015-08-05 21:53:58 -04:00
Lei
6a0050d0f0
Remove redundant ip_forward check
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-06 09:06:31 +08:00
Qiang Huang
e0af23dc18
Cleanup: Merge adjustCPUShares to adoptContainerSettings
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-06 08:15:14 +08:00
Antonio Murdaca
044c4e00a0
Merge pull request #15334 from Mashimiao/change-name-check-for-image-delete
...
image_delete: move name check first
2015-08-06 02:07:34 +02:00
Tibor Vass
8534090476
Merge pull request #15252 from coolljt0725/14765_enable_golint_3
...
Enable golint in pkg/archive
2015-08-05 19:27:48 -04:00
Ma Shimiao
cb2def9f90
image_delete: move name check first
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-08-06 00:27:45 +08:00
Qiang Huang
b7599d58cb
Check sysinfo for Cpuset cpu.shares and blkio
...
Carried: #14015
If kernel is compiled with CONFIG_FAIR_GROUP_SCHED disabled cpu.shares
doesn't exist.
If kernel is compiled with CONFIG_CFQ_GROUP_IOSCHED disabled blkio.weight
doesn't exist.
If kernel is compiled with CONFIG_CPUSETS disabled cpuset won't be
supported.
We need to handle these conditions by checking sysinfo and verifying them.
Signed-off-by: Zefan Li <lizefan@huawei.com >
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-05 22:35:18 +08:00
Arnaud Porterie
7374852be9
Merge pull request #14921 from aaronlehmann/int64
...
Fix uses of "int" where "int64" should be used instead
2015-08-04 19:16:13 -07:00
Arnaud Porterie
2c3cd949c8
Merge pull request #15269 from brahmaroutu/lint_daemon_graphdriver_zfs
...
daemon/graphdriver/zfs fix lint errrors/warnings
2015-08-04 18:41:02 -07:00
John Howard
fe8cfc5b39
Windows: Daemon compile was broken
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-04 12:42:41 -07:00
Antonio Murdaca
23dab01ed2
Merge pull request #14840 from HuKeping/golint-pkg-sysinfo
...
Fix golint warning on pkg/sysinfo
2015-08-04 20:57:39 +02:00
Srini Brahmaroutu
e27c904b99
daemon/graphdriver/zfs fix lint errrors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-08-04 18:30:55 +00:00
Lei Jitang
ba332b7d12
Enable golint in pkg/arcive
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-04 09:52:54 +08:00
Arnaud Porterie
ff3adb135d
Merge pull request #15114 from hqhq/hq_exedriver_win_lint
...
Fix golint warnings for daemon/execdriver/windows
2015-08-03 16:28:47 -07:00
David Calavera
dfb63b0425
Merge pull request #15255 from crosbymichael/lxc-dep
...
Add LXC built in support deprecation notice
2015-08-03 15:36:43 -07:00
Michael Crosby
06f6c0c7e5
Add LXC built in support deprecation notice
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-08-03 14:54:42 -07:00
Srini Brahmaroutu
3e7f9c636a
daemon/graphdriver/vfs fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-08-03 17:46:42 +00:00
Qiang Huang
f9b5eb0cac
Fix golint warnings for daemon/execdriver/windows
...
Addresses: #14756
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-03 09:54:02 +08:00
Qiang Huang
f5557f4f43
Remove unused variable
...
Introduced by #15209 unintentionally.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-03 09:14:52 +08:00
Brian Goff
ef24b8e485
Merge pull request #15181 from Microsoft/10662-registermountpoints
...
Windows: Tidy/godoc volume*.go
2015-08-02 13:04:48 -04:00
Tibor Vass
bf384a3e4f
Merge pull request #15226 from vdemeester/3745-remote-TEST-env-test-from-daemon
...
Remove daemon check for TEST
2015-08-01 13:10:02 -04:00
Vincent Demeester
9af6b57a5d
Remove daemon check for TEST
...
Closes #3745
I think DEBUG is still used (might be wrong though) and according to
https://github.com/docker/docker/issues/3745#issuecomment-76035979 there
is now nothing in integration (all has been migrated to integration-cli)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-01 15:13:38 +02:00