0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
14062 commits 14 branches 412 tags 338 MiB
Commit graph

14062 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexander Morozov
439e0ab23f Merge pull request #11712 from 4gh/test_httputils 
add tests for pkg/httputils
 2015-03-24 13:56:31 -07:00
Tibor Vass
28b96cc613 Merge pull request #11663 from arthurbarr/master 
Fix #11589 by adding README and comments to exported functions
 2015-03-24 14:45:05 -06:00
Vincent Batts
8fc9e40086 Merge pull request #11417 from rhatdan/btrfs 
Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version
 2015-03-24 16:00:15 -04:00
Alexander Morozov
131b29f7bc Merge pull request #10283 from rhatdan/dev 
We want to allow the sharing of /dev from the host into the container.
 2015-03-24 12:57:44 -07:00
Alexander Morozov
f7900cdd67 Merge pull request #11689 from calavera/ipallocator_refactor 
Use a structure to keep the allocated ips pool.
 2015-03-24 12:42:30 -07:00
moxiegirl
d20ba329d1 Merge pull request #11717 from moxiegirl/tweaks-from-contributathon 
Adding in comments from party
 2015-03-24 12:18:18 -07:00
Phil Estes
ce372cd664 Merge pull request #11709 from paulbellamy/11626-portallocator 
Refactor global portallocator and portmapper state
 2015-03-24 13:51:00 -05:00
Michael Crosby
8eee55a35c Merge pull request #11710 from runcom/11599-refactor-pkg-common 
Refactor pkg/common, Fixes #11599
 2015-03-24 11:45:07 -07:00
David Calavera
7e95b13460 Use a structure to keep the allocated ips pool. 
Fixes #11624.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-03-24 11:41:44 -07:00
Mary Anthony
6de806f348 Adding in comments from party 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-24 11:25:26 -07:00
Dan Walsh
25c4a92342 Merge branch 'master' of github.com:docker/docker into btrfs 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-03-24 14:14:54 -04:00
Arthur Barr
557cca536f Fix #11589 by adding README and comments to exported functions 
Signed-off-by: Arthur Barr <arthur.barr@uk.ibm.com>
 2015-03-24 17:30:19 +00:00
Antonio Murdaca
b80fae7356 Refactor pkg/common, Fixes #11599 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-24 18:19:59 +01:00
Frank Herrmann
2770a88413 add tests for pkg/httputils 
closes #11597

Signed-off-by: Frank Herrmann <fgh@4gh.tv>
 2015-03-24 16:27:09 +00:00
moxiegirl
4b4bdb5be5 Merge pull request #11697 from pdxdan/7447-GID-Doc 
Updated Dockerfile and docker-run documentation for USER commands
 2015-03-24 09:17:41 -07:00
moxiegirl
dbd00822ec Merge pull request #11693 from jessedearing/login_docs 
Add documentation about the semantics of `docker login` @jessedearing thanks for the PR!
 2015-03-24 09:13:53 -07:00
moxiegirl
d827b4d235 Merge pull request #11688 from afewremarks/master 
RE: Issue #6114.  Updated docs to reflect docker inpsect for volumes
 2015-03-24 09:12:00 -07:00
Alexander Morozov
9d7f58100f Merge pull request #11670 from runcom/11607-api-route-post-auth-response 
Return AuthResponse from postAuth api endpoint
 2015-03-24 08:26:07 -07:00
moxiegirl
05c23cad85 Merge pull request #11690 from ssdonline/fix_issue_11683 
Fixes error #11683
 2015-03-24 06:28:24 -07:00
Doug Davis
1ad6aae272 Merge pull request #11701 from HuKeping/typo 
Fix minor typo
 2015-03-24 08:03:09 -04:00
Hu Keping
96d8c3584c Fix minor typo 
Fix minor typo and make the comments of version-comparison functions
uniform.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-03-25 00:46:22 +08:00
Paul Bellamy
87df5ab41b 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>
 2015-03-24 11:15:30 +00:00
Antonio Murdaca
babd1b3e1f Return AuthResponse from postAuth api endpoint, Fixes #11607 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-24 09:57:01 +01:00
Jesse Dearing
ed0d2ac3b7 Add documentation about the semantics of docker login 
Fixes #10550

Signed-off-by: Jesse Dearing <jesse.dearing@gmail.com>
 2015-03-23 23:53:50 -07:00
moxiegirl
617f18b001 Merge pull request #11692 from khoomeister/ck-fix-another-typo 
fix test-and-docs typo "do" to "due"
 2015-03-23 21:36:40 -07:00
Chris Khoo
df98ce0a28 fix test-and-docs typo "do" to "due" 
Signed-off-by: Chris Khoo <chris.khoo@gmail.com>
 2015-03-23 21:12:09 -07:00
