e00d9f2fa2
Add xfs fs magic to graphdriver/driver.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: dd56fa190695a969673f6f663cd5fe78b7c22787
Component: engine
2015-03-04 19:01:39 +08:00
570cc01da3
Merge pull request #11051 from bdehamer/add-registry-api-client-library
...
Add reference to docker-reg-client
Upstream-commit: 98630b2ef62653d288430b25867ddacbf1731441
Component: engine
2015-03-03 20:41:42 -08:00
d03a76c848
Merge pull request #11091 from chenhanxiao/See-also-login-start
...
docs: add See Also for description of login/logout and start/stop
Upstream-commit: 5929f401fcf5433ef0f2df960191cc44bf859618
Component: engine
2015-03-03 14:49:59 -08:00
f058d0499c
Merge pull request #11140 from SvenDowideit/correct-notes-markup
...
Notes should be indented
Upstream-commit: b47ab8cfa3191fbbb85aae0c53dc1de207e2c929
Component: engine
2015-03-03 14:16:56 -08:00
72dd46b2de
Notes should be indented
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 93c82360a6b530ef86769ee04e027f6159dc55da
Component: engine
2015-03-03 13:58:35 -08:00
d146803485
Merge pull request #11121 from shishir-a412ed/docker_help_issue
...
Fix: docker -d -h start daemon instead of showing help menu
Upstream-commit: 8e107a93210c54f22ec1354d969c771b1abfbe05
Component: engine
2015-03-02 15:40:27 -08:00
cbc491abc7
Fix: docker -d -h start daemon instead of showing help menu
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 0ab28c658952267af8e86a5b1055dd4b9cf0ec51
Component: engine
2015-03-02 17:01:56 -05:00
2d25573473
Merge pull request #11106 from MabinGo/fix_log_info
...
Fix some revision about log output
Upstream-commit: 32ccde46dde5130adcfb170c846c8f0317761aee
Component: engine
2015-03-02 13:55:43 -08:00
a0531c5103
Merge pull request #11005 from ahmetalpbalkan/win-cli/RegistryV2-skip
...
integ-cli: skip tests launching registry-v2
Upstream-commit: f92213af882761a739fa0d8408e180e437b1a380
Component: engine
2015-03-02 12:41:21 -08:00
7023b06ad1
Merge pull request #10971 from Microsoft/10662-api_server_factor_out_windows
...
api\server: Factored out UnixHttp on Windows, supported on Linux only.
Upstream-commit: c5ecdfd878d67d0595561a04e4945f60893f8c6f
Component: engine
2015-03-02 12:40:20 -08:00
b2afcdf656
Merge pull request #11006 from ahmetalpbalkan/win-cli/TestCommitChange-fix
...
integ-cli: fix TestCommitChange for pulled busybox
Upstream-commit: bedf3f8f201a06a1d0e9add103da2138a375ae97
Component: engine
2015-03-02 12:39:34 -08:00
6a658a3da6
Merge pull request #11111 from zenlinTechnofreak/zlFixDriverNote
...
fix err in note at daemon/networkdriver/bridge/driver.go
Upstream-commit: 377e62aa027337cf360f22cbf54fdec87743776f
Component: engine
2015-03-02 12:31:37 -08:00
c6435e1b51
Merge pull request #10986 from crosbymichael/create-api-type
...
Create api types package for structured responses
Upstream-commit: 2bfa701f45b55fbfd7e5d5a1d6fa45a8d84cd19a
Component: engine
2015-03-02 12:22:02 -08:00
d23101e569
Merge pull request #11055 from MabinGo/checkfileoper2
...
when the file that was opened has been read into buffer, the file should be closed
Upstream-commit: 1500503b29d97257cf8c1789fc320e2409d9b394
Component: engine
2015-03-02 12:18:14 -08:00
d0e86ebf79
Merge pull request #11054 from MabinGo/checkfileoper1
...
Add the file close operation before function return to advoid resource leaking
Upstream-commit: 82aa950f4e10dbd45b16ecfc144f8d4b450ad1ff
Component: engine
2015-03-02 10:44:26 -08:00
aeb9a73d60
Merge pull request #11083 from MabinGo/minor_typo
...
Modify the minor typo in deviceset.go
Upstream-commit: 738bdec4908755761b27b7d15baeefb1a824f770
Component: engine
2015-03-02 13:11:14 -05:00
dcdf67a6ec
Merge pull request #11112 from tianon/bashrc-for-tibor-♥
...
Add support for an optional ".bashrc" file
Upstream-commit: 360adc707b6ec2023178ed95befeb5514e530ca3
Component: engine
2015-03-02 13:02:39 -05:00
0a09f8ffe0
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 >
Upstream-commit: c62230a879e0461c43a4fc7d2e2e2efdd466fedd
Component: engine
2015-03-02 10:33:26 -07:00
8ce83c8f78
fix err in note at daemon/networkdriver/bridge/driver.go
...
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com >
Upstream-commit: e5bc50b5cd5237e820f5a708d0c351581905f1e2
Component: engine
2015-03-03 00:52:53 +08:00
8ccc0c87e2
Merge pull request #11003 from brahmaroutu/rename_10996
...
Prefix / is ignored when container is renamed
Upstream-commit: 89db94ecf904bf09dbf80ca879a2b759443e2392
Component: engine
2015-03-02 09:48:07 -05:00
b8344b4ef2
Merge pull request #11060 from dmitrygusev/docs-improvements
...
Docs improvements typo fixes and consistency
Upstream-commit: 6bbf5c3e99d9943d6526a415de0875c441266eff
Component: engine
2015-03-02 06:46:17 -08:00
ae2cbed644
Merge pull request #11073 from zenlinTechnofreak/zenlinlogerrfix
...
To avoid the confusing in log, change '%s' to '%q', change the question ...
Upstream-commit: a3dc3bb758a40562f34659846b18243c72e94caa
Component: engine
2015-03-02 09:30:59 -05:00
69f4fa385f
Merge pull request #11096 from MabinGo/fix_comments_typo
...
fix wrong description and typo in daemon/graphdriver/devmapper/deviceset.go
Upstream-commit: 5c2a602b4e227ed617d0494bdaeb2e191a6b9fca
Component: engine
2015-03-02 08:55:51 -05:00
87e987a3ef
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 >
Upstream-commit: 08ea03ccb9c6c671b465572e4a5c9a5d1da1fda0
Component: engine
2015-03-02 19:14:22 +08:00
4a59461365
Fix some revision about log output
...
Signed-off-by: Mabin <bin.ma@huawei.com >
Upstream-commit: adfd1ddfc6e094295d07ff2b36fb6e91cf7878dd
Component: engine
2015-03-02 17:06:38 +08:00
f3df541809
fix typo of comments in daemon/graphdriver/devmapper/deviceset.go
...
Signed-off-by: Mabin <bin.ma@huawei.com >
Upstream-commit: f4ac86de84c25bf1793d1e934695b7119dc51b70
Component: engine
2015-03-02 02:11:15 +08:00
d411e5860d
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 >
Upstream-commit: 41dc0e08d3f77b334670cc2ff3fb1a0c16fd9300
Component: engine
2015-03-01 01:36:00 -05:00
72bb80ff64
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.
Upstream-commit: a61716e5d93796ebc29b16942d5f27d387e56fba
Component: engine
2015-02-28 16:05:47 -08:00
b10d9ac0eb
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 >
Upstream-commit: 1d4b2524ec080a19f47292020a7fb6a9a00c8932
Component: engine
2015-02-28 22:13:03 +01:00
6082afbea4
Merge pull request #11075 from coolljt0725/fix_minor_typo
...
Fix a minor typo in daemon/container.go
Upstream-commit: 1dddf8a9a6dcdca036a9e264831345516e88745e
Component: engine
2015-02-28 09:24:28 -05:00
1f225ba7bc
Fix a minor typo in daemon/container.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 40dc18e2fa3724c5c4361f42a413c754ee03a492
Component: engine
2015-02-28 18:43:28 +08:00
5e225bf426
Modify the minor typo in deviceset.go
...
Signed-off-by: Mabin <bin.ma@huawei.com >
Upstream-commit: 5c1559a754f7b1fba45be01a6f1a4b3c7c6c4c68
Component: engine
2015-02-28 18:04:10 +08:00
874029c008
Merge pull request #11070 from jfrazelle/fix-racyevents-test
...
fix racy events test
Upstream-commit: b52a2cfdf1aabf15a4a1a630b3899ae373516517
Component: engine
2015-02-27 14:50:17 -08:00
15ea5ae8fb
fix racy events test
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 202709d178a24bcbfac223f0bcd9c4eda669e928
Component: engine
2015-02-27 14:48:39 -08:00
2b1fd26fbf
Prefix / to the container name is ignored when container is renamed
...
Closes #10996
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: caaae78247d9ceecba07da381401c2376b478c2b
Component: engine
2015-02-27 22:40:04 +00:00
4020847acb
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 >
Upstream-commit: 39b3690ba1801b36c1f43fa220ae5128958a0739
Component: engine
2015-02-27 23:18:32 +03:00
7595c1bf94
Merge pull request #10998 from jfrazelle/fix-filter-events-test-better
...
Fix events test so it doesnt need new daemon
Upstream-commit: 2768ce0e4e773d0a0331c6294f31fd9ff9450062
Component: engine
2015-02-27 12:05:48 -08:00
030e1d866f
Merge pull request #11037 from coolljt0725/add_parse_mac
...
Add validate the input mac address on docker run command
Upstream-commit: 314a678da7f948548a7f5aae886b3089ce4a7c9b
Component: engine
2015-02-27 12:03:25 -08:00
80fc2cf3da
Merge pull request #11011 from coolljt0725/fix_rmi_conflict
...
Fix docker remove an image show misleading conflicts
Upstream-commit: 13030add69ca84a853c036ac139f3325afc1b0e0
Component: engine
2015-02-27 12:00:12 -08:00
ec994adca7
Merge pull request #11002 from ahmetalpbalkan/win-cli/dockerfile-path-fix
...
Support windows style dockerfile paths for build cmd
Upstream-commit: 1061c56a5fc126a76344ea9dca9aa5f5e75eb902
Component: engine
2015-02-27 11:57:19 -08:00
0fd505f748
Add the file close operation before function return to advoid resource leaking
...
Signed-off-by: Mabin <bin.ma@huawei.com >
Upstream-commit: b5eeab6e061d183be050143426dd7fd774c89a20
Component: engine
2015-02-28 00:24:41 +08:00
b540023f69
Add validate the input mac address on docker run command
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2ba0fbb0ae1701b638a4bb956187dd878385dc80
Component: engine
2015-02-27 07:27:12 -08:00
b67ac7ee80
when the file that was opened has been read into buffer, the file should be close.
...
Signed-off-by: Mabin <bin.ma@huawei.com >
Upstream-commit: d5ea4bae4a15cc9f3c16c046389737682277ff0f
Component: engine
2015-02-27 19:09:17 +08:00
8ee526a485
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 >
Upstream-commit: c1b7792186c2408817e5027fdc1c2e4fa355dcf4
Component: engine
2015-02-26 20:08:16 -08:00
2d06b1cf02
Merge pull request #11017 from brahmaroutu/random_10962
...
moving random.go from utils
Upstream-commit: f5850e8e30b9420d26bd12136d8bbb6669d1e2bb
Component: engine
2015-02-26 21:35:42 -05:00
91a8e60aaa
Merge pull request #11013 from delftswa2014/10965-timeout
...
Move TimeoutConn to seperate pkg dir.
Upstream-commit: fe554589c0456c32d370615796c4fde4ecc23080
Component: engine
2015-02-26 17:40:42 -08:00
b74aa8d071
Merge pull request #11029 from brahmaroutu/fixtest_10963
...
When --net=none enabled, the test uses local filesystem
Upstream-commit: bcbe70588d1ff3ff28d78d56e221ff1efb7bbc47
Component: engine
2015-02-26 17:30:02 -08:00
5bd9f0f7c0
Merge pull request #10902 from estesp/10855-fix-add-host-doc
...
Correct --add-host documentation regarding host IP address retrieval
Upstream-commit: 94553f1ba6bd9f26059fc909586fd95230676432
Component: engine
2015-02-26 17:25:01 -08:00
af49ab2e01
Add reference to docker-reg-client
...
Update the "Docker Remote API Client Libraries" documentation page to
include a reference to the Go-based docker-reg-client package.
Signed-off-by: Brian DeHamer <brian@dehamer.com >
Upstream-commit: 48354301659d870bd23e643c6e916a5a652ae93c
Component: engine
2015-02-26 13:03:39 -08:00
bf718cd3ba
Merge pull request #11044 from moxiegirl/fix-image-11043
...
Rep README Fixing broken logo image
Upstream-commit: ac2521b87cfb9670bd3bfbf1a1ef8d8075e63737
Component: engine
2015-02-26 13:03:14 -08:00
