Commit Graph
45 Commits
Author SHA1 Message Date
Justin Cormack 7d544d02fb Begin a section in the check-config script to check limits
Initially this checks the kernel's maxkeys setting which is
low in some older distribution kernels, such that only 200 containers
can be created, reported in #22865.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 4e2d98761dc092d232451f5f45c7667a35afa945
Component: engine
2016-05-20 16:05:25 -07:00
Qiang Huang 00eb665726 Update check_config for MEMCG_KMEM
CONFIG_MEMCG_KMEM is removed since 4.6, it's accounted by default
since 4.6, so it's merged to CONFIG_MEMCG.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 27d7b135d4475b8c7b5159792b9b6d160e4535c1
Component: engine
2016-05-16 13:55:24 +08:00
Qiang Huang e0fe841732 Add CONFIG_CFQ_GROUP_IOSCHED check
blkio.weight depends on this config.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 192387198d02e3e75377f8fbc06840b9a6dec8bd
Component: engine
2016-04-25 14:08:29 +08:00
Tianon Gravi 385a33a1f9 Add "VXLAN" to check-config.sh
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: c082dad637f2b7ee07a284143566746c98bf1211
Component: engine
2016-04-11 16:42:53 -07:00
Jessica Frazelle de84e87a00 pids limit support
update bash commpletion for pids limit

update check config for kernel

add docs for pids limit

add pids stats

add stats to docker client

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 69cf03700fed7bf5eb7fe00c9214737e21478e49
Component: engine
2016-03-08 07:55:01 -08:00
Alexander Morozov c7e8bfe8be Fix CONFIG_KEYS check in contrib/check-config.sh
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f5b4e1be6b599c6c6763e32cca25ea23cdaed4e2
Component: engine
2016-03-01 10:01:12 -08:00
Alexander Morozov 8b2b861995 Add CONFIG_KEYS to check-config.sh
We need this after opencontainers/runc#488

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: c1996c92455718e65a6211183e244a1e0ff803fe
Component: engine
2016-02-26 23:40:35 -08:00
Phil Estes 71bd1b6405 Add check for RHEL7/CentOS7 experimental userns disabled
Add a check in `check-config.sh` to see if we are running on a RHEL7 or
CentOS7 system, which may report that CONFIG_USERNS is OK/enabled, but
user namespaces still won't work because of the experimental feature
flag added by Redhat.

This will add a warning if it is actually disabled and notes what has to
be added to the grub/boot command line to enable it.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 23551515564b54128e882dda5eae659883947d39
Component: engine
2016-02-23 23:28:24 -06:00
Tianon Gravi cc56e418d7 Update check-config.sh to use "case" instead of an associative array
This fixes Bash 3.x compatibility (where associative arrays are not available).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 5c161f4e1a7e25abedefb6d40dfe7f355077773a
Component: engine
2016-01-12 20:57:56 -08:00
Jessica Frazelle bfb7e82f4d update packagers.md and kernel config check
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: cde9e8bc83182f0d100c4eda6acb5d4cbc995aac
Component: engine
2015-12-03 16:30:50 -08:00
Lei Jitang a9b61f95aa Add user namespace check to check-chonfig.sh
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: d475c4ddc1b8a3a15a10c20c4ec4e15f642d71e4
Component: engine
2015-10-11 17:26:34 +08:00
Lei Jitang 6e390a2d96 Add CONFIG_BLK_DEV_THROTTLING to check-config.sh
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: cbb69531a8f3f2da55956aabf85d4581cbc511d2
Component: engine
2015-08-19 15:11:04 +08:00
Qiang Huang 1e7e48f2b6 Adapt CONFIG_NETPRIO_CGROUP in check-config.sh
Fixes: #15572

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 6c4d4c70c6618fc84fc815d14c92ea60f0be538e
Component: engine
2015-08-14 14:38:48 +08:00
Qiang Huang 40a12bcca9 Add some cgroup related config check
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: fb85a99f5899df7475ba6b1ac4b2e1d32974eca2
Component: engine
2015-06-19 13:47:48 +08:00
Qiang Huang 3527d4504b Add check config for ext3 file system
Some distros still use ext3 as default file system, we should check
these configs as well.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 0c4c8302898d51d43c83ea3bb6a0ccbf0723457c
Component: engine
2015-06-19 13:45:07 +08:00
Qiang Huang 32bfc6a4bf Don't check RESOURCE_COUNTERS in new kernel
Closes: #13543

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8bfc8102be4a9f0d3da936f5b80f2fb4477a558a
Component: engine
2015-06-03 17:26:39 +08:00
Alexander Morozov 9abff68995 Add BRIDGE_NETFILTER to check-config.sh
It is needed to use network with --userland-proxy=false and for
--icc=false

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6cc4cf7c0cc8ae56974f16b3b2053c82be722349
Component: engine
2015-05-22 10:46:55 -07:00
Alexander Morozov dd51f88987 Add optional CONFIG_BLK_CGROUP and CONFIG_IOSCHED_CFQ to check-config.sh
It is needed for blkio.weight support

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ceca037d05faee05f4286b5e00e40936744a8236
Component: engine
2015-05-22 10:41:29 -07:00
Qiang Huang 9bd131bf91 Enhance check-config.sh
Currently check-config.sh just said enable or missing, when I used
a fresh kernel, made check-config.sh happy, still can't start
container. It take me days debuging kernel and Docker and finally
found it's because I enabled some CONFIGs as modules and never
loaded these modules.

