ac324e5e52
Merge pull request #11034 from HuKeping/oom_kill_disable
...
enable cgroups memory.oom_control
2015-05-04 11:53:05 -04:00
a4a924e1b6
Feature: option for disable OOM killer
...
Add cgroup support for disable OOM killer.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-05-04 21:11:29 +08:00
fe221852b7
Merge pull request #12950 from thieman/tnt-riak-ssh-reference
...
Remove stale reference to previous SSH instructions
2015-05-03 15:42:38 -04:00
b40a5eeec8
Remove stale reference to previous SSH instructions
...
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
2015-05-03 14:15:17 -04:00
0ad6f90127
Merge pull request #12893 from vdemeester/12892-fix-labels-documentation
...
Fixing examples given for labels
2015-05-02 22:29:08 -04:00
5eee4058fe
Docs adding uninstall instructions
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-05-01 08:10:56 -07:00
7e7b6a20bd
Merge pull request #12901 from hqhq/hq_fix_test_comment
...
fix comments for test certain tests
2015-04-30 17:08:23 -07:00
cacf90c963
Merge pull request #12857 from nikolas/patch-1
...
Remove incorrect option in docker install command
2015-04-30 09:35:20 -07:00
424a544bb5
Fixing examples given for labels
...
Fixes #12892
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-04-30 09:48:54 +02:00
987e221607
fix comments for test certain tests
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-30 15:40:48 +08:00
029cbc1004
Merge pull request #12574 from ahmetalpbalkan/docs/systemd-dir
...
docs: Add more places docker.service can be at
2015-04-29 19:07:58 -04:00
c0a1b2d6e9
docs: Add more places docker.service can be at
...
More systemd goodness. Documenting where `docker.service` lives under Ubuntu 15.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-04-29 22:39:48 +00:00
53bef64804
Merge pull request #10427 from jfrazelle/option-to-disable-systemd-cgroups
...
Option to configure cgroup manager (adds --exec-opt)
2015-04-29 10:00:41 -07:00
4676ff3fd7
Merge pull request #12245 from buddhamagnet/dockerignore-ignores
...
Add support for exclusion rules in dockerignore
2015-04-28 11:28:46 -07:00
6fd8e485c8
add support for exclusion rules in dockerignore
...
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com>
2015-04-28 18:56:45 +01:00
f04837cf80
Remove incorrect option in docker install command
...
The `-N` option is not compatible with the `-O` option of wget (see the man page).
The example command now matches the example in the script on http://get.docker.com/ .
Signed-off-by: Nik Nyby <nikolas@gnu.org>
2015-04-28 13:27:04 -04:00
dde5ff2872
Merge pull request #12644 from psftw/official-repos-rewrite
...
Rewrite Official Repos page.
2015-04-28 08:57:29 -07:00
6113eab174
Merge pull request #12814 from vbatts/vbatts-rhel_updates
...
RHEL updates
2015-04-28 08:51:35 -07:00
9b365e0845
rhel.md: adding link to most recent issue
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-04-28 11:28:33 -04:00
179b6ddc35
rhel.md: bump the kernel version for RHEL6
...
Closes #9856
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-04-28 11:28:33 -04:00
ed40c0a9a4
rhel.md: update RHEL6 from 6.5 to 6.6
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-04-28 11:28:23 -04:00
8f52eb7b82
Rewrite Official Repositories page.
...
The existing page is focused on listing a set of requirements for
proposing a new repository. This information has become outdated and is
duplicated in the `docker-library/official-images` and
`docker-library/docs` GitHub repositories. This PR rewrites the
Official Repositories page to describe what they actually are, and
defers to GitHub/IRC for the subset of users that are interested in
contributing. I also removed the requirement to contact
partners@docker.com and made it optional to reduce the barrier to entry.
Signed-off-by: Peter Salvatore <peter@psftw.com>
2015-04-28 00:37:17 -04:00
af8efab756
add initial docs for windows client testing
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
docs: crop and optimize images
Cropped and optimized images.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Testing and updating the Windows material
Signed-off-by: Mary Anthony <mary@docker.com>
checkpoint
Signed-off-by: Mary Anthony <mary@docker.com>
Fitting the Windows specific material into the contributor guide
Signed-off-by: Mary Anthony <mary@docker.com>
Entering James comments
Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-27 21:21:53 -07:00
2afcd10202
option to configure cgroups
...
Signed-off-by: Jessica Frazelle <jess@docker.com>
2015-04-27 17:50:39 -07:00
aebeefa886
Merge pull request #12798 from dnephin/add_missing_docs_about_labels
...
Add missing API docs about filtering by label
2015-04-27 17:37:10 -07:00
d4bbbe58dd
Add docs for `--exec-opt` and setting `native.cgroupdriver`.
...
update man pages.
update bash completion.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
2015-04-27 17:04:28 -07:00
b6cfe7ca07
Do Debian installation verification with hello-world image.
...
The hello-world image is recommended as a verification image and it is smaller
than Ubuntu.
Signed-off-by: Matt McCormick <matt.mccormick@kitware.com>
2015-04-27 13:53:30 -04:00
cfd0f53b03
Add missing API docs about filtering by label.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-04-26 15:36:01 -04:00
6cba3109c2
Merge pull request #12787 from epc/copyedits
...
Copy edits for typos
2015-04-26 10:40:18 -07:00
92f4bd59ce
Merge pull request #12734 from sergey-alekseev/sergey-alekseev-patch-1
...
Fix documentation typo in articles/basics.md
2015-04-25 20:33:55 -07:00
fa9299f4c0
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com>
2015-04-25 15:01:05 -04:00
2188c8d2f4
Fix documentation typo in articles/basics.md
...
Signed-off-by: Sergey Alekseev <sergey.alekseev.minsk@gmail.com>
2015-04-25 11:32:17 +03:00
790c63a5ef
Merge pull request #12502 from calavera/shallow_git_history
...
Shallow clone using git to build images.
2015-04-24 10:16:01 -07:00
8bd5a95e1e
Document the extra `depth` argument in git contexts.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-24 09:39:39 -07:00
310fc37fe7
Merge pull request #12678 from vdemeester/fix-advanced-contributing-doc
...
Documentation: fix the design proposal link in advanced contribution page
2015-04-24 11:12:36 -04:00
b0ad95daa8
Copy over the DHE documentation for release to docs.docker.com
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-04-24 12:39:58 +10:00
09052a5572
Merge pull request #12712 from moxiegirl/carry-docs-update-9397
...
Removing firewalld info
2015-04-23 17:24:27 -07:00
b830b823cd
Merge pull request #12711 from Shopify/fix_doc
...
[docs] small markup fix
2015-04-23 15:07:46 -07:00
55d1ac645c
[docs] fix formatting issue
...
Signed-off-by: Florian Weingarten <flo@hackvalue.de>
2015-04-23 21:17:12 +00:00
b6d8b65e55
Removing firewalld info
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-23 14:04:36 -07:00
47263c6514
Fix typo in builder reference
...
Signed-off-by: Tristan Carel <tristan.carel@gmail.com>
2015-04-23 12:10:47 +02:00
1f7ba6f809
Fix the design proposal link in advanced contribution page
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-04-23 09:48:11 +02:00
6359326761
Makes headings in documentation consistent
...
Fixes #10673 .
Signed-off-by: Rick Wieman <git@rickw.nl>
2015-04-23 07:41:30 +02:00
cc43263f8c
Merge pull request #12652 from jfrazelle/update-contrib-docs-for-go-check
...
update contrib docs for gocheck
2015-04-22 17:47:22 -07:00
3dc07162bd
Merge pull request #12557 from rhatdan/journald
...
Add journald as a supported logger for containers
2015-04-22 17:20:10 -07:00
84a9962a63
Merge pull request #12614 from ankushagarwal/ubuntu-docs
...
Add Configuring Docker article
2015-04-23 09:41:11 +10:00
ce7e1a4d7e
Merge pull request #12586 from ankushagarwal/image-digests
...
Add Image Digest doc in userguide/dockerimages
2015-04-23 09:23:23 +10:00
b2aca01d95
Merge pull request #12513 from allingeek/patch-1
...
builder.md - Changes to bring LABEL docs in line with 1.6 release.
2015-04-23 08:58:59 +10:00
b88b2fa72e
Merge branch 'master' of github.com:docker/docker into journald
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-04-22 17:37:26 -04:00
a09ab40f0d
update contrib docs for gocheck
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-04-22 13:19:14 -07:00
Sebastiaan van Stijn