centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 06:19:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,501 Commits 57 Branches 28 Tags
973c32c8a07bca01aa5889689f37b99694673490
Commit Graph

13501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass
973c32c8a0 Merge pull request #11147 from ahmetalpbalkan/archive_test_fix 
pkg/archive: rm invalid test case from achive_windows_test.go
 2015-03-04 09:51:36 -05:00
Tibor Vass
ffc738225d Merge pull request #11030 from jfrazelle/skip-lxc-remaining-tests 
Last three tests skip on lxc.
 2015-03-04 09:51:06 -05:00
Jessica Frazelle
321874f376 Last three tests skip on lxc. 
Now we can scale lxc tests to all PRs.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-04 06:04:25 -08:00
Jessie Frazelle
0f6704f961 Merge pull request #11077 from tianon/debootstrap-PATH 
Update debootstrap PATH+chroot handling
 2015-03-04 06:01:25 -08:00
Jessie Frazelle
ffc755ac14 Merge pull request #11134 from duglin/CheckMultiLineHelp 
Fix 'docker ps --help' so the options don't span more than one line
 2015-03-04 05:53:47 -08:00
Phil Estes
e2c79e2b30 Merge pull request #11155 from coolljt0725/add_xfs_magic 
Fix docker info show unknown backing filesystem when use xfs
 2015-03-04 07:59:23 -05:00
Jessie Frazelle
df7ba57f5f Merge pull request #9437 from cpuguy83/set_rlimits_in_container 
Allow setting ulimits for containers
 2015-03-04 04:00:17 -08:00
Jessie Frazelle
d64b009bc0 Merge pull request #11133 from zenlinTechnofreak/zenlinFormatBridgeDriver 
Just format some logs and notes in /daemon/networkdriver/bridge/driver.g...
 2015-03-04 03:57:29 -08:00
Jessie Frazelle
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
Jessie Frazelle
beea697be3 Merge pull request #10858 from duglin/10807-MixedcaseDockerfile 
Support dockerfile and Dockerfile
 2015-03-04 03:52:49 -08:00
Lei Jitang
dd56fa1906 Add xfs fs magic to graphdriver/driver.go 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-03-04 19:01:39 +08:00
moxiegirl
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
Ahmet Alp Balkan
baebff38d5 pkg/archive: rm invalid test case from achive_windows_test.go 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-03 18:42:52 -08:00
Doug Davis
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
Fred Lifton
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
Fred Lifton
b47ab8cfa3 Merge pull request #11140 from SvenDowideit/correct-notes-markup 
Notes should be indented
 2015-03-03 14:16:56 -08:00
Sven Dowideit
93c82360a6 Notes should be indented 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-03-03 13:58:35 -08:00
Doug Davis
5595da2bde Fix 'docker ps --help' so the options don't span more than one line 
and add a testcase to catch this in the future.

While in there I also:
- removed extra periods from the few options that had them (new test)
- made the --filter option consistent across all command

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-03 10:02:23 -08:00
Zen Lin(Zhinan Lin)
2c0e027ab9 Just format some logs and notes in /daemon/networkdriver/bridge/driver.go 
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
 2015-03-03 23:39:04 +08:00
Jessie Frazelle
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
Shishir Mahajan
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
Alexander Morozov
32ccde46dd Merge pull request #11106 from MabinGo/fix_log_info 
Fix some revision about log output
 2015-03-02 13:55:43 -08:00
Jessie Frazelle
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
Jessie Frazelle
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
Jessie Frazelle
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
moxiegirl
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
Jessie Frazelle
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
Jessie Frazelle
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
Jessie Frazelle
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
Phil Estes
738bdec490 Merge pull request #11083 from MabinGo/minor_typo 
Modify the minor typo in deviceset.go
 2015-03-02 13:11:14 -05:00
Tibor Vass
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
Tianon Gravi
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
Zen Lin(Zhinan Lin)
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
Phil Estes
89db94ecf9 Merge pull request #11003 from brahmaroutu/rename_10996 
Prefix / is ignored when container is renamed
 2015-03-02 09:48:07 -05:00
moxiegirl
6bbf5c3e99 Merge pull request #11060 from dmitrygusev/docs-improvements 
Docs improvements typo fixes and consistency
 2015-03-02 06:46:17 -08:00
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
adfd1ddfc6 Fix some revision about log output 
Signed-off-by: Mabin <bin.ma@huawei.com>
 2015-03-02 17:06:38 +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
Chen Hanxiao
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
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
Mabin
5c1559a754 Modify the minor typo in deviceset.go 
Signed-off-by: Mabin <bin.ma@huawei.com>
 2015-02-28 18:04:10 +08:00
Tianon Gravi
91770ec9e4 Adjust contrib/mkimage/debootstrap PATH handling to be more robust 
Instead of applying it only for the final `chroot`, this adds a chroot helper function to apply it appropriately for every chroot, including making sure that we find `chroot` in our current host `PATH` in case it's in a strange place.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-02-28 00:11:55 -07:00
Damjan Georgievski
a871327135 export a proper debian PATH for the chroot 
when running in the chroot, it would be expected to have a Debian-ish environment,
most important the PATH variable. Otherwise the host PATH would be used which can wrong
for Debian, especially if the host is Arch (which doesn't have /bin, /sbin or /usr/sbin).

Signed-off-by: Damjan Georgievski <gdamjan@gmail.com>
 2015-02-27 23:56:42 -07: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