So I think it's necessary to let check-config.sh told users which
configs are enabled as modules.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 6e19912df9ea764c53b5607533eb25315527c3c4
Component: engine
2015-05-15 10:20:31 +08:00
Jörg Thalheim e5820ed7e4 Implement Docker on ZFS
Signed-off-by: Arthur Gautier <baloo@gandi.net>
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: d5151ca8ab5d90300839c8572cb96577de4d6233
Component: engine
2015-05-08 17:48:20 +02:00
Evan Hazlett 97f1b60257 Merge pull request #12301 from ewindisch/https_links
Use HTTPS links for URLs in READMEs / comments / docs
Upstream-commit: 3509132a6e28caa18003298521c58746f490b57b
Component: engine
2015-04-13 14:30:53 -04:00
Eric Windisch edf0b6037a Link to HTTPS urls in contrib comments/maintainers
Updates comments and dockerfile maintainer lines
to use HTTPS urls where applicable.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: df9ee6d6563ace6e382a3bdd4a45b38756a76afb
Component: engine
2015-04-11 13:35:08 -04:00
Lei Jitang 0666a926f5 Add CFS_BANDWIDTH to check-config
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: d2d583c53b56a3ce069bf57ede9be9574c58a687
Component: engine
2015-04-11 11:39:47 +08:00
Lei Jitang c94431c226 Add MEMCG_SWAP_ENABLED to check-config.sh
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: a9588158b54bc8866bddfa0445c14831e02ebbbc
Component: engine
2015-04-02 08:38:39 +08:00
Tianon Gravi baa877aaee Add CONFIG_CPUSETS to check-config.sh
See also https://bugs.gentoo.org/show_bug.cgi?id=536546:

