docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,849 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

10849 Commits

Author SHA1 Message Date
tjwebb123 f10a08887e Update host_integration.md 2014-10-01 14:51:47 +01:00
Andrea Luzzardi 3f2e4e94d7 Merge pull request #8266 from cpuguy83/fix_race_in_createing_volumes 
Fix potential race in volume creation
 2014-09-30 18:03:00 -07:00
Andrea Luzzardi d40ab6f123 Merge pull request #8299 from vieux/pr_7425 
Add --security-opts options to allow user to customize container labels and apparmor profile
 2014-09-30 17:53:11 -07:00
James Turnbull 5e69f4a188 Merge pull request #8291 from mieciu/master 
Source the bash_completion after installation
 2014-09-30 15:55:25 -04:00
James Turnbull 1d199f2d85 Merge pull request #8286 from ClusterHQ/8285-volume-api-docs 
Document Volumes and Binds
 2014-09-30 15:53:41 -04:00
Victor Vieux 08547dff29 update tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-09-30 19:10:03 +00:00
Michael Crosby d4e5fa5728 Merge pull request #8092 from vishh/exec_api_docs 
Exec remote API documentation
 2014-09-30 11:50:23 -07:00
Vishnu Kannan 021ecb1d13 Adding exec remote API documentation along with minor code cleanup. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-30 18:26:58 +00:00
Victor Vieux 226bc669aa update docs 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-09-30 18:15:23 +00:00
Alexandr Morozov e32b54fe35 Merge pull request #8263 from jfrazelle/filter-status-name 
Filter containers by status.
 2014-09-30 10:40:02 -07:00
unclejack 1b6da6a6fe Merge pull request #8309 from ArikaChen/master 
Fix typo:betweem->between and PtySlace->PtySlave
 2014-09-30 16:20:31 +03:00
ArikaChen bfc9d8bbea Fix typo:betweem->between and PtySlace->PtySlave 
Signed-off-by: Arika Chen <eaglesora@gmail.com>
 2014-09-30 07:22:09 -04:00
Jessica Frazelle ea09f03682 Filter containers by status. 
A continuation of #7616.
Adds `docker ps --filter=status=(restarting|running|paused|stopped)` option.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-09-29 20:11:19 -07:00
Fred Lifton 8128339bc8 Merge pull request #8281 from dfarrell07/master 
Doc update to clarify EXPOSE vs -p functionality.
 2014-09-29 18:55:11 -07:00
James Turnbull 4b311e1bd2 Merge pull request #8280 from duglin/Issue3636 
Add more info about when build cache is invalidated/used - Issue #3636
 2014-09-29 21:52:42 -04:00
Daniel Farrell 5730abc167 Doc update to clarify EXPOSE vs -p functionality. 
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
 2014-09-29 20:59:12 -04:00
unclejack 35005595b9 Merge pull request #8296 from scollier/typo 
Fixed simple typo
 2014-09-30 03:48:48 +03:00
Victor Vieux c2c5e57a8e add apparmor: 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-09-30 00:43:47 +00:00
Tianon Gravi 07179a7eb1 Merge pull request #8293 from crosbymichael/update-libcontainer-sep8 
Update libcontainer to c744f6470e37be5ce1f1ae09b842c15c1bee120d
 2014-09-29 18:09:25 -06:00
Dan Walsh 87e732a0f3 Add --security-opts options to allow user to customize security configuration 
security-opts will allow you to customise the security subsystem.

For example the labeling system like SELinux will run on a container.

    --security-opt="label:user:USER"   : Set the label user for the container
    --security-opt="label:role:ROLE"   : Set the label role for the container
    --security-opt="label:type:TYPE"   : Set the label type for the container
    --security-opt="label:level:LEVEL" : Set the label level for the container
    --security-opt="label:disabled"    : Turn off label confinement for the container

Since we are passing a list of string options instead of a space separated
string of options, I will change function calls to use InitLabels instead of
GenLabels.  Genlabels interface is Depracated.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2014-09-30 00:06:22 +00:00
Victor Vieux 595b5bf06e Merge pull request #8295 from crosbymichael/type-exec-context 
Strongly type exec driver context
 2014-09-29 17:02:53 -07:00
Scott Collier 35aa3fd5f2 Fixed simple typo 
Signed-off-by: Scott Collier <emailscottcollier@gmail.com>
 2014-09-29 18:58:47 -05:00
Victor Vieux 999d4117f6 Merge pull request #8112 from dmcgowan/libtrust_key_management 
Libtrust key management
 2014-09-29 16:32:48 -07:00
Michael Crosby 32dca1a7b0 Strongly type exec driver context 
This also removes dead code in the native driver for a past feature that
was never fully implemented.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-09-29 22:40:26 +00:00
Victor Vieux 7c1aee6291 Merge pull request #8289 from duglin/FixTestcaseFor8230 
Fixes the new testcase for PR #8230
 2014-09-29 15:33:51 -07:00
Przemek Hejman 9f59e2223d Source the bash_completion after installation 
Signed-off-by: Przemek Hejman <przemyslaw.hejman@gmail.com>
 2014-09-29 23:37:51 +02:00
