Commit Graph

12370 Commits

Author SHA1 Message Date
fa232dc1ae Exit with non-zero code on first argument parsing error
Ignoring return value of ParseFlags leads to exit code 0 if bad
arguments are supplied. This patch makes sure that subcommands exit
with non-zero code in such a case.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 8a785792cd3c3fb4494bced475263aef5fa4534b
Component: engine
2015-01-06 13:46:38 +01:00
7a4065fe5d Fixed error reporting
Removed redundant print line and fixed handling of command-less docker
invocation.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 08f0f1ee1db2dea79e622764891cb8b1432bcab1
Component: engine
2015-01-06 13:44:27 +01:00
319270793a Handle bad options better
* Do not log bad options error message twice, e.g.:

    $ docker run --pouet
    flag provided but not defined: --pouet
    See 'docker run --help'.
    2014/11/05 21:41:23 flag provided but not defined: --pouet

  With this patch just the first two lines will be produced.

* Print 'docker' just once when run without a command, e.g.:

    $ docker --hel
    flag provided but not defined: --hel
    See 'docker docker --help'.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 1d09fc22ca14b0b83bdc81cba06d3d7ac886a3e6
Component: engine
2015-01-06 13:44:27 +01:00
639170852f refactor redundant code around calls to cmd.Parse
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 41be2f73c7ce2cbb5450ee8bb35bf7235125ca63
Component: engine
2015-01-06 13:41:16 +01:00
bb1bfae794 Remove TestUsage, since Usage will no longer be shown on failure to parse
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 4dc962d09a05b5422c692f4762a32c24cb506e6b
Component: engine
2015-01-06 13:40:14 +01:00
f82eddabc6 --help option and help command should print to stdout not stderr
--help and help are successful commands so output should not go to error.

    QE teams have requested this change, also users doing docker help | less
    or docker run --help | less would expect this to work.

    Usage statement should only be printed when the user asks for it.
    Errors should print error message and then suggest the docker COMMAND --help
    command to see usage information.

    The current behaviour causes the user to have to search for the error message
    and sometimes scrolls right off the screen.  For example a error on a
    "docker run" command is very difficult to diagnose.

    Finally erros should always exit with a non 0 exit code, if the user
    makes a CLI error.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: a2b529ead21e6ab9eafcb1b1d2437c725c43a06a
