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

13449 commits

This branch
This branch
All branches
Author SHA1 Message Date
Phil Estes
a3dc3bb758 Merge pull request #11073 from zenlinTechnofreak/zenlinlogerrfix 
To avoid the confusing in log, change '%s' to '%q', change the question ...
 2015-03-02 09:30:59 -05:00
Phil Estes
5c2a602b4e Merge pull request #11096 from MabinGo/fix_comments_typo 
fix wrong description and typo in daemon/graphdriver/devmapper/deviceset.go
 2015-03-02 08:55:51 -05:00
Zen Lin(Zhinan Lin)
08ea03ccb9 To avoid the confusing in log, change '%s' to '%q', change the question sentence to a reminding sentence. 
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
 2015-03-02 19:14:22 +08:00
Mabin
f4ac86de84 fix typo of comments in daemon/graphdriver/devmapper/deviceset.go 
Signed-off-by: Mabin <bin.ma@huawei.com>
 2015-03-02 02:11:15 +08:00
moxiegirl
a61716e5d9 Merge pull request #11089 from thaJeztah/carry-11063-update-mac-links 
Fix incorrect https example in mac.md (carry of 11063).  This is a fix for a typo. And a single line tweak.
 2015-02-28 16:05:47 -08:00
Sebastiaan van Stijn
1d4b2524ec Fix incorrect https example in mac.md (carry of 11063) 
The document referenced https but was using the http port. I changed the
examples from https to http.

Also, fyi, when I tried accessing https using the correct 443 port, it
did not work. I have not investigated why. Port 80 worked fine.

For me:
jay-mac:.ssh jay$ docker port web
80/tcp -> 0.0.0.0:49153
443/tcp -> 0.0.0.0:49154
jay-mac:.ssh jay$ boot2docker ip
192.168.59.103

works: http://192.168.59.103:49153/
fails: https://192.168.59.103:49154/

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-02-28 22:13:03 +01:00
Doug Davis
1dddf8a9a6 Merge pull request #11075 from coolljt0725/fix_minor_typo 
Fix a minor typo in daemon/container.go
 2015-02-28 09:24:28 -05:00
Lei Jitang
40dc18e2fa Fix a minor typo in daemon/container.go 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-02-28 18:43:28 +08:00
Jessie Frazelle
b52a2cfdf1 Merge pull request #11070 from jfrazelle/fix-racyevents-test 
fix racy events test
 2015-02-27 14:50:17 -08:00
Jessica Frazelle
202709d178 fix racy events test 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
 2015-02-27 14:48:39 -08:00
Jessie Frazelle
2768ce0e4e Merge pull request #10998 from jfrazelle/fix-filter-events-test-better 
Fix events test so it doesnt need new daemon
 2015-02-27 12:05:48 -08:00
Jessie Frazelle
314a678da7 Merge pull request #11037 from coolljt0725/add_parse_mac 
Add validate the input mac address on docker run command
 2015-02-27 12:03:25 -08:00
Jessie Frazelle
13030add69 Merge pull request #11011 from coolljt0725/fix_rmi_conflict 
Fix docker remove an image show misleading conflicts
 2015-02-27 12:00:12 -08:00
Jessie Frazelle
1061c56a5f Merge pull request #11002 from ahmetalpbalkan/win-cli/dockerfile-path-fix 
Support windows style dockerfile paths for build cmd
 2015-02-27 11:57:19 -08:00
Lei Jitang
2ba0fbb0ae Add validate the input mac address on docker run command 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-02-27 07:27:12 -08:00
Phil Estes
f5850e8e30 Merge pull request #11017 from brahmaroutu/random_10962 
moving random.go from utils
 2015-02-26 21:35:42 -05:00
Jessie Frazelle
fe554589c0 Merge pull request #11013 from delftswa2014/10965-timeout 
Move TimeoutConn to seperate pkg dir.
 2015-02-26 17:40:42 -08:00
Jessie Frazelle
bcbe70588d Merge pull request #11029 from brahmaroutu/fixtest_10963 
When --net=none enabled, the test uses local filesystem
 2015-02-26 17:30:02 -08:00
Jessie Frazelle
94553f1ba6 Merge pull request #10902 from estesp/10855-fix-add-host-doc 
Correct --add-host documentation regarding host IP address retrieval
 2015-02-26 17:25:01 -08:00
Jessie Frazelle
ac2521b87c Merge pull request #11044 from moxiegirl/fix-image-11043 
Rep README Fixing broken logo image
 2015-02-26 13:03:14 -08:00
Jessie Frazelle
082b7726e2 Merge pull request #11007 from ahmetalpbalkan/context-close-cleanup 
integ-cli: Add a few missing context cleanups
 2015-02-26 11:05:30 -08:00
Srini Brahmaroutu
53ece336dc moving random.go from utils 
Closes #10962
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-02-26 18:31:18 +00:00
Srini Brahmaroutu
17b6583a5a When --net=none enabled, the test uses local filesystem 
Closes #10963
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-02-26 18:24:34 +00:00
Doug Davis
1d6f469764 Merge pull request #11036 from liusdu/fix-typo 
fix a minor typo in daemon/exec.go
 2015-02-26 10:02:46 -08:00