```console
$ docker run learn/tutorial echo "hello world"
FATA[0001] Error response from daemon: Cannot start container 1d0c0ca5cc7f39a271ec40c1479a80bffb7190fab97392b3453a1fc0b2dc8e78: mountpoint for cpuset not found
```

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 03de73a5e075e16656f5399f1957f7190f7bdc44
Component: engine
2015-03-13 09:18:10 -06:00
Jessie Frazelle 1aeb75c1f3 Merge pull request #10418 from bobrik/overlay-kernel-checks
Checking EXT4_FS_SECURITY for overlay
Upstream-commit: 55566f2f8f10086d3f030deebd53915978f0591f
Component: engine
2015-02-19 14:29:17 -08:00
Lei Jitang 44be94d7d0 Fix check-config.sh usage
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 82fda400b8a2528b1b90e64fc4be6827afbd04ed
Component: engine
2015-02-13 19:52:11 +08:00
Ian Babrou b9f1d0a0b4 Checking EXT4_FS_SECURITY and EXT4_FS_POSIX_ACL for overlay
Signed-off-by: Ian Babrou <ibobrik@gmail.com>
Upstream-commit: a6c6d8bb91a9e2fc2f9bd3da78382112794d17fe
Component: engine
2015-02-05 17:41:13 +03:00
Qiang Huang 8b134ecd31 add args support for check-config.sh
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: aac6090f2df3cc9192d1813e3c1f48b882f063d4
Component: engine
2015-01-23 16:36:55 +08:00
Tianon Gravi 847659a0a9 Add CONFIG_POSIX_MQUEUE to check-config.sh
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 8803174e4f8a3f0a2e5d0d077e8bed0607f3cbe3
Component: engine
2014-12-26 14:59:25 -07:00
Lénaïc Huard 34e4a16b13 Rename the overlay storage driver
so that docker is started with `docker -d -s overlay` instead of `docker -d -s overlayfs`

Signed-off-by: Lénaïc Huard <lhuard@amadeus.com>
Upstream-commit: d680ca5c96484474757fb6f92274f47bf1520631
Component: engine
2014-12-03 13:57:23 +01:00
Lénaïc Huard 506a27fa45 Rename overlayfs to overlay
Since Linux 3.18-rc6, overlayfs has been renamed overlay.

This change was introduced by the following commit in linux.git:
ef94b1864d1ed5be54376404bb23d22ed0481feb ovl: rename filesystem type to "overlay"

Signed-off-by: Lénaïc Huard <lhuard@amadeus.com>
Upstream-commit: c57317893a743720a241ae328d1bdf7bd02b1fea
Component: engine
2014-12-02 10:02:59 +01:00
Tianon Gravi 87e8b60fe9 Add CONFIG_OVERLAYFS_FS to check-config.sh
Also, added some slight adjustment to the AUFS_FS output/note to make it more clear what it applies to.

