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
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
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
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
4835430165
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>
2015-02-26 13:03:39 -08:00
ac2521b87c
Merge pull request #11044 from moxiegirl/fix-image-11043
...
Rep README Fixing broken logo image
2015-02-26 13:03:14 -08:00
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
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
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
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
02639c03b7
Smaller image
...
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
2015-02-26 08:48:58 -08:00
2e567d22da
Fixing broken logo image
...
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
2015-02-26 08:45:59 -08:00
9324cdac07
Merge pull request #10831 from MalteJ/ipv6-ndp-proxy
...
Adding IPv6 NDP Proxying documentation
2015-02-26 07:19:36 -08:00
7a93d52ea4
Merge pull request #11039 from SvenDowideit/fix-missing-compose-docs
...
Missed to added doc files
2015-02-27 01:13:35 +10:00
7646e3f957
Missed to added doc files
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-27 01:10:50 +10:00
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
7e2328b76e
Merge pull request #10869 from SvenDowideit/extract-docs-base
...
Extract docs base
2015-02-25 23:16:46 -05:00
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
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
f8dbcdc599
Merge pull request #10940 from 1HLtd/master
...
docs/man/docker.1.md: spelling mistake fix
2015-02-25 20:45:46 -05:00
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
Tianon Gravi
Zen Lin(Zhinan Lin)
Phil Estes
moxiegirl
Mabin
Chen Hanxiao
Sebastiaan van Stijn
Doug Davis
Lei Jitang
Damjan Georgievski
Jessie Frazelle
Jessica Frazelle
Srini Brahmaroutu
Dmitry Gusev
Ahmet Alp Balkan
Brian DeHamer
Mary Anthony
Sven Dowideit
Sven Dowideit
Liu Hua
Tibor Vass
James Turnbull