Commit Graph

10865 Commits

Author SHA1 Message Date
fd74b5fbc9 Fixed issue with docs not getting built due to ssl error.
Signed-off-by: Ken Cochrane <ken@docker.com>
Upstream-commit: 7f261ebe6cc60c01fd10f5f86f1c22d512be3f5f
Component: engine
2014-10-01 21:11:10 -04:00
cc46ff71c2 Merge pull request #8346 from juliantaylor/mkimage-debootstrap
fix help message for mkimage debootstrap with components
Upstream-commit: 7304c09ecc8cd7c97ca1a30e97f8e2a206e8b737
Component: engine
2014-10-01 17:47:26 -07:00
0172f7a1f0 Merge pull request #8350 from erikh/add_erikh_maintainer_proxy
Add erikh as maintainer of pkg/proxy
Upstream-commit: 4c8b8861ecb6b47230e0e021760922e15e8afd3f
Component: engine
2014-10-01 15:50:41 -07:00
b0e52e738c Add erikh as maintainer of pkg/proxy
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 10efa07fa28e400a597ed7076aa0d730a081ebf2
Component: engine
2014-10-01 15:37:46 -07:00
68f6cb4aa6 Merge pull request #8337 from tjwebb123/patch-1
Update host_integration.md
Upstream-commit: 23221c55665ca63fb2ff9d7e846665a2506a7a0f
Component: engine
2014-10-01 15:37:02 -07:00
1849734cbc fix help message for mkimage debootstrap with components
debootstrap needs the suite as the second argument, for this the script
reorders arguments beginning with a minus but components separated by
space, as stated by the help message, is not handled and will lead to
the rootfs being passed as suite to debootstrap.
The poor mans solution is to fix the help message to pass the long
option as one argument.