Component: engine
2015-01-06 13:40:14 +01:00
4e9cb36803 Merge pull request #9855 from ewindisch/sec-doc
Improve security doc
Upstream-commit: 1510a324dbd51f3e65ac6ad8ed1bc2e625f2c827
Component: engine
2015-01-06 15:35:30 +10:00
0a26c45c0c Merge pull request #9884 from flowlo/patch-1
doc: Standardise JSON examples
Upstream-commit: ceedaceb5c0065a6fff8c859f07753dc71637c41
Component: engine
2015-01-06 15:32:04 +10:00
5c16882688 Merge pull request #9907 from duglin/dug4Builder
Modify MAINTAINERS per erikh's suggestion
Upstream-commit: d7b6f186880e183dcbba1ab15395140d0c43442f
Component: engine
2015-01-05 17:38:58 -08:00
9e611bf1d0 Merge pull request #9914 from jfrazelle/drone-py
Add docker-py tests to drone.
Upstream-commit: f0d7616c2700ee863285879077950ce965afd9ef
Component: engine
2015-01-05 17:37:25 -08:00
2e0e2c1f43 Merge pull request #9830 from pnasrat/release-include-announce-list
Update release checklist to include announce mail.
Upstream-commit: 61f873792bf9f572d20be0ad8f54e88e1fb8f98e
Component: engine
2015-01-05 16:46:28 -08:00
e5f832ab99 Merge pull request #9721 from SvenDowideit/add-cloudfront-invalidation-to-docs
Add docs Cloudfront cache invalidation
Upstream-commit: 4235e2796ba19e50d6261489e817b8422ba43df0
Component: engine
2015-01-05 16:25:20 -08:00
ed439bd06a Merge pull request #8961 from mmdriley/allow-hyphens-in-namespaces
Allow hyphens in namespaces.
Upstream-commit: ef1dee700cd3142b8fad6dc33553a6633e0b9546
Component: engine
2015-01-05 16:23:36 -08:00
c2faacfe43 Merge pull request #9910 from crosbymichael/update-readme-fred
Minor copy edits and updates to README
Upstream-commit: fcc4ba5ec834396670db93808b4e4ebfd014f667
Component: engine
2015-01-05 15:46:58 -08:00
f4febcdfe1 Add docker-py tests to drone.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: a1bfe3aa420d458cb84be1770202fe1b3f546ebe
Component: engine
2015-01-05 15:00:32 -08:00
bb2e382254 Merge pull request #9097 from brahmaroutu/publish_ports_8899
add ability to publish range of ports
Upstream-commit: 25f8c2664066a523f3f59f4cc5cdc8cf81c8a7c8
Component: engine
2015-01-05 14:05:47 -08:00
47870ad057 Merge pull request #9908 from crosbymichael/warning-graphdriver
Add warning log when high priority graphdriver used before
Upstream-commit: e404113afc4877acc7f6501a86399799e7f668ef
Component: engine
2015-01-05 12:06:28 -08:00
54f1facfb0 Merge pull request #9909 from carmi/master
Update syntax/vim README with Vundle instructions
Upstream-commit: 356b035c4b76ef38cd8f1ac8abcc8d2ba49b3986
Component: engine
2015-01-05 11:31:43 -08:00
92fc6f5561 Merge pull request #9899 from gdi2290/patch-1
Update License year to range 2013-2015
Upstream-commit: 579b6e32698856882aeeb581e968057c28c9888b
Component: engine
2015-01-05 11:31:12 -08:00
95a318c9d1 Merge pull request #9911 from jfrazelle/change-test-to-dockerproject.com
Change url of robots.txt test to dockerproject.com
Upstream-commit: 1d4d8bc0c00625d45e15f56ac11258b49be44acc
Component: engine
2015-01-05 11:30:53 -08:00
1c38530502 Change url of robots.txt test to dockerproject.com
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 367e66e9721c33a64ab091bd5430ab4a9af12083
Component: engine
2015-01-05 11:13:37 -08:00
bdbc984c7d Update syntax/vim README with Vundle instructions
Signed-off-by: Evan Carmi <evan@ecarmi.org>
Upstream-commit: 8d1485bd3f1c1c8c94b8673ba818ed374fe10022
Component: engine
2015-01-05 11:08:22 -08:00
521cb78a14 Allow hyphens in namespaces.
Signed-off-by: Matthew Riley <mattdr@google.com>
Upstream-commit: 6c126d443b3ee3bbb6d0a437a1b5c51cbf9e47f2
Component: engine
2015-01-05 11:06:16 -08:00
bd3b01f325 Revises link to point to Fig
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 5ad41ce01a3489d2a09d86cd8a8bdf847bf70cf9
Component: engine
2015-01-05 11:03:25 -08:00
cc386bdaad Minor copy edits and updates to README. Added CTA for keeping the projects list current.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 99a5da5ada7facc79336b3e0cc62f36c5bfa0620
Component: engine
2015-01-05 11:03:17 -08:00
640802f7d4 Remove error return from check graph driver func
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 3011aa4e9984b0631b67f640a191677e2f3d0a8f
Component: engine
2015-01-05 10:34:49 -08:00
14afaafc58 Modify MAINTAINERS per erikh's suggestion
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 04ee071692c320ac9dd8e66475c02c6ec3166251
Component: engine
2015-01-05 10:28:36 -08:00
6fb1c496e0 Merge pull request #9886 from crquan/patch-1
need to call syscall.Unmount with MNT_DETACH
Upstream-commit: 53253ee1fbd3239d9f2efd5d7f0c40dd4c58ced3
Component: engine
2015-01-05 13:17:11 -05:00
6de950b201 Merge pull request #9877 from fredlf/readme-fig-link
Corrects link to point to Fig
Upstream-commit: 0787878e64ce8633e8616ce8edc860747c143663
Component: engine
2015-01-05 07:04:47 -05:00
001c1d8220 doc: Broaden JSON standardisation by patching
This is:

    git format-patch -1 --stdout HEAD \
    | patch -p1 docs/sources/reference/api/docker_remote_api_v1.*.md

