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

14095 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Goff
7c2cc476da Merge pull request #11735 from Sirupsen/listenbuffer-promote 
listenbuffer: add docs and test
 2015-03-25 08:14:21 -07:00
moxiegirl
dea660874c Merge pull request #11715 from duglin/DocCliEnvVars 
Add some info about what environment variables are available
 2015-03-25 07:29:27 -07:00
moxiegirl
67eb10defe Merge pull request #11694 from hqhq/hq_add_memsw_example 
docs: add memory and swap memory usage examples
 2015-03-25 07:01:44 -07:00
Doug Davis
65584318d2 Merge pull request #11738 from joeygibson/11610-split 
api/client - The code for all cli commands are in one file #11610
 2015-03-25 00:48:50 -04:00
Doug Davis
494c41519b Merge pull request #11733 from jfrazelle/fix-lxc 
Get rid of panic in stats/ fix dir lxc
 2015-03-25 00:41:11 -04:00
Jessica Frazelle
c959d26d2f fix 2 integration tests on lxc 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-24 21:12:16 -07:00
Jessica Frazelle
7dce902494 Get rid of panic in stats for lxc 
Fix containers dir

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-24 21:12:06 -07:00
Joey Gibson
58690c9cca api/client - The code for all cli commands are in one file #11610 
Signed-off-by: Joey Gibson <joey@joeygibson.com>
 2015-03-24 23:57:23 -04:00
Simon Eskildsen
67bd859481 listenbuffer: add docs 
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com>
 2015-03-25 03:11:34 +00:00
Simon Eskildsen
b6b8032a17 listenbuffer: add test 
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com>
 2015-03-25 03:11:33 +00:00
Doug Davis
0d2190e679 Add some info about what environment variables are available 
Having the list in one spot makes it easier for people to see what's
avaiable instead of having to scan all of the docs and extract the info.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-24 18:29:21 -07:00
Jessie Frazelle
22dba32b4d Merge pull request #10527 from mfojtik/lxc_11 
Fix lxc-start in lxc>1.1.0 where containers start daemonized by default
 2015-03-24 17:37:27 -07:00
Michael Crosby
d214e64032 Merge pull request #11018 from delftswa2014/10958-pidfile 
Moves pid file operations to /pkg/
 2015-03-24 17:20:52 -07:00
Jessie Frazelle
aecc5b606f Merge pull request #11728 from crosbymichael/lxc-mkdir 
Mkdir for lxc root dir before setup of symlink
 2015-03-24 16:25:12 -07:00
Arnaud Porterie
322095ed63 Merge pull request #10681 from noironetworks/whitespaces-cleaner 
Removed all trailing whitespaces from every text file
 2015-03-24 16:02:14 -07:00
Rick Wieman
772833274f Moved pidfile from utils to pkg 
Fixes #10958 by moving utils.daemon to pkg.pidfile.
Test cases were also added.
Updated the daemon to use the new pidfile.

Signed-off-by: Rick Wieman <git@rickw.nl>
 2015-03-24 23:59:32 +01:00
Michael Crosby
246cab90f2 Mkdir for lxc root dir before setup of symlink 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-24 15:53:23 -07:00
Michael Crosby
f3fc857e01 Merge pull request #11716 from LK4D4/root_in_run 
Use /var/run/docker as root for execdriver
 2015-03-24 14:58:30 -07:00
Michael Crosby
46be6bb403 Merge pull request #11651 from vbatts/vbatts-dont_rm_dockerversion 
make.sh: leave around the generated version
 2015-03-24 14:47:42 -07:00
Alexander Morozov
979283a166 Merge pull request #11726 from noxiouz/history-swap-parallel-assignment 
History.Swap Use parallel assignment to swap elements
 2015-03-24 14:43:44 -07:00
Michael Crosby
73dab8205a Merge pull request #11679 from avidas/api-common-constants-document 
Add comments to api/common constants
 2015-03-24 14:43:09 -07:00
Alexander Morozov
a4e1de58a3 Merge pull request #11727 from tiborvass/carry-11441 
Carry 11441: fix docker ps help message
 2015-03-24 14:42:02 -07:00
jimmyxian
a153e80f72 fix docker ps help message 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-03-24 15:33:53 -06:00
Anton Tiurin
fc325274e8 History.Swap Use parallel assignment to swap elements, as it's 
a more idiomatic way for golang than using a temp variable.

Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
 2015-03-25 00:13:13 +03:00
Michael Crosby
46321a1e4f Merge pull request #11713 from icecrime/update_gitignore 
Update .gitignore
 2015-03-24 14:03:31 -07:00
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
Alexander Morozov
1e788ec985 Use /var/run/docker as root for execdriver 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-24 10:47:30 -07: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
Arnaud Porterie
4433b4c19e Sort .gitignore content 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-03-24 09:40:07 -07: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
Qiang Huang
a5cbb5c3ae add cpuset and examples to run.md 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-03-24 18:48:08 +08:00