Signed-off-by: Julian Taylor <jtaylor.debian@googlemail.com>
Upstream-commit: 34672240b4e69f5f50448e462540bb0259eecf31
Component: engine
2014-10-01 23:18:23 +02:00
9710588070 Merge pull request #8316 from duglin/Issue4787
Add a note about using an open schema model - Issue #4787
Upstream-commit: 04251b3e544d82db2dfc140bd27172a7f1876e5e
Component: engine
2014-10-01 11:21:09 -07:00
142c3f0753 Add a note about using an open schema model
Closes: #4787

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: c8f3151aa6a0b68674aa68061b723424278a54c5
Component: engine
2014-10-01 11:05:12 -07:00
fc1af766be Merge pull request #8313 from duglin/Issue4877
Add missing "tag" parameter to tag API - Issue #4877
Upstream-commit: f852233a015d0f65ff1cd4e475e21ba9b9143c3c
Component: engine
2014-10-01 10:34:57 -07:00
8377d0b2ee Merge pull request #8340 from unclejack/bump_go_to_1.3.3
bump Go to 1.3.3
Upstream-commit: 516c72d71b941f38c14d2d92482f65bda7a875aa
Component: engine
2014-10-01 08:08:12 -07:00
20022966a7 Merge pull request #8302 from rafecolton/move_archive_package_to_pkg
Move archive package to pkg
Upstream-commit: 4424d15f9936a6cf663d06284c932f91306d9353
Component: engine
2014-10-01 18:03:34 +03:00
073155174d bump Go to 1.3.3
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: da34672de6b84fce801d8ffaf03b52bf66458a61
Component: engine
2014-10-01 17:14:48 +03:00
4149b93c3c Update host_integration.md
Upstream-commit: f10a08887e939936662071e5609670f7da9fb62c
Component: engine
2014-10-01 14:51:47 +01:00
dbbb1fe8c4 Merge pull request #8266 from cpuguy83/fix_race_in_createing_volumes
Fix potential race in volume creation
Upstream-commit: 3f2e4e94d7dffe40a9cc1139cc2e6e5dcd1459f3
Component: engine
2014-09-30 18:03:00 -07:00
1df0784591 Merge pull request #8299 from vieux/pr_7425
Add --security-opts options to allow user to customize container labels and apparmor profile
Upstream-commit: d40ab6f1238c78ea84645e516f1f24d7991798b0
Component: engine
2014-09-30 17:53:11 -07:00
98ca654d42 Merge pull request #8291 from mieciu/master
Source the bash_completion after installation
Upstream-commit: 5e69f4a1885310e8e4dd386bb4ff8c2d80bec40f
Component: engine
2014-09-30 15:55:25 -04:00
5ab43c288e Merge pull request #8286 from ClusterHQ/8285-volume-api-docs
Document Volumes and Binds
Upstream-commit: 1d199f2d8508adb1d759fedc31d9e6ccf7df25ae
Component: engine
2014-09-30 15:53:41 -04:00
eeaa68fe01 update tests
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 08547dff29490236949317ca604dbda9d8feac4f
Component: engine
2014-09-30 19:10:03 +00:00
3fb8ef8c04 Merge pull request #8092 from vishh/exec_api_docs
Exec remote API documentation
Upstream-commit: d4e5fa5728cf04db09a89608627fbb140fcd265e
Component: engine
2014-09-30 11:50:23 -07:00
1dd6380138 Adding exec remote API documentation along with minor code cleanup.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 021ecb1d1355e8291a5a872c761a1e367072e308
Component: engine
2014-09-30 18:26:58 +00:00
5cc74547b7 update docs
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 226bc669aa9a886c5a6855e054b751e72d20971b
Component: engine
2014-09-30 18:15:23 +00:00
d5dfd4845d Add missing "tag" parameter to tag API
Closes #4877

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ee0b64f7a79b7d704110d1f541710ae6fba5eb37
Component: engine
2014-09-30 10:53:29 -07:00
29f6884031 Merge pull request #8263 from jfrazelle/filter-status-name
Filter containers by status.
Upstream-commit: e32b54fe35a8632f4d512e081c5325e36b67cf44
Component: engine
2014-09-30 10:40:02 -07:00
9d6dc8c4d8 Merge pull request #8309 from ArikaChen/master
Fix typo:betweem->between and PtySlace->PtySlave
Upstream-commit: 1b6da6a6fe98ef2d67c50be3549244952743b5e7
Component: engine
2014-09-30 16:20:31 +03:00
cc7745c80d Fix typo:betweem->between and PtySlace->PtySlave
Signed-off-by: Arika Chen <eaglesora@gmail.com>
Upstream-commit: bfc9d8bbea2f41247fa543034bbbf64704ae3aae
Component: engine
2014-09-30 07:22:09 -04:00
afe8e130e0 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>
Upstream-commit: 30d5a42c1f24e26f681b7330249f04fec891aee9
Component: engine
2014-09-29 23:23:36 -07:00
a84cb1fe40 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>
Upstream-commit: 73f4bfed810b65943f1d9d038a8db9bd834067fa
Component: engine
2014-09-29 23:21:41 -07:00
3ffb3fc6cc 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>
Upstream-commit: b845a62149d5f4990462ac6c9167c5cfaa0e66cb
Component: engine
2014-09-29 23:16:27 -07:00
ce150ab801 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)
Upstream-commit: ea09f036824aee74112a75ac99579ae4f10251b5
Component: engine
2014-09-29 20:11:19 -07:00
ad2a93f102 Merge pull request #8281 from dfarrell07/master
Doc update to clarify EXPOSE vs -p functionality.
Upstream-commit: 8128339bc8fe3ed7f5c8fd9cc69a73d2dd519a83
Component: engine
2014-09-29 18:55:11 -07:00
a100820f28 Merge pull request #8280 from duglin/Issue3636
Add more info about when build cache is invalidated/used - Issue #3636
Upstream-commit: 4b311e1bd28fb658fe486e99b0d82867bfdd1037
Component: engine
2014-09-29 21:52:42 -04:00
aa28ecc957 Doc update to clarify EXPOSE vs -p functionality.
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
Upstream-commit: 5730abc16728404c328b896c893f9487effbec55
Component: engine
2014-09-29 20:59:12 -04:00
7a91f064d2 Merge pull request #8296 from scollier/typo
Fixed simple typo
Upstream-commit: 35005595b9f6bb59c545ec5a8d7a26461ae00083
Component: engine
2014-09-30 03:48:48 +03:00
f73d9c3630 add apparmor:
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: c2c5e57a8ea4b1dc35c58654443a8c4508277904
Component: engine
2014-09-30 00:43:47 +00:00
b79cf494d2 Merge pull request #8293 from crosbymichael/update-libcontainer-sep8
Update libcontainer to c744f6470e37be5ce1f1ae09b842c15c1bee120d
Upstream-commit: 07179a7eb1a0cb7816b618a108d46cb4a4e699ca
Component: engine
2014-09-29 18:09:25 -06:00
fe37a1db8f 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)
Upstream-commit: 87e732a0f3503517d7a66804bb9a7f74977347e5
Component: engine
2014-09-30 00:06:22 +00:00
840410fc66 Merge pull request #8295 from crosbymichael/type-exec-context
Strongly type exec driver context
Upstream-commit: 595b5bf06e6d4e6ddf4f493b956a8eab112dd52b
Component: engine
2014-09-29 17:02:53 -07:00
2281e9a92d Fixed simple typo
Signed-off-by: Scott Collier <emailscottcollier@gmail.com>
Upstream-commit: 35aa3fd5f20f1d9575e3f25366680f9ed9f36aa0
Component: engine
2014-09-29 18:58:47 -05:00
baaf0d57f5 Merge pull request #8112 from dmcgowan/libtrust_key_management
Libtrust key management
Upstream-commit: 999d4117f6544aeefaba3c40aef678042c71aa7a
Component: engine
2014-09-29 16:32:48 -07:00
280ec2913c 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>
Upstream-commit: 32dca1a7b0e800d796e54fc8f253818ba64fa075
Component: engine
2014-09-29 22:40:26 +00:00
1a11728b82 Merge pull request #8289 from duglin/FixTestcaseFor8230
Fixes the new testcase for PR #8230
Upstream-commit: 7c1aee62910405720f977e5777fafefc662dc175
Component: engine
2014-09-29 15:33:51 -07:00
17d871fa05 Source the bash_completion after installation
Signed-off-by: Przemek Hejman <przemyslaw.hejman@gmail.com>
Upstream-commit: 9f59e2223d59829892e57d38b95cd951d1fbdc9e
Component: engine
2014-09-29 23:37:51 +02:00
1b12783c0c Update native driver to set RootFs
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 532c29ef7deea38bed68506b785f067796a1836b
Component: engine
2014-09-29 21:35:25 +00:00
b93bcf8956 Merge pull request #8210 from dastergon/improve_gentoodoc
improve docs for Gentoo Linux installation
Upstream-commit: a7d61e0ffba4567d53f9c154cc7c060406d6ba3d
Component: engine
2014-09-29 14:35:21 -07:00
9ea819ca0c Update libcontainer to c744f6470e37be5ce1f1ae09b84
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 392eec20751bd1da7f84fa4974042eaa263a56d2
Component: engine
2014-09-29 21:23:42 +00:00
9405298e4e 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>
Upstream-commit: 83f0f46b7c0475ae1da329cd97a8c0a67bdc2a6a
Component: engine
2014-09-29 14:13:39 -07:00
967d9bcfa2 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>
Upstream-commit: f90d201d887028e21290a413046eb1af7fc8e609
Component: engine
2014-09-29 23:59:43 +03:00
1cba9ff5e0 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>
Upstream-commit: 8b3fbac15c0579c1372f3e13f607c1001d149d16
Component: engine
2014-09-29 13:35:09 -07:00
6f33e55c71 Merge pull request #8273 from duglin/Issue7941
Fix error paring null JSON - Issue7941
Upstream-commit: 826439c537f9e3346e66dda9b65fd936e470d840
Component: engine
2014-09-29 12:59:34 -07:00
3dce9f533b Merge pull request #8284 from erikh/fix_cmd_again
builder: Fix CMD to inject /bin/sh -c when provided with a non-json value
Upstream-commit: 670c8696a29825b23208496bd4d8e88b5faa7773
Component: engine
2014-09-29 15:56:16 -04:00