Applying the changes I initially made on the docs for v1.15 to all
other versions led to acceptable results.

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: 975f5b0c281fe579336fc0ffeb49ac0907465a5a
Component: engine
2015-01-05 11:45:10 +01:00
8ea0bac467 Update License year to range 2013-2015
Copyright notices must reflect the current year. This commit updates the listed year to 2015 with a starting year of 2013 from
a27b4b8cb8

Docker-DCO-1.1-Signed-off-by: Patrick Stapleton <github@gdi2290.com> (github: gdi2290)
Upstream-commit: e3c5e0ceb0e83c393472ed2e2f12ca754d47e6b3
Component: engine
2015-01-04 16:59:34 -08:00
fb6c082460 change to lazy Unmount
syscall.Unmount failed sometimes when user interrupted exporting,
for example a Ctrl-C, or pipe to commands which closed the pipe early,
like "docker export <container_name> | file -"; this syscall.Unmount
could sometimes return EBUSY and didn't actually umount the filesystem;
which would cause a following export command fail to mount;
change to lazy Unmount with MNT_DETACH can fix the problem, this is
the same behavior as in Shutdown;

```text
time="2015-01-03T21:27:26Z" level=error msg="Warning: error unmounting device
34a3e77cdbca17ceffd0636aee0415bb412996adb12360bfe2585ce30467fa8e: device or resource busy"
```

```
$ docker export thirsty_ardinghelli | file -
/dev/stdin: POSIX tar archive
time="2015-01-03T21:58:17Z" level=fatal msg="write /dev/stdout: broken pipe"
$ docker export thirsty_ardinghelli
time="2015-01-03T21:54:33Z" level=fatal msg="Error: thirsty_ardinghelli: Error getting container
34a3e77cdbca17ceffd0636aee0415bb412996adb12360bfe2585ce30467fa8e from driver devicemapper:
Error mounting '/dev/mapper/docker-253:0-3148372-34a3e77cdbca17ceffd0636aee0415bb412996adb12360bfe2585ce30467fa8e'
on '/var/lib/docker/devicemapper/mnt/34a3e77cdbca17ceffd0636aee0415bb412996adb12360bfe2585ce30467fa8e': device or resource busy"
```

Signed-off-by: Derek Che <drc@yahoo-inc.com>
Upstream-commit: 9bbed5ab4ceaff5e78c21f0fa2d84de5ffd41f94
Component: engine
2015-01-04 00:10:48 +00:00
6fa92d7495 Merge pull request #9020 from daehyeok/log_exec
Add exec event log
Upstream-commit: 7eb5262d1b0c7f9c46239f07cf664f8596ab860c
Component: engine
2015-01-03 10:40:00 -08:00
305f19e30d doc: Try to standardise JSON examples
Fixed:
 * Invalid JSON
 * Inconsistent spacing at colon

Expression for binary data streams (line 468 vs. 1474) remain inconsistent.
Could fix that too, if you like.

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: e583cc1eb47c29d7473f1dac7d4f39ddeb8ae1e6
Component: engine
2015-01-03 18:20:59 +01:00
f8347c4fc0 Add list of events in remote API docs
Add exec create and exec start to list of events in remote API docs

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Upstream-commit: fc7f0550965d06dd8dd31fb55c74fe02e9a436dc
Component: engine
2015-01-03 20:40:25 +09:00
4309ebf3d1 Add exec event create/start log
added exec event log follwing issue #8662 proposal.
logging events for exec create and start API

