1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Evan Hazlett
f0c70ee8ed ec2: do not try to auth swarm port if exists
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-02 13:14:41 -05: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
Evan Hazlett
c3878a9285 Merge pull request #664 from ehazlett/ec2-fix-subnet-check
ec2: check subnet exists in vpc
2015-03-02 13:06:35 -05:00
Evan Hazlett
4cf7caa1e0 Merge pull request #674 from frapposelli/vsphere-driver-fixes
vSphere driver fixes
2015-03-02 13:06:12 -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
Harald Albers
ac7a97f420 Add -f flag to bash completion for docker-compose rm
Signed-off-by: Harald Albers <github@albersweb.de>
2015-03-02 18:33:34 +01: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
Evan Hazlett
dca385690d Merge pull request #668 from ehazlett/support-fish-in-env
show fish usage upon create
2015-03-02 12:20:22 -05:00
David Lawrence
6f1b92621c Adding test cases to confirm path traversal attempts are mitigated and
bad characters in URI return 404
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2015-03-02 09:15:49 -08: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
Aanand Prasad
d5fcb0de67 Merge pull request #970 from dnephin/fix_environment_as_list_bug
Fix merging command line environment with config environment
2015-03-02 15:28:05 +00:00
Daniel Nephin
f47431d591 Resolves #927 - fix merging command line environment with a list in the config
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-03-02 10:23:43 -05:00
Jeffrey Morgan
04239a39d4 Better errors 2015-03-02 10:10:53 -05: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
Aanand Prasad
8610adcaf3 Merge pull request #997 from abesto/use-latest-docker-py
Use docker-py 1.0.0
2015-03-02 14:15:18 +00: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
Zoltan Nagy
8f38b28816 Use docker-py 1.0.0
Signed-off-by: Zoltan Nagy <abesto@abesto.net>
2015-03-02 13:11:02 +01:00
Aanand Prasad
db3b4731cd Merge pull request #1044 from usrenmae/py3-compat
Move several steps closer to python3 compatibility
2015-03-02 12:08:39 +00:00
Aanand Prasad
30b7c22c71 Merge pull request #1043 from alunduil/add-bashcomp-to-sdist
add bash completion to sdist
2015-03-02 12:05:09 +00:00
Aanand Prasad
f89f9e3190 Merge pull request #1007 from KingsleyKelly/force
Add -f flag as option on rm.
2015-03-02 11:26:28 +00: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
Jeffrey Morgan
5b8be73288 Bump version 2015-03-02 00:59:45 -05:00
Jeffrey Morgan
bacd5793cb Remove print 2015-03-02 00:59:10 -05:00
Jeffrey Morgan
1802f72564 Better setup debugging 2015-03-02 00:57:02 -05:00
Jeffrey Morgan
3396ed1b8f Fix retry 2015-03-01 18:55:37 -05:00
Jeffrey Morgan
6fd6113502 Allow only downloading one container at a time
Due to docker engine bug
2015-03-01 18:26:17 -05:00
Jeffrey Morgan
7f735990d7 Fix check 2015-03-01 17:40:19 -05:00
Jeffrey Morgan
187e214dc7 Fix status check 2015-03-01 17:31:45 -05:00
Jeffrey Morgan
6ec1ccb851 Merge pull request #206 from kitematic/setup-hardening
0.5.3 setup stability, errors & retrying
2015-03-01 17:18:48 -05:00
Jeffrey Morgan
71d168a7cf Update tests 2015-03-01 17:11:55 -05:00
Jeffrey Morgan
9b32a6a680 0.5.3 setup stability, errors & retrying 2015-03-01 17:08:46 -05: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
Fabio Rapposelli
28fff16745 Driver rework to use upcoming boot2docker/boot2docker#747 patch:
- Aligned VMX template to Fusion (vmxnet3, pvscsi)
- Bundle ssh keys in a tar and upload it through vmtools
- Power operations moved to graceful shutdown and restart

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-03-01 17:46:30 +01: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
Jeffrey Morgan
bf0abc1d2c Fix dupe events 2015-02-28 23:06:09 -05:00
Jeffrey Morgan
4795e323e2 Fix fail event 2015-02-28 23:04:52 -05:00
Jeffrey Morgan
a19b59f69b Fix setup failed event 2015-02-28 22:56:40 -05:00
Jeffrey Morgan
01fd1eedc2 Fixing metric 2015-02-28 21:45:39 -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
Victor Vieux
f8db6a6e67 Merge pull request #434 from mattva01/patch-1
Corrected typos in swarm scheduler docs
2015-02-28 15:27:55 -08:00
Igor Ch
f1fc1d7a16 Move several steps closer to python3 compatibility
Signed-off-by: Igor Ch <usrenmae@gmail.com>
2015-02-28 23:26:20 +02:00
Alex Brandt
0e30d0085b add bash completion to sdist
When installing from the source distribution (for packaging or other
purposes), it's convenient to be able to install the bash completion
file as part of that process.
2015-02-28 15:18:29 -06: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
Jeffrey Morgan
3a8b7ba3c4 Save size to file instead 2015-02-28 13:07:11 -05:00
Jeffrey Morgan
1ce936578b Updating Icons 2015-02-28 11:18:22 -05: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