516c72d71b
Merge pull request #8340 from unclejack/bump_go_to_1.3.3
...
bump Go to 1.3.3
2014-10-01 08:08:12 -07:00
4424d15f99
Merge pull request #8302 from rafecolton/move_archive_package_to_pkg
...
Move archive package to pkg
2014-10-01 18:03:34 +03:00
da34672de6
bump Go to 1.3.3
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-10-01 17:14:48 +03:00
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
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
5e69f4a188
Merge pull request #8291 from mieciu/master
...
Source the bash_completion after installation
2014-09-30 15:55:25 -04:00
1d199f2d85
Merge pull request #8286 from ClusterHQ/8285-volume-api-docs
...
Document Volumes and Binds
2014-09-30 15:53:41 -04:00
08547dff29
update tests
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-09-30 19:10:03 +00:00
d4e5fa5728
Merge pull request #8092 from vishh/exec_api_docs
...
Exec remote API documentation
2014-09-30 11:50:23 -07:00
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
226bc669aa
update docs
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-09-30 18:15:23 +00:00
e32b54fe35
Merge pull request #8263 from jfrazelle/filter-status-name
...
Filter containers by status.
2014-09-30 10:40:02 -07:00
1b6da6a6fe
Merge pull request #8309 from ArikaChen/master
...
Fix typo:betweem->between and PtySlace->PtySlave
2014-09-30 16:20:31 +03:00
bfc9d8bbea
Fix typo:betweem->between and PtySlace->PtySlave
...
Signed-off-by: Arika Chen <eaglesora@gmail.com>
2014-09-30 07:22:09 -04:00
30d5a42c1f
Move archive package into pkg/archive
...
Now that the archive package does not depend on any docker-specific
packages, only those in pkg and vendor, it can be safely moved into pkg.
Signed-off-by: Rafe Colton <rafael.colton@gmail.com>
2014-09-29 23:23:36 -07:00
73f4bfed81
Move Matches() file path matching function into pkg/fileutils
...
This is the second of two steps to break the archive package's
dependence on utils so that archive may be moved into pkg. `Matches()`
is also a good candidate pkg in that it is small, concise, and not
specific to docker internals
Signed-off-by: Rafe Colton <rafael.colton@gmail.com>
2014-09-29 23:21:41 -07:00
b845a62149
Move Go() promise-like func from utils to pkg/promise
...
This is the first of two steps to break the archive package's dependence
on utils so that archive may be moved into pkg. Also, the `Go()`
function is small, concise, and not specific to the docker internals, so
it is a good candidate for pkg.
Signed-off-by: Rafe Colton <rafael.colton@gmail.com>
2014-09-29 23:16:27 -07:00
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
8128339bc8
Merge pull request #8281 from dfarrell07/master
...
Doc update to clarify EXPOSE vs -p functionality.
2014-09-29 18:55:11 -07:00
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
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
35005595b9
Merge pull request #8296 from scollier/typo
...
Fixed simple typo
2014-09-30 03:48:48 +03:00
c2c5e57a8e
add apparmor:
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-09-30 00:43:47 +00:00
07179a7eb1
Merge pull request #8293 from crosbymichael/update-libcontainer-sep8
...
Update libcontainer to c744f6470e37be5ce1f1ae09b842c15c1bee120d
2014-09-29 18:09:25 -06:00
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
595b5bf06e
Merge pull request #8295 from crosbymichael/type-exec-context
...
Strongly type exec driver context
2014-09-29 17:02:53 -07:00
35aa3fd5f2
Fixed simple typo
...
Signed-off-by: Scott Collier <emailscottcollier@gmail.com>
2014-09-29 18:58:47 -05:00
999d4117f6
Merge pull request #8112 from dmcgowan/libtrust_key_management
...
Libtrust key management
2014-09-29 16:32:48 -07:00
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
7c1aee6291
Merge pull request #8289 from duglin/FixTestcaseFor8230
...
Fixes the new testcase for PR #8230
2014-09-29 15:33:51 -07:00
9f59e2223d
Source the bash_completion after installation
...
Signed-off-by: Przemek Hejman <przemyslaw.hejman@gmail.com>
2014-09-29 23:37:51 +02:00
532c29ef7d
Update native driver to set RootFs
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-09-29 21:35:25 +00:00
a7d61e0ffb
Merge pull request #8210 from dastergon/improve_gentoodoc
...
improve docs for Gentoo Linux installation
2014-09-29 14:35:21 -07:00
392eec2075
Update libcontainer to c744f6470e37be5ce1f1ae09b84
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-09-29 21:23:42 +00:00
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
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
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
826439c537
Merge pull request #8273 from duglin/Issue7941
...
Fix error paring null JSON - Issue7941
2014-09-29 12:59:34 -07:00
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
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
8e70d553f9
Document Volumes and Binds
...
Signed-off-by: Jean-Paul Calderone <jean-paul@clusterhq.com>
2014-09-29 14:59:48 -04:00
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
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
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
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
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
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
74dbea81d6
Merge pull request #8175 from hqhq/master
...
graph: add VirtualSize for inspect output
2014-09-29 10:50:28 -07:00
dab061bb64
Merge pull request #8282 from proppy/patch-10
...
api/server/MAINTAINERS: back from vacation
2014-09-29 13:12:06 -04:00
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
Alexandr Morozov
unclejack
unclejack
Andrea Luzzardi
James Turnbull
Victor Vieux
Michael Crosby
Vishnu Kannan
ArikaChen
Rafe Colton
Jessica Frazelle
Fred Lifton
Daniel Farrell
Tianon Gravi
Dan Walsh
Victor Vieux
Scott Collier
Michael Crosby
Przemek Hejman
Doug Davis
Pavlos Ratis
Jessie Frazelle
Tibor Vass
Erik Hollensbe
Jean-Paul Calderone
Brian Goff
Vincent Batts
Johan Euphrosine