873526f7b8
Update API docs to reflect correct values for /info
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: cc3bf34c787f4fdf067a459158f38f8413ec4e33
Component: engine
2015-01-06 15:35:45 -08:00
b060268a74
Merge pull request #8748 from duglin/Issue8330
...
Have .dockerignore support Dockerfile/.dockerignore
Upstream-commit: 6d780139c4b7960b482a5f4fbf043adb6673864b
Component: engine
2015-01-06 13:47:42 -08:00
e0d18f3201
Merge pull request #9829 from ashahab-altiscale/9812-lxc-custom-ip
...
LXC TEMPLATE ALLOWS IPV4 OVERRIDE
Upstream-commit: f51ee9fe8df6fe32fc70d265b456a688e1de8bfc
Component: engine
2015-01-06 13:25:09 -08:00
26492f1526
Merge pull request #9834 from jfrazelle/9820-overlay-btrfs
...
Add error when running overlay over btrfs.
Upstream-commit: 9d1caf4272ea0a28366989a67de56705cff70c40
Component: engine
2015-01-06 13:16:17 -08:00
2e77fe142f
Add error when running overlay over btrfs.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 32f1025b22d16872ead5ec2e3650bf76622fae99
Component: engine
2015-01-06 11:22:45 -08:00
1a4a1b2193
Have .dockerignore support Dockerfile/.dockerignore
...
If .dockerignore mentions either then the client will send them to the
daemon but the daemon will erase them after the Dockerfile has been parsed
to simulate them never being sent in the first place.
an events test kept failing for me so I tried to fix that too
Closes #8330
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 6d801a3caa54ad7ef574bc426aa1ffc412c5af82
Component: engine
2015-01-06 10:57:48 -08:00
985e3e60ac
Merge pull request #8941 from agonzalezro/log-duplicates
...
Log when truncindex.Get returns >1 container
Upstream-commit: 84dc197b087dc63280cdae50795a36434a84fa6f
Component: engine
2015-01-06 10:41:19 -08:00
88e8bbba28
Merge pull request #9883 from tianon/irc-administration
...
Add initial new IRC administration cheat sheet of sorts
Upstream-commit: fa8b0769f6daf614e599dc43c6c02ddccac18709
Component: engine
2015-01-06 10:29:49 -08:00
8e21317253
Merge pull request #9858 from jfrazelle/exec-buildtag
...
The comment for build in exec had a typo
Upstream-commit: a33f7a07d1ea21d2a6912d84877eb7fc9e1c2303
Component: engine
2015-01-06 10:26:21 -08:00
10fbd71b68
Merge pull request #9603 from hqhq/hq_add_memory_swap
...
add support to set MemorySwap
Upstream-commit: 748b7459b3268c014e781d93fa9b374fe742b811
Component: engine
2015-01-06 10:09:21 -08:00
bb5364c7fd
Add plus to build
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: f339d3bceb4634bba1bc27e455d0fd8505df17bf
Component: engine
2015-01-06 10:07:13 -08:00
1a0f6735e2
Merge pull request #9511 from cpuguy83/refactor_attach
...
Refactor daemon.attach()
Upstream-commit: 01412d336d71804645afaca991dd7450a33a4fb0
Component: engine
2015-01-06 09:57:49 -08:00
a47c2e06a0
Merge pull request #9927 from LK4D4/carry_of_9925
...
Fixed minor typo
Upstream-commit: 2389c295562fccfd598d27bd104ddf8a0fb97e3b
Component: engine
2015-01-06 09:54:03 -08:00
8a09cfa886
Fixed minor typo
...
Signed-off-by: Christian Stefanescu <st.chris@gmail.com >
Upstream-commit: 32ac770f753a6435cd83f957c1e5d73722d09974
Component: engine
2015-01-06 09:52:21 -08:00
1802007e16
Merge pull request #9920 from SvenDowideit/publish-all-maps-to-random-ports
...
Explicitly mention that '-P' maps to random ports
Upstream-commit: 0bc2222b3940a8d55c344b9fd03b7934d9d55d6b
Component: engine
2015-01-06 09:39:50 -08:00
9098ffb8d6
Merge pull request #9919 from HuKeping/work
...
restart: Fix an error about arguments missing
Upstream-commit: 1257c3817d85e93395f747d2ff7af9739193939d
Component: engine
2015-01-06 09:16:12 -08:00
8af6e1721d
Merge pull request #9085 from miminar/refactor-help
...
Display help output on stdout #8980
Upstream-commit: 60027853aa1d233b0bbd95250125605ba5bf2c5f
Component: engine
2015-01-06 12:05:49 -05:00
eb6b6775f6
Amended TestExecParseError test
...
Usage string isn't printed anymore. User is adviced to see help instead
- according to coreutils standard.
Signed-off-by: Michal Minar <miminar@redhat.com >
Upstream-commit: 1db927113f3e7af83fac548c0e2da05bccbd8d56
Component: engine
2015-01-06 16:48:10 +01:00
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
4bf864f7fb
Explicitly mention that '-P' maps to random ports
...
as noted in https://github.com/boot2docker/boot2docker/issues/690
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 7b2331061e428176cf513487745ac496e2bd7027
Component: engine
2015-01-06 17:01:10 +10: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
ee8de7da26
restart: Fix an error about arguments missing
...
Function shouldRestart() checks the restart policy and records the
debug info and there should be two arguments in the log.Debugf().
Prior to the this patch, the logs were something like this:
- client: $ docker run --restart=on-failure:3 ubuntu /bin/sh -c 'exit 1'
- daemon: INFO[0168] ...
DEBU[0168] stopping restart of container %!s(int=3) because maximum
failure could of %!d(MISSING) has been reached
INFO[0086] ...
Btw, fix a spelling error in the same file:
- cotnainer -> container
----------------------------------------
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: af053ccf6b3179978e087defd0062664152697ef
Component: engine
2015-01-06 12:25:39 +08:00
54ba72eea9
Use waitgroup instead of iterating errors chan
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e6c9343457c501c1da718c25bb9601f87d82cd7d
Component: engine
2015-01-05 18:01:13 -08: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
d55545783e
Refactor daemon.attach()
...
Also makes streamConfig Pipe methods not return error, since there was
no error for them to be able to return anyway.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 21e44d7a21014f6f0d5e159221f9b9165874a2e1
Component: engine
2015-01-05 15:56:48 -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