Dan Anolik
a57d7c5c79 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>
 2015-03-23 20:47:04 -07:00
Swapnil Daingade
6fa6b5bcbb Fixes error #11683 
Signed-off-by: Swapnil Daingade <swapnil.daingade@gmail.com>
 2015-03-23 23:45:55 -04:00
Sven Dowideit
72394a5d7a Merge pull request #11684 from khoomeister/ck-fix-prereq-typo 
fix broken prerequisite link
 2015-03-24 13:45:48 +10:00
Mark West
ef0275c66c RE: Issue #6114. Updated docs to reflect docker inpsect for volumes 
Signed-off-by: Mark West <markewest@gmail.com>
 2015-03-23 20:16:40 -07:00
Arnaud Porterie
3ebd768487 Merge pull request #11681 from alena1108/master 
Removed unused "mutex" field
 2015-03-23 19:40:38 -07:00
Chris Khoo
b21751da90 fix broken prerequisite link 
Signed-off-by: Chris Khoo <chris.khoo@gmail.com>
 2015-03-23 19:22:17 -07:00
Alena Prokharchyk
dabd8a02ae Removed unused "mutex" field 
fixes #11659

Signed-off-by: Alena Prokharchyk <alena@rancher.com>
 2015-03-23 19:05:21 -07:00
Jessie Frazelle
e6b7d93072 Merge pull request #11665 from runcom/11613-api-exec-start-structured-response 
Return ContainerExecCreateResponse from container exec create API endpoint
 2015-03-23 17:52:15 -07:00
Michael Crosby
f586145cf1 Merge pull request #11634 from robertabbott/testutils_refactor 
Refactors pkg/testutils
 2015-03-23 17:30:51 -07:00
Jessie Frazelle
26f84d50aa Merge pull request #11674 from jamshid/docfix 
correcting git fetch command
 2015-03-23 17:11:31 -07:00
Jamshid Afshar
841692ff86 correcting git fetch command 
Signed-off-by: Jamshid Afshar <jafshar@yahoo.com>
 2015-03-23 19:00:05 -05:00
Jessie Frazelle
d5eea4e8b0 Merge pull request #11636 from robertabbott/refactor_networkfs 
Refactor pkg/networkfs
 2015-03-23 16:58:29 -07:00
Jessie Frazelle
f99da5745c Merge pull request #11672 from nparker94/master 
Added missing code example in the RM command reference
 2015-03-23 16:53:39 -07:00
Michael Crosby
4e3c72a026 Merge pull request #11667 from icecrime/integration-cli_image_cleanup 
Cleanup "hello-world" image in build tests
 2015-03-23 16:42:46 -07:00
Antonio Murdaca
0c3d2f6f96 Return ContainerExecCreateResponse from container exec start API endpoint, Fixes #11613 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-24 00:41:54 +01:00
Tibor Vass
92f9e2d395 Merge pull request #11657 from GeorgeMac/cleanup-redundant-else 
#11602 - Cleanup redundant else statements find via golint
 2015-03-23 18:27:29 -05:00
Michael Crosby
f7af5b0a84 Merge pull request #11666 from dmcgowan/fix-v2-get-all-tags 
Fix v2 get all tags (carrying 11334)
 2015-03-23 16:21:58 -07:00
Michael Crosby
839350d377 Merge pull request #11671 from noxiouz/11669-syslog-log-remove-redundant-stringcast 
Syslog.Log - Remove redundant cast of msg.Line []byte to string
 2015-03-23 16:16:18 -07:00
Natalie Parker
fe1f5ac77c Added missing code example in the RM command reference of command to delete all stopped containers 
Signed-off-by: Natalie Parker <nparker@omnifone.com>
 2015-03-23 23:05:57 +00:00
Alexander Morozov
197a3f0a98 Merge pull request #11570 from runcom/9658-consistent-autoremove 
Remove container if --rm flag is passed and container cannot be started
 2015-03-23 15:38:51 -07:00
Anton Tiurin
f2c7b4d743 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>
 2015-03-24 01:35:54 +03:00
Jessie Frazelle
bcb369af11 Merge pull request #11469 from albers/completion-cp 
restrict bash completion for hostdir arg to directories
 2015-03-23 15:31:00 -07:00
Jessie Frazelle
9d00d8137f Merge pull request #11422 from vbatts/vbatts-overlay_dir_mtime_changes 
pkg/archive: ignore mtime changes on directories
 2015-03-23 15:24:05 -07:00
Arnaud Porterie
3b4ff1c132 Merge pull request #11264 from brahmaroutu/fixtest_10967 
Test image api through local V1 repo, skip network test.
 2015-03-23 15:20:39 -07:00