Example output:
```console
$ ./contrib/check-config.sh
info: reading kernel config from /proc/config.gz ...

Generally Necessary:
- cgroup hierarchy: properly mounted [/sys/fs/cgroup]
- CONFIG_NAMESPACES: enabled
- CONFIG_NET_NS: enabled
- CONFIG_PID_NS: enabled
- CONFIG_IPC_NS: enabled
- CONFIG_UTS_NS: enabled
- CONFIG_DEVPTS_MULTIPLE_INSTANCES: enabled
- CONFIG_CGROUPS: enabled
- CONFIG_CGROUP_CPUACCT: enabled
- CONFIG_CGROUP_DEVICE: enabled
- CONFIG_CGROUP_FREEZER: enabled
- CONFIG_CGROUP_SCHED: enabled
- CONFIG_MACVLAN: enabled
- CONFIG_VETH: enabled
- CONFIG_BRIDGE: enabled
- CONFIG_NF_NAT_IPV4: enabled
- CONFIG_IP_NF_FILTER: enabled
- CONFIG_IP_NF_TARGET_MASQUERADE: enabled
- CONFIG_NETFILTER_XT_MATCH_ADDRTYPE: enabled
- CONFIG_NETFILTER_XT_MATCH_CONNTRACK: enabled
- CONFIG_NF_NAT: enabled
- CONFIG_NF_NAT_NEEDED: enabled

Optional Features:
- CONFIG_MEMCG_SWAP: enabled
- CONFIG_RESOURCE_COUNTERS: enabled
- CONFIG_CGROUP_PERF: missing
- Storage Drivers:
  - "aufs":
    - CONFIG_AUFS_FS: missing
      (note that some kernels include AUFS patches but not the AUFS_FS flag)
    - CONFIG_EXT4_FS_POSIX_ACL: enabled
    - CONFIG_EXT4_FS_SECURITY: enabled
  - "btrfs":
    - CONFIG_BTRFS_FS: enabled
  - "devicemapper":
    - CONFIG_BLK_DEV_DM: enabled
    - CONFIG_DM_THIN_PROVISIONING: enabled
    - CONFIG_EXT4_FS: enabled
    - CONFIG_EXT4_FS_POSIX_ACL: enabled
    - CONFIG_EXT4_FS_SECURITY: enabled
  - "overlayfs":
    - CONFIG_OVERLAYFS_FS: missing
```

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 54a6e6d1229adb1169809493af89600c5ccc70ae
Component: engine
2014-11-18 12:20:49 -07:00
Alexandr Morozov fa6d8281bd Add check for IP_NF_FILTER
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: e621f99923ae8ab74a44d1fa2416e28a6dbc6eb0
Component: engine
2014-11-04 14:47:13 -08:00
Sven Dowideit 8679a2097b It seems that we need these 2 options enabled for both aufs and devicemapper drivers when running on EXT4 - so test for them
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: b7259dc6d45d5bfcb1c45a852bc63addb22e4bc2
Component: engine
2014-09-17 17:03:58 +10:00
Erik Hollensbe 34b12370d2 fix check-config.sh to check for CGROUP_PERF
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: ce3c1f376c21810fd6ec062af810d18682fa2d78
Component: engine
2014-08-20 13:37:39 +00:00
Tianon Gravi d94a180ef6 Add "apparmor_parser" warning to check-config.sh
If AppArmor is enabled on the current system, but "apparmor_parser" isn't installed, it causes all kinds of issues.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 75ba7a9b32bc5904ef1b2751deff94283fce34a5
Component: engine
2014-07-22 10:34:28 -06:00
Tianon Gravi a8e1ddc35b Update contrib/check-config.sh to check for CGROUP_FREEZER (which is newly required), and to use /proc/mounts for checking if we have a cgroup hierarchy instead of using /proc/$$/mountinfo (which on systemd might not list the cgroup hierarchy)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: a59e1949b5ad448814ed2a4de93beca13062e590
Component: engine
2014-06-07 08:43:40 -06:00
Tianon Gravi cd12b8d562 Add more required cgroup subsystems to check-config.sh (specifically, SCHED for cpu and CPUACCT for cpuacct)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 0c0ffb777354ab0d65fdb92fac47272584b2d217
Component: engine
2014-05-23 10:27:09 -06:00
Tianon Gravi 7f0a8b69ee Move "possible config locations" list to the top of check-config.sh
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 2c4cebe916299c7485e929e49ebc6d263e3769cf
Component: engine
2014-04-22 06:26:44 -06:00
Tianon Gravi cf46b873e9 Update check-config.sh with more kernel configs and more reliable cgroup hierarchy/subsystem check
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 5737c2eb9878e36ee9476e0fd105bcd494252d12
Component: engine
2014-04-07 22:53:42 -06:00
Tianon Gravi c231a5f59a Update contrib/check-config.sh cgroupfs check to allow for something like '... cgroup rw,cpu' (looking at you, boot2docker)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: fee16d42163822bb23a51c5ebcb1115efc761947
Component: engine
2014-04-03 11:52:19 -06:00
Tianon Gravi 78e32310f2 Update contrib/check-config.sh to use zcat and grep if zgrep isn't available
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 9712f8127a9ac47a3679e20faea08fb971ee1ecc
Component: engine
2014-04-03 11:46:24 -06:00
Tianon Gravi 811da2f6bf Add more color and cgroupfs hierarchy verification to check-config.sh
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: aec989bd0801657efeeb81bafb2c6c61f60de6d4
Component: engine
2014-04-02 02:44:12 -06:00
Tianon Gravi 91e0f424cb Add basic initial "check-config" script to contrib
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 9c0c4aeda47fcebc4470f7ba786749af2999ec78
Component: engine
2014-04-01 17:42:54 -06:00