Mary Anthony
02639c03b7 Smaller image 
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
 2015-02-26 08:48:58 -08:00
Mary Anthony
2e567d22da Fixing broken logo image 
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
 2015-02-26 08:45:59 -08:00
Jessie Frazelle
9324cdac07 Merge pull request #10831 from MalteJ/ipv6-ndp-proxy 
Adding IPv6 NDP Proxying documentation
 2015-02-26 07:19:36 -08:00
Sven Dowideit
7a93d52ea4 Merge pull request #11039 from SvenDowideit/fix-missing-compose-docs 
Missed to added doc files
 2015-02-27 01:13:35 +10:00
Sven Dowideit
7646e3f957 Missed to added doc files 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-27 01:10:50 +10:00
Liu Hua
5b794c413a fix a minor typo in daemon/exec.go 
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
 2015-02-26 19:11:27 +08:00
Tibor Vass
7e2328b76e Merge pull request #10869 from SvenDowideit/extract-docs-base 
Extract docs base
 2015-02-25 23:16:46 -05:00
Lei Jitang
d9d9175507 Fix docker remover an image show misleading conflicts 
due to its dependency is tagged to multiple repositories

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-02-26 12:01:35 +08:00
Sven Dowideit
6d4b0f5334 update the mkdocs.yml to add new docs 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-26 12:11:29 +10:00
James Turnbull
f8dbcdc599 Merge pull request #10940 from 1HLtd/master 
docs/man/docker.1.md: spelling mistake fix
 2015-02-25 20:45:46 -05:00
Sven Dowideit
0365e8c204 set the document meta-data for the orchestration docs to turn off the docker-version documentation dropdown, asit doesn't apply 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-26 11:41:39 +10:00
Sven Dowideit
ac47a87740 Manually place the orchestration docs into the menu 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-26 11:41:39 +10:00
Sven Dowideit
8d4459fffb Don't require Docker 1.5.0 for docker build -f docs/Dockerfile 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-26 11:41:39 +10:00
Sven Dowideit
3e84b9e56a Import docs from swarm, machine and compose repositories, 
Also add the image spec from the code area to show we're building from the repo-root now

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-26 11:41:39 +10:00
Sven Dowideit
ab545aed4c Simplify the existing docs building by extracting the main Dockerfile into a docs/base Hub image 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-26 11:41:39 +10:00
Jessie Frazelle
321f4f0683 Merge pull request #11025 from crosbymichael/test-rm-dev 
Reinit slice for each dir in search
 2015-02-25 16:18:05 -08:00
Michael Crosby
8be8e41429 Reinit slice for each dir in search 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-02-25 15:53:07 -08:00
Michael Crosby
481e75203d Merge pull request #10510 from ashahab-altiscale/9875-lxc-image-layer 
Added /dev paths to layer comparison
 2015-02-25 14:52:31 -08:00
Michael Crosby
9a2e58dd29 Merge pull request #10498 from ashahab-altiscale/9875-lxc-stats 
Implements stats for lxc driver
 2015-02-25 13:46:18 -08:00
Rik Nijessen
7e7646c28a Rename package timeout to timeoutconn. 
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
 2015-02-25 20:52:37 +01:00
Jessie Frazelle
21811f0786 Merge pull request #11001 from ahmetalpbalkan/win-cli/TestRunNoDupVolumes-fix 
integ-cli: pass unix paths to TestRunNoDupVolumes
 2015-02-25 09:47:30 -08:00
Alexander Morozov
711175d666 Merge pull request #11004 from ahmetalpbalkan/win-cli/TestRunBindMounts-skip 
integ-cli: skip TestRunBindMounts (same-host daemon requirement)
 2015-02-25 09:37:15 -08:00
Rik Nijessen
690a85797e Move TimeoutConn to seperate pkg dir. 
Fixes #10965
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
 2015-02-25 17:09:47 +01:00
Phil Estes
f8a146311d Correct --add-host documentation regarding host IP address retrieval 
Fixes: 10855

The example was actually incorrect for many situations, and also, now
that we have IPv6 we should not that the example is for IPv4 and note
how to find IPv6 addresses.  Also, the device they want to connect to
could be the bridge, or main ethernet device, or some other device
name, so note that as well.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-02-25 09:56:58 -05:00
Ahmet Alp Balkan
f6e95ef3a4 integ-cli: a few context cleanups 
These cleanup calls were forgotten, adding these to
reduce garbage on windows CI machines.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-02-25 01:09:06 -08:00
Ahmet Alp Balkan
26444e5e9a integ-cli: skip TestRunBindMounts (same-host daemon requirement) 
`TestRunBindMounts` requires daemon to be on the same host.
Running this cli test on Linux is fair enough coverage for
this functionality and we can skip this for platforms where
daemon cannot run side-by-side with the cli for now.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-02-24 21:04:47 -08:00