Michael Crosby
d1f18786ac
Merge pull request #10263 from hqhq/hq_check_memoryswap
...
add check for memoryswap
2015-02-06 13:43:23 -08:00
Tibor Vass
9491cec224
Merge pull request #10602 from ahmetalpbalkan/dev/ahmetb-homedir-fix
...
Extract $HOME usages into utils.GetHomeDir() (reopen #10358 )
2015-02-06 16:27:59 -05:00
Tibor Vass
82191cc3f3
Merge pull request #10120 from duglin/TrimSpaces
...
Remove leading/trailing spaces in builder/parser
2015-02-06 16:25:37 -05:00
Tibor Vass
4f18fc0bd2
Merge pull request #10572 from duglin/DynamicHelpTest
...
Make checking of help text smarter
2015-02-06 16:18:49 -05:00
Doug Davis
969ba5c7ed
Make checking of help text smarter
...
As I was reworking https://github.com/docker/docker/pull/9402 I realized
that the new testcase I just added that verified all help text is within
80 characters really should be smarter and ask "docker help" for the list
of commands to check instead of having a hard-coded list. This way
it will catch "docker execwait" automagically once #9402 is merged.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-02-06 13:02:58 -08:00
Ahmet Alp Balkan
f9ae2d4fd4
Export $HOME lookup to pkg/homedir
...
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com >
2015-02-06 11:42:45 -08:00
Doug Davis
3859c48531
Remove leading/trailing spaces in builder/parser
...
Per Erikh's suggestion at:
https://github.com/docker/docker/pull/9989#issuecomment-69832009
this PR will trim spaces in the parser to ensure that the user gets the same
results irrespetive of leading/trailing spaces.
Per @tiborvass's suggestion I added a test to make sure spaces in quotes
are not touched.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-02-06 08:52:18 -08:00
Sven Dowideit
6081a3ca90
Merge pull request #10523 from SvenDowideit/hide-more-old-docker-api-docs
...
The reference menu is too big to list more than the latest API docs, so ...
2015-02-06 19:26:01 +10:00
Fred Lifton
68b0ed54cb
Merge pull request #10574 from SvenDowideit/docker-stats-limited-to-libcontainer
...
For now, docker stats appears to be libcontainer only
2015-02-05 17:52:36 -08:00
Ahmet Alp Balkan
6ffb77afd4
Extract $HOME usages into utils.GetHomeDir()
...
Refactored getHomeDir in docker/docker to GetHomeDir in utils
pkg. Currently covers all use cases on the client-side.
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com >
2015-02-05 16:13:51 -08:00
James Turnbull
eda9c14cb9
Merge pull request #10560 from MihaiB/docs-typo
...
docs: fix typo
2015-02-06 00:42:45 +01:00
Jessie Frazelle
1c8beeb07a
Merge pull request #10552 from albers/bash-completion
...
Complete signals in bash completion for docker kill
2015-02-05 15:35:03 -08:00
Harald Albers
532513153f
Bash completion for docker kill
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-02-05 09:42:33 +01:00
James Turnbull
abdfb21e3a
Merge pull request #10521 from SvenDowideit/docs-not-ready-yet
...
remove swarm, machine and compose from the 1.5.0 release docs
2015-02-05 03:42:14 +01:00
Fred Lifton
e13a0de7aa
Merge pull request #10575 from SvenDowideit/elide-dhe-docs
...
The DHE documentation will not be published with 1.5.0
2015-02-04 18:16:42 -08:00
Fred Lifton
6dd2364dc2
Merge pull request #10576 from SvenDowideit/devicemapper-spelling-fix
...
Fix a small spelling error in the dm.blkdiscard docs
2015-02-04 17:42:31 -08:00
Fred Lifton
e19f2c0e52
Merge pull request #10506 from SvenDowideit/v1.5.0-release-notes
...
Add an initial list of new features in Docker Engine 1.5.0
2015-02-04 17:22:11 -08:00
Qiang Huang
0c0f0d5ab4
update docs for memory and memoryswap
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-02-05 09:12:56 +08:00
Qiang Huang
72f356be6a
add check for memoryswap when create
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-02-05 09:05:27 +08:00
Sven Dowideit
fcb975cfd1
Fix a small spelling error in the dm.blkdiscard docs
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-02-05 10:57:33 +10:00
Sven Dowideit
16a15ea581
Add an initial list of new features in Docker Engine 1.5.0
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-02-05 10:37:15 +10:00
Sven Dowideit
a7a9ce2635
remove swarm, machine and compose from the 1.5.0 release docs
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-02-05 10:30:57 +10:00
Sven Dowideit
9867dfa617
The DHE documentation will not be published with 1.5.0
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-02-05 10:26:53 +10:00
Sven Dowideit
1cc774b4fa
Merge pull request #10508 from SvenDowideit/ctrl-backslash-used-to-generate-a-stacktrace
...
Remove docker attach generates a stacktrace on ctrl-\ docs, as i can't trigger it
2015-02-05 10:21:00 +10:00
Sven Dowideit
2507e0b64f
For now, docker stats appears to be libcontainer only
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-02-05 10:12:05 +10:00
Alexander Morozov
fd1bdf2120
Merge pull request #10566 from jfrazelle/fix-overlay-unit-tests-for-btrfs
...
Fix for running unit tests on a 3.18 kernel with btrfs.
2015-02-04 15:41:06 -08:00
Alexander Morozov
7cc9858223
Merge pull request #10565 from jfrazelle/fix-range
...
Fix compilation on Go 1.3.3
2015-02-04 14:07:05 -08:00
Jessica Frazelle
c809fc552b
Fix for running unit tests on a 3.18 kernel with btrfs.
...
Was failing on overlay before and comparing the wrong error.
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
2015-02-04 13:51:44 -08:00
Jessica Frazelle
4855612aae
Fix compilation on Go 1.3.3
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
2015-02-04 13:35:20 -08:00
Jessie Frazelle
5a5726c5e4
Merge pull request #10526 from allingeek/runconfig-user-detail
...
CLEANUP: Amend run help for --user to include GID
2015-02-04 13:23:55 -08:00
Mihai Borobocea
48ee443eca
docs: fix typo
...
There are 2 not 3 RUN instructions in the userguide's Dockerfile.
Signed-off-by: Mihai Borobocea <MihaiBorobocea@gmail.com >
2015-02-04 23:15:18 +02:00
Jeff Nickoloff
46d4e491c8
Amend run help for --user to include GUID
...
The -u/--user flag optionaly takes a group/gui. This change documents this behavior and specifies the complete format of the value.
Signed-off-by: Jeff Nickoloff <jeff@allingeek.com >
Added a missed semi-colon for consistency with other messages.
Signed-off-by: Jeff Nickoloff <jeff@allingeek.com >
2015-02-04 21:27:02 +01:00
Jessie Frazelle
a271eaeba2
Merge pull request #10547 from duglin/Issue10214
...
Pretty the help text
2015-02-04 11:31:18 -08:00
Fred Lifton
8a91926cd9
Merge pull request #10522 from SvenDowideit/fix-swarm-links
...
use the same paths as in the swarm repo, so that their links magically w...
2015-02-04 10:19:19 -08:00
Fred Lifton
a1ce6c7d44
Merge pull request #10542 from SvenDowideit/ets-spelling-in-userguide
...
Spelling mistake in dockerlinks
2015-02-04 10:17:52 -08:00
Arnaud Porterie
23196cdebb
Merge pull request #10539 from dmcgowan/v2-registry-revert-push
...
Revert push to v2 official registry
2015-02-04 10:01:26 -08:00
Derek McGowan
88fdcfef02
Limit push and pull to v2 official registry
...
No longer push to the official v2 registry when it is available. This allows pulling images from the v2 registry without defaulting push. Only pull official images from the v2 official registry.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-02-04 09:21:36 -08:00
Doug Davis
2203b37733
Pretty the help text
...
This modifies the "docker help" text so that it is no wider than 80 chars
and each description fits on one line. This will also try to use ~ when
possible
Added a test to make sure we don't go over 80 chars again.
Added a test to make sure we use ~
Applied rules/tests to all docker commands - not just main help text
Closes #10214
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-02-04 07:59:16 -08:00
Alexander Morozov
bdbdbcc945
Merge pull request #10544 from chenhanxiao/comment-typo
...
fix comments typos
2015-02-03 20:09:05 -08:00
Chen Hanxiao
ef3192f161
fix comments typos
...
s/propogated/propagated
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
2015-02-04 10:47:37 +08:00
Sven Dowideit
ea6db8af18
Spelling mistake in dockerlinks
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-02-04 12:12:46 +10:00
Fred Lifton
165ea5c158
Merge pull request #10507 from jbruni/patch-1
...
Remove File List
2015-02-03 17:33:15 -08:00
Michael Crosby
31c6419e58
Merge pull request #10538 from vieux/update_MAINTAINERS
...
update MAINTAINERS file
2015-02-03 17:12:05 -08:00
Tibor Vass
944f76d444
Merge pull request #10484 from thaJeztah/fix-contributing-link
...
Fix broken link to project/MAINTAINERS.md
2015-02-03 19:20:55 -05:00
Victor Vieux
2e9c498e34
add crosbymichael and Github -> GitHub
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-02-03 23:04:37 +00:00
Arnaud Porterie
c98007f9d2
Merge pull request #10477 from liusdu/liusdu_typo
...
delete duplicated word in registry/session.go
2015-02-03 14:38:47 -08:00
Jessie Frazelle
0018afebb8
Merge pull request #10480 from yihangho/docstypo
...
Fix a tiny typo.
2015-02-03 14:37:35 -08:00
Jessie Frazelle
71368c520e
Merge pull request #10483 from Thell/master
...
Update dockerfile_best-practices.md
2015-02-03 14:36:24 -08:00
Victor Vieux
8475795f76
update MAINTAINERS file
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-02-03 19:50:46 +00:00
Doug Davis
989ca9b357
Merge pull request #10524 from icecrime/10513_carry_failed_tests
...
Ensure Dockerfile in context
2015-02-03 12:05:43 -05:00