Signed-off-by: daehyeok mun <daehyeok@daehyeokui-MacBook-Air.local>
Upstream-commit: e3d813f37f48ed52330e3dc26aa363e58401fbf5
Component: engine
2015-01-03 20:38:25 +09:00
986d8f11d2 add ability to publish range of ports
Closes #8899
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 2338a9cf5a1ba5576b92e49065335a9c9251ade0
Component: engine
2015-01-02 23:21:26 +00:00
31fd760d18 Corrects link to point to Fig.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 4669d98bff6cde7a54cff702c7adbb723aab0687
Component: engine
2015-01-02 11:18:26 -08:00
1b9c51c581 Merge pull request #9863 from albers/bash-completion
Add options to bash completion and sort options
Upstream-commit: b2ab733c993ee6124c164defceac6996206d69fa
Component: engine
2015-01-01 09:49:29 -07:00
446bb69e57 Add warnning log when other graphdrvier(storage driver) used before
added warnning log when other graphdrvier(storage driver) used before for feature request #8270

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Upstream-commit: 3c03827e73647cad27a0656ce685c8aea8ed4d21
Component: engine
2015-01-02 00:01:26 +09:00
21017010a3 Sort options in bash completion alphabetically
This introduces a sort order for options:

Arrange options sorted alphabetically by long name with the short
options immediately following their corresponding long form.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 70161b4d45ec990a4e597e133092e389e168ad79
Component: engine
2015-01-01 11:21:42 +01:00
6e9adc8ae3 Add missing options to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 50eb14244d3139e8aa9141d8f7076043ffecbc6e
Component: engine
2015-01-01 11:21:42 +01:00
73d7861c36 Merge pull request #9848 from SvenDowideit/add-restart-policy-delay-docs
Document that there is a delay before the --restart policy restart, and ...
Upstream-commit: d7f72188ffe3cf98481292d780da463b7de05e58
Component: engine
2014-12-31 12:13:21 -08:00
7792c86d76 Merge pull request #9859 from NateEag/patch-1
Grammar fix and style tweak in docs/sources/faq.md
Upstream-commit: 529011cf416857af669cae3e5abdeb6b761ab6b7
Component: engine
2014-12-31 11:58:49 -08:00
87e9875e21 Merge pull request #9491 from SvenDowideit/note-that-volumes-in-b2d-are-special
Add a note to point out to new users that B2D bind-mounts are special-ish
Upstream-commit: 880aeab00df218322e246711578690c16312d2a4
Component: engine
2014-12-31 11:15:01 -08:00
5cab04f12d Merge pull request #9519 from SvenDowideit/1.4-volume-initialization-in-docker-create
Talk up the 1.4 change to initialise volumes at  time
Upstream-commit: 31471ea2fbfcbc4e08a7333d17075ff901b79f72
Component: engine
2014-12-31 11:59:14 -05:00
af0df9d992 Grammar fix and style tweak in docs/sources/faq.md
Just a few things I thought could be improved in the FAQ.

Signed-off-by: Nate Eagleson <nate@nateeag.com>
Upstream-commit: 4e679f218c5da33856df25069368b24e78d8bb85
Component: engine
2014-12-30 21:36:16 -05:00
3eed17c175 Improve security doc
Moves some information around, expanding information on
user namespaces, pull/load security, cap add/drop.

Also includes various grammar improvements and edits.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: e704dd31e79114a2156c4fdda3247a181ad6435d
Component: engine
2014-12-30 17:32:25 -05:00
9911b7b3cb Merge pull request #9843 from jfrazelle/add-jenkins
Add Jenkins Build Status
Upstream-commit: a444643f97e47de72723631f3e2d6ce495f88337
Component: engine
2014-12-30 09:32:32 -08:00
783229617c Merge pull request #9822 from tianon/01autoremove-kernels
Remove /etc/apt/apt.conf.d/01autoremove-kernels in mkimage/debootstrap
Upstream-commit: ed7a1fc8f25ff82aaafe043c864f64d606dd0a41
Component: engine
2014-12-30 09:32:04 -08:00