a6001c7df9
Use /var/run/docker as root for execdriver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 1e788ec9855058913de6ac8a2be7acee0f001954
Component: engine
2015-03-24 10:47:30 -07:00
0e96e605fc
Fix #11589 by adding README and comments to exported functions
...
Signed-off-by: Arthur Barr <arthur.barr@uk.ibm.com >
Upstream-commit: 557cca536f82a25f110399fcd2964e07f5d51dcf
Component: engine
2015-03-24 17:30:19 +00:00
1e47557825
Refactor pkg/common, Fixes #11599
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: b80fae735684406d848b16a0f148a746e17ed25f
Component: engine
2015-03-24 18:19:59 +01:00
04b5dbec35
Sort .gitignore content
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 4433b4c19e7eb63937e211cc0684560800799e68
Component: engine
2015-03-24 09:40:07 -07:00
2db48ea0b7
add tests for pkg/httputils
...
closes #11597
Signed-off-by: Frank Herrmann <fgh@4gh.tv >
Upstream-commit: 2770a88413a98fcb3dd6e36e91c5041e5fe082eb
Component: engine
2015-03-24 16:27:09 +00:00
f56d95c837
Merge pull request #11697 from pdxdan/7447-GID-Doc
...
Updated Dockerfile and docker-run documentation for USER commands
Upstream-commit: 4b4bdb5be58943c24ca64fd8b0b69cd259515a23
Component: engine
2015-03-24 09:17:41 -07:00
5748e209c9
Merge pull request #11693 from jessedearing/login_docs
...
Add documentation about the semantics of `docker login` @jessedearing thanks for the PR!
Upstream-commit: dbd00822ece83b614ec92454bc8e20b5238ccb4d
Component: engine
2015-03-24 09:13:53 -07:00
dca8944dc0
Merge pull request #11688 from afewremarks/master
...
RE: Issue #6114 . Updated docs to reflect docker inpsect for volumes
Upstream-commit: d827b4d235f7604e2a4fa7ad95e2d75dafb4ac27
Component: engine
2015-03-24 09:12:00 -07:00
a48304b35d
Merge pull request #11670 from runcom/11607-api-route-post-auth-response
...
Return AuthResponse from postAuth api endpoint
Upstream-commit: 9d7f58100f6ba8f954dc4fc6c7a2171c79d940af
Component: engine
2015-03-24 08:26:07 -07:00
8deca36145
Merge pull request #11690 from ssdonline/fix_issue_11683
...
Fixes error #11683
Upstream-commit: 05c23cad85bde1d76ccd1d398f5a839ee8ee87d9
Component: engine
2015-03-24 06:28:24 -07:00
aca7c0f94e
Add some run option to bash completion
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 7d707360159852dde4e75fc5d4778c72abc44a03
Component: engine
2015-03-24 20:15:16 +08:00
5999274fa2
Fix minor typo
...
Fix minor typo and make the comments of version-comparison functions
uniform.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 96d8c3584cedddfc69c01bda3f512d495b21ac47
Component: engine
2015-03-25 00:46:22 +08:00
8938696741
Refactor global portallocator and portmapper state
...
Continuation of: #11660 , working on issue #11626 .
Wrapped portmapper global state into a struct. Now portallocator and
portmapper have no global state (except configuration, and a default
instance).
Unfortunately, removing the global default instances will break
```api/server/server.go:1539```, and ```daemon/daemon.go:832```, which
both call the global portallocator directly. Fixing that would be a much
bigger change, so for now, have postponed that.
Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com >
Upstream-commit: 87df5ab41b3f9b2bdd8682f4afd41dac78f7e96d
Component: engine
2015-03-24 11:15:30 +00:00
c7b0d94a4d
add cpuset and examples to run.md
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: a5cbb5c3aec0d5c717581b2b60b9ae89b2c6fd05
Component: engine
2015-03-24 18:48:08 +08:00
287b673e43
Return AuthResponse from postAuth api endpoint, Fixes #11607
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: babd1b3e1fd7be7674f6e96f264b1b841aeba3b9
Component: engine
2015-03-24 09:57:01 +01:00
0b2b56ecf5
Add documentation about the semantics of docker login
...
Fixes #10550
Signed-off-by: Jesse Dearing <jesse.dearing@gmail.com >
Upstream-commit: ed0d2ac3b799b8f7b2508176e65bfe8583881c83
Component: engine
2015-03-23 23:53:50 -07:00
5ae0277137
docs: add memory and swap memory usage examples
...
fix: https://github.com/docker/docker/issues/11629
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 0f9c20fe688e0bc093f631b7d31badc4bb750bd7
Component: engine
2015-03-24 13:45:16 +08:00
77de545445
Merge pull request #11692 from khoomeister/ck-fix-another-typo
...
fix test-and-docs typo "do" to "due"
Upstream-commit: 617f18b0011b45a9ef71d4adb45b3ca45132e1e6
Component: engine
2015-03-23 21:36:40 -07:00
6fc2c6927a
fix test-and-docs typo "do" to "due"
...
Signed-off-by: Chris Khoo <chris.khoo@gmail.com >
Upstream-commit: df98ce0a28c6d38757305dccc1acb4b8989e6aff
Component: engine
2015-03-23 21:12:09 -07:00
616291f1ff
Added documentation for specifying groupname or GID for commands. Also clarified used of the possible use of multiple USER commands in a Dockerfile.
...
Signed-off-by: Dan Anolik <dan@anolik.net >
Upstream-commit: a57d7c5c796a1affcfa05ee6e7ea586750a9292f
Component: engine
2015-03-23 20:47:04 -07:00
6609e10340
Fixes error #11683
...
Signed-off-by: Swapnil Daingade <swapnil.daingade@gmail.com >
Upstream-commit: 6fa6b5bcbb707a1fe709c5272035b79635c29a78
Component: engine
2015-03-23 23:45:55 -04:00
05ea1bc108
Merge pull request #11684 from khoomeister/ck-fix-prereq-typo
...
fix broken prerequisite link
Upstream-commit: 72394a5d7a50f0132262685008ed4f924dcc3016
Component: engine
2015-03-24 13:45:48 +10:00
d3b04844fa
Add comments to api/common constants, closes #11583
...
Signed-off-by: Avi Das <andas222@gmail.com >
Upstream-commit: c136591f40c34de51bbb0691ae69f393ff8b2f0e
Component: engine
2015-03-23 22:35:41 -05:00
7c33403b52
RE: Issue #6114 . Updated docs to reflect docker inpsect for volumes
...
Signed-off-by: Mark West <markewest@gmail.com >
Upstream-commit: ef0275c66c420944dd3de4647d2d25b78f8f1b5a
Component: engine
2015-03-23 20:16:40 -07:00
5367fab1f0
fix broken prerequisite link
...
Signed-off-by: Chris Khoo <chris.khoo@gmail.com >
Upstream-commit: b21751da907cb2889aa9ca95ebf6c4c66e6131a6
Component: engine
2015-03-23 19:22:17 -07:00
68100310d8
Removed unused "mutex" field
...
fixes #11659
Signed-off-by: Alena Prokharchyk <alena@rancher.com >
Upstream-commit: dabd8a02aeff8b2122efa0b55de4ba52c429f936
Component: engine
2015-03-23 19:05:21 -07:00
c0b33db0e0
#11465 Add additional doc for locagi registries onn pull command
...
Signed-off-by: John Willis <john.willis@docker.com >
Upstream-commit: 3d28fc7d1c92456b226e1169bf3f44dcd9154b71
Component: engine
2015-03-23 21:00:02 -04:00
bb8cd4ea0b
Merge pull request #11665 from runcom/11613-api-exec-start-structured-response
...
Return ContainerExecCreateResponse from container exec create API endpoint
Upstream-commit: e6b7d9307269973d3dc8ff53cff4e141c47c671e
Component: engine
2015-03-23 17:52:15 -07:00
8ed1ac3b2b
Merge pull request #11634 from robertabbott/testutils_refactor
...
Refactors pkg/testutils
Upstream-commit: f586145cf178b9290034a6bbd1964e110a25377e
Component: engine
2015-03-23 17:30:51 -07:00
e28e5584fa
Merge pull request #11674 from jamshid/docfix
...
correcting git fetch command
Upstream-commit: 26f84d50aa89bc34751a84136e733e48e8b8f703
Component: engine
2015-03-23 17:11:31 -07:00
5715097ddd
correcting git fetch command
...
Signed-off-by: Jamshid Afshar <jafshar@yahoo.com >
Upstream-commit: 841692ff864c0d71347607eb8e4fbcf826d859c0
Component: engine
2015-03-23 19:00:05 -05:00
7074731d32
Merge pull request #11636 from robertabbott/refactor_networkfs
...
Refactor pkg/networkfs
Upstream-commit: d5eea4e8b04074b709d1bbe19b5336504df44446
Component: engine
2015-03-23 16:58:29 -07:00
c0463e32c4
Merge pull request #11672 from nparker94/master
...
Added missing code example in the RM command reference
Upstream-commit: f99da5745c6006f1171ca7f7665327fd4fcd0e1c
Component: engine
2015-03-23 16:53:39 -07:00
19aa69e7d8
Merge pull request #11667 from icecrime/integration-cli_image_cleanup
...
Cleanup "hello-world" image in build tests
Upstream-commit: 4e3c72a026f356508c3f530a15aa2dc09bcb27c9
Component: engine
2015-03-23 16:42:46 -07:00
a82b5988e8
Return ContainerExecCreateResponse from container exec start API endpoint, Fixes #11613
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 0c3d2f6f9658ae9b1e7c7cc6f7fda730d4b04898
Component: engine
2015-03-24 00:41:54 +01:00
925b84807a
Merge pull request #11657 from GeorgeMac/cleanup-redundant-else
...
#11602 - Cleanup redundant else statements find via golint
Upstream-commit: 92f9e2d3955fcc3341407809c9db33ac702e1508
Component: engine
2015-03-23 18:27:29 -05:00
71c4ad5a8f
Merge pull request #11666 from dmcgowan/fix-v2-get-all-tags
...
Fix v2 get all tags (carrying 11334)
Upstream-commit: f7af5b0a84bc1a6e18839e5217afe085e078f6a0
Component: engine
2015-03-23 16:21:58 -07:00
8eb4f18f1a
Merge pull request #11671 from noxiouz/11669-syslog-log-remove-redundant-stringcast
...
Syslog.Log - Remove redundant cast of msg.Line []byte to string
Upstream-commit: 839350d37783bb80e58e96272905bb49b64717fc
Component: engine
2015-03-23 16:16:18 -07:00
05267b46bc
Added missing code example in the RM command reference of command to delete all stopped containers
...
Signed-off-by: Natalie Parker <nparker@omnifone.com >
Upstream-commit: fe1f5ac77cda335ee773956cc8683a0c31791c3c
Component: engine
2015-03-23 23:05:57 +00:00
92fbf90d6e
Fix the TestPullImageFromCentralRegistry to skip and add local v1 registry test when net=none
...
Closes #10966
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 5d70a97b1fff8286220d2bef9ceb248401f046d1
Component: engine
2015-03-23 22:53:04 +00:00
d10460e7af
Merge pull request #11570 from runcom/9658-consistent-autoremove
...
Remove container if --rm flag is passed and container cannot be started
Upstream-commit: 197a3f0a98bbedc1253df3fae42837769871beb1
Component: engine
2015-03-23 15:38:51 -07:00
59aa846db8
Syslog.Log - Remove redundant cast of msg.Line []byte to string as
...
it's a fmt.Sprintf responsibility.
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
Upstream-commit: f2c7b4d7437443d469b2247362835af02ccef385
Component: engine
2015-03-24 01:35:54 +03:00
f673778d3a
Merge pull request #11469 from albers/completion-cp
...
restrict bash completion for hostdir arg to directories
Upstream-commit: bcb369af11dc09b7c5787cffe3a5d82dee18cc19
Component: engine
2015-03-23 15:31:00 -07:00
c1aef62402
Merge pull request #11422 from vbatts/vbatts-overlay_dir_mtime_changes
...
pkg/archive: ignore mtime changes on directories
Upstream-commit: 9d00d8137f9b6075284a89bb832c4a828e19a9fb
Component: engine
2015-03-23 15:24:05 -07:00
293d14edd7
Merge pull request #11264 from brahmaroutu/fixtest_10967
...
Test image api through local V1 repo, skip network test.
Upstream-commit: 3b4ff1c132669017f04d3b2e67517ff0c9a1a3df
Component: engine
2015-03-23 15:20:39 -07:00
b27a399633
Cleanup "hello-world" image in build tests
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: bfc748221b15a0f6e42a6ab520ed6e31fa9e90c8
Component: engine
2015-03-23 15:16:13 -07:00
63afa406b2
Merge pull request #11664 from crosbymichael/update-libct-mar23
...
Update libcontainer to fd0087d3acdc4c5865de1829d4accee5e3ebb658
Upstream-commit: dccaf1434f9359e33f94053719c66150eef83d22
Component: engine
2015-03-23 15:00:34 -07:00
bca1423917
Add struct tags on v2 remote tags struct
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 4925d98d1f638e9439e19b6c89c608a64a281a39
Component: engine
2015-03-23 14:33:52 -07:00
503249b833
Fix decode tags value error when call get /v2/<name>/tags/list in registry api v2.
...
Signed-off-by: Meaglith Ma <genedna@gmail.com >
Upstream-commit: 221e9624e3a7a7a9b81ffda9930657352080e32d
Component: engine
2015-03-23 14:33:52 -07:00
9e396b31ce
Merge pull request #11658 from 4gh/doc_package_builder
...
Add builder/evaluator comments for the package in godoc-style
Upstream-commit: 9f894c93e40cda8177febe71cd3c17d4b7613659
Component: engine
2015-03-23 14:27:23 -07:00
Alexander Morozov
Arthur Barr
Antonio Murdaca
Arnaud Porterie
Frank Herrmann
moxiegirl
Alexander Morozov
Lei Jitang
Hu Keping
Paul Bellamy
Qiang Huang
Jesse Dearing
Chris Khoo
Dan Anolik
Swapnil Daingade
Sven Dowideit
Avi Das
Mark West
Alena Prokharchyk
John Willis
Jessie Frazelle
Michael Crosby
Jamshid Afshar
Tibor Vass
Natalie Parker
Srini Brahmaroutu
Anton Tiurin
Derek McGowan
Meaglith Ma