a8b699f5d9
Merge pull request #10798 from ahmetalpbalkan/win-cli/TestEventsUntag-fix
...
integration-cli: Remove timeout dependency on TestEventsUntag
2015-03-04 03:54:33 -08:00
beea697be3
Merge pull request #10858 from duglin/10807-MixedcaseDockerfile
...
Support dockerfile and Dockerfile
2015-03-04 03:52:49 -08:00
98630b2ef6
Merge pull request #11051 from bdehamer/add-registry-api-client-library
...
Add reference to docker-reg-client
2015-03-03 20:41:42 -08:00
15924f2385
Support dockerfile and Dockerfile
...
Closes #10807
Adds support for `dockerfile` ONLY when `Dockerfile` can't be found.
If we're building from a Dockerfile via stdin/URL then always download
it a `Dockerfile` and ignore the -f flag.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-03 18:38:50 -08:00
5929f401fc
Merge pull request #11091 from chenhanxiao/See-also-login-start
...
docs: add See Also for description of login/logout and start/stop
2015-03-03 14:49:59 -08:00
b47ab8cfa3
Merge pull request #11140 from SvenDowideit/correct-notes-markup
...
Notes should be indented
2015-03-03 14:16:56 -08:00
93c82360a6
Notes should be indented
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-03-03 13:58:35 -08:00
8e107a9321
Merge pull request #11121 from shishir-a412ed/docker_help_issue
...
Fix: docker -d -h start daemon instead of showing help menu
2015-03-02 15:40:27 -08:00
0ab28c6589
Fix: docker -d -h start daemon instead of showing help menu
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-03-02 17:01:56 -05:00
32ccde46dd
Merge pull request #11106 from MabinGo/fix_log_info
...
Fix some revision about log output
2015-03-02 13:55:43 -08:00
f92213af88
Merge pull request #11005 from ahmetalpbalkan/win-cli/RegistryV2-skip
...
integ-cli: skip tests launching registry-v2
2015-03-02 12:41:21 -08:00
c5ecdfd878
Merge pull request #10971 from Microsoft/10662-api_server_factor_out_windows
...
api\server: Factored out UnixHttp on Windows, supported on Linux only.
2015-03-02 12:40:20 -08:00
bedf3f8f20
Merge pull request #11006 from ahmetalpbalkan/win-cli/TestCommitChange-fix
...
integ-cli: fix TestCommitChange for pulled busybox
2015-03-02 12:39:34 -08:00
377e62aa02
Merge pull request #11111 from zenlinTechnofreak/zlFixDriverNote
...
fix err in note at daemon/networkdriver/bridge/driver.go
2015-03-02 12:31:37 -08:00
2bfa701f45
Merge pull request #10986 from crosbymichael/create-api-type
...
Create api types package for structured responses
2015-03-02 12:22:02 -08:00
1500503b29
Merge pull request #11055 from MabinGo/checkfileoper2
...
when the file that was opened has been read into buffer, the file should be closed
2015-03-02 12:18:14 -08:00
82aa950f4e
Merge pull request #11054 from MabinGo/checkfileoper1
...
Add the file close operation before function return to advoid resource leaking
2015-03-02 10:44:26 -08:00
738bdec490
Merge pull request #11083 from MabinGo/minor_typo
...
Modify the minor typo in deviceset.go
2015-03-02 13:11:14 -05:00
360adc707b
Merge pull request #11112 from tianon/bashrc-for-tibor-♥
...
Add support for an optional ".bashrc" file
2015-03-02 13:02:39 -05:00
c62230a879
Add support for an optional ".bashrc" file
...
If `.bashrc` exists at the root of the source tree, it will be used as the `~/.bashrc` inside the container.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-02 10:33:26 -07:00
e5bc50b5cd
fix err in note at daemon/networkdriver/bridge/driver.go
...
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
2015-03-03 00:52:53 +08:00
89db94ecf9
Merge pull request #11003 from brahmaroutu/rename_10996
...
Prefix / is ignored when container is renamed
2015-03-02 09:48:07 -05:00
6bbf5c3e99
Merge pull request #11060 from dmitrygusev/docs-improvements
...
Docs improvements typo fixes and consistency
2015-03-02 06:46:17 -08:00
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
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
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
adfd1ddfc6
Fix some revision about log output
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-03-02 17:06:38 +08:00
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
41dc0e08d3
docs: add See Also for description of login/logout and start/stop
...
make them reference to each other.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-03-01 01:36:00 -05:00
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
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
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
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
5c1559a754
Modify the minor typo in deviceset.go
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-02-28 18:04:10 +08:00
b52a2cfdf1
Merge pull request #11070 from jfrazelle/fix-racyevents-test
...
fix racy events test
2015-02-27 14:50:17 -08:00
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
caaae78247
Prefix / to the container name is ignored when container is renamed
...
Closes #10996
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-02-27 22:40:04 +00:00
39b3690ba1
Update cli.md
...
Use `-it` combination in example instead of `-ti`, because this is how it used everywhere in examples.
Update dockerfile_best-practices.md
Fix typo in command name
Signed-off-by: Dmitry Gusev <dmitry.gusev@gmail.com>
2015-02-27 23:18:32 +03:00
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
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
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
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
b5eeab6e06
Add the file close operation before function return to advoid resource leaking
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-02-28 00:24:41 +08:00
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
d5ea4bae4a
when the file that was opened has been read into buffer, the file should be close.
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-02-27 19:09:17 +08:00
c1b7792186
integ-cli: fix TestCommitChange for pulled busybox
...
If the tests are running outside a container (i.e.
executed without `make test`), we are using a `busybox`
pulled from Docker Hub (not jpatezzo's docker-busybox).
That one adds an extra
`PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin`
env var all the time and that messes the test `TestCommitChange`.
That's currently breaking the windows CI.
I'm keeping the same PATH here but making it explicit
so that it's always set and we verify what we set. It's actually the same
thing if I set `ENV PATH foo` here but I thought it may lead to some
problems hard to debug in the future.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-26 20:08:16 -08:00
f5850e8e30
Merge pull request #11017 from brahmaroutu/random_10962
...
moving random.go from utils
2015-02-26 21:35:42 -05:00
fe554589c0
Merge pull request #11013 from delftswa2014/10965-timeout
...
Move TimeoutConn to seperate pkg dir.
2015-02-26 17:40:42 -08:00
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
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
moxiegirl
Doug Davis
Fred Lifton
Sven Dowideit
Shishir Mahajan
Alexander Morozov
Phil Estes
Tibor Vass
Tianon Gravi
Zen Lin(Zhinan Lin)
Mabin
Chen Hanxiao
Sebastiaan van Stijn
Doug Davis
Lei Jitang
Jessica Frazelle
Srini Brahmaroutu
Dmitry Gusev
Ahmet Alp Balkan