diff options
| author | Audrius Kažukauskas <audrius@neutrino.lt> | 2017-06-11 16:29:20 +0300 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-06-15 18:36:25 +0700 |
| commit | 71e2c44ef6bb7dbdc4dbd385f87b490e38c023d8 (patch) | |
| tree | d3cd2e838508b72f638cdb00972d3f58b0499033 /system/docker | |
| parent | 27cc781ae40f2797ee48cfeb19c439876885096c (diff) | |
system/docker: Misc README and slack-desc changes.
Signed-off-by: Audrius Kažukauskas <audrius@neutrino.lt>
Diffstat (limited to 'system/docker')
| -rw-r--r-- | system/docker/README | 7 | ||||
| -rw-r--r-- | system/docker/slack-desc | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/system/docker/README b/system/docker/README index 8fd5996888d6..9e666cb61e82 100644 --- a/system/docker/README +++ b/system/docker/README @@ -9,7 +9,8 @@ To use docker as a limited user, add your user to the 'docker' group: # groupadd -r -g 281 docker # usermod -a -G docker <your_username> -This will require logging out and back in and also restart docker daemon. +This will require logging out and back in and also restarting docker +daemon. To have the docker daemon start and stop with your host, add to /etc/rc.d/rc.local: @@ -24,11 +25,11 @@ and to /etc/rc.d/rc.local_shutdown (creating it if needed): /etc/rc.d/rc.docker stop fi -If you are interested in enabling cgroup memory resource controll over +If you are interested in enabling cgroup memory resource control over swap as well, then append "swapaccount=1" to your kernel's parameters. This is often in /etc/lilo.conf, on the "append" variable. NOTE: google-go-lang is only needed at compile time - not needed for runtime. -Docker doesn't support x86, only x86_64 +Docker doesn't support x86, only x86_64. diff --git a/system/docker/slack-desc b/system/docker/slack-desc index 6c22bf46a4bd..cfd96d748d54 100644 --- a/system/docker/slack-desc +++ b/system/docker/slack-desc @@ -6,7 +6,7 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -docker: docker (manager for applications in linux containers) +docker: docker (manager for applications in Linux containers) docker: docker: Docker is an open-source project to easily create lightweight, docker: portable, self-sufficient containers from any application. The same @@ -14,6 +14,6 @@ docker: container that a developer builds and tests on a laptop can run at docker: scale, in production, on VMs, bare metal, OpenStack clusters, public docker: clouds and more. docker: -docker: Homepage: https://dockerproject.org/ +docker: Homepage: https://www.docker.com/ docker: docker: |