Michael Crosby 532c29ef7d Update native driver to set RootFs 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-09-29 21:35:25 +00:00
Fred Lifton a7d61e0ffb Merge pull request #8210 from dastergon/improve_gentoodoc 
improve docs for Gentoo Linux installation
 2014-09-29 14:35:21 -07:00
Michael Crosby 392eec2075 Update libcontainer to c744f6470e37be5ce1f1ae09b84 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-09-29 21:23:42 +00:00
Doug Davis 83f0f46b7c Add more info about when build cache is invalidated/used - Issue #3636 
Plus some edits as suggested by @jamtur01

Closes #3636

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-09-29 14:13:39 -07:00
Pavlos Ratis f90d201d88 improve docs for Gentoo Linux installation 
Changes summary:
    * Added available USE flags table(description included).
    * Added some tips regarding the use of docker in the Gentoo environment.
    * Sorted out docker installation ways.
    * Added information about the newly created Gentoo Docker team.
    * Misc improvements

Signed-off-by: Pavlos Ratis <dastergon@gentoo.org>
 2014-09-29 23:59:43 +03:00
Doug Davis 8b3fbac15c Fixes the new testcase for PR #8230 
This new version makes sure that the same context is used for the two
builds run in the test.  If you don't use the same build then about 1/2 the
time the file copied into the container will look like a different file,
probably due to timestamp differences.  But reusing the same context we
re-use the same file on disk and therefore avoid the change in timestamps,
and we use the cache on the 2nd build.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-09-29 13:35:09 -07:00
Jessie Frazelle 826439c537 Merge pull request #8273 from duglin/Issue7941 
Fix error paring null JSON - Issue7941
 2014-09-29 12:59:34 -07:00
Tibor Vass 670c8696a2 Merge pull request #8284 from erikh/fix_cmd_again 
builder: Fix CMD to inject /bin/sh -c when provided with a non-json value
 2014-09-29 15:56:16 -04:00
Erik Hollensbe 9f142bf9be builder: Fix CMD to inject /bin/sh -c when provided with a non-json value. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-29 12:22:18 -07:00
Jean-Paul Calderone 8e70d553f9 Document Volumes and Binds 
Signed-off-by: Jean-Paul Calderone <jean-paul@clusterhq.com>
 2014-09-29 14:59:48 -04:00
Alexandr Morozov 6cd8602827 Merge pull request #8047 from rhatdan/RemoveLocalDns 
Remove nameserver 127.0.0.1 line rather then dumping resolv.conf
 2014-09-29 11:58:27 -07:00
Brian Goff 8d7c7bd2e3 Fix potential race in volume creation 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-09-29 14:56:04 -04:00
James Turnbull 2682393ce1 Merge pull request #8227 from SvenDowideit/list-container-events 
The list of events that 'grep' told me about
 2014-09-29 14:34:48 -04:00
James Turnbull 1dae56c893 Merge pull request #8245 from filbranden/patch-1 
Update google.md to point to latest container-vm version
 2014-09-29 14:30:24 -04:00
Erik Hollensbe 1cd6135972 Merge pull request #8230 from duglin/Issue6820 
add wildcard support to COPY/ADD (part 2 of issue #6820)
 2014-09-29 11:19:01 -07:00
Victor Vieux 22bd54be4a Merge pull request #8276 from dqminh/8262-validate-build-tag 
Fix #8262: check tag's validity before building.
 2014-09-29 10:57:54 -07:00
Michael Crosby 74dbea81d6 Merge pull request #8175 from hqhq/master 
graph: add VirtualSize for inspect output
 2014-09-29 10:50:28 -07:00
Vincent Batts dab061bb64 Merge pull request #8282 from proppy/patch-10 
api/server/MAINTAINERS: back from vacation
 2014-09-29 13:12:06 -04:00
Johan Euphrosine 8019eec681 api/server/MAINTAINERS: back from vacation 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
 2014-09-29 10:03:07 -07:00
Erik Hollensbe 27c5269b4e Merge pull request #8274 from tianon/parallel-shellshock 
Move the body of go_compile_test_dir into a file since GNU Parallel breaks on sourcing exported Bash functions thanks to the shellshock fixes
 2014-09-29 09:34:36 -07:00
James Turnbull 6fec88f0b3 Merge pull request #8246 from brahmaroutu/doc_resize_tty_7840 
Documenting Container Tty resize api
 2014-09-29 12:29:32 -04:00
James Turnbull a9e31285b5 Merge pull request #8255 from rhatdan/execman 
docker-exec man page is not created.
 2014-09-29 12:20:14 -04:00
Dan Walsh a297d6ab8c Replace utils.CheckLocalDns with bytes.Contains line 
Since RemoveLocalDns patch will  remove all localhost entries
from resolv.conf we no longer need anything more then
!bytes.Contains(resolvConf, []byte("nameserver")

To check for no nameserver entry in dns config.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2014-09-29 06:37:31 -04:00
Dan Walsh 65640994fd Remove nameserver 127.0.0.1 line rather then dumping resolv.conf 
We have a bug report complaining about docker dumping the contents of the
hosts resolv.conf if it container 127.0.0.1.  They asked that instead
of dropping the file altogether, that we just remove the line.

This patch removes the 127.0.0.1 lines, if they exist and then
checks if any nameserver lines exist.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2014-09-29 06:37:31 -04:00