Commit Graph

11411 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
45b07b768f Add a note to point out to new users that B2D bind-mounts are special-ish
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: e52988528d20a729ed71e47e4d0a5fcb35c92dfc
Component: engine
2014-12-30 13:37:31 +10:00
5ac672fe9b Talk up the 1.4 change to initialise volumes at time
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: 1d4a13867053b58971424f8caf219f935fc66fdd
Component: engine
2014-12-30 13:08:53 +10:00
4d06ba471c Add docs Cloudfront cache invalidation
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: cfaffd1ad26cf64330b87d0f99a883215b4c5a3e
Component: engine
2014-12-30 12:58:56 +10:00
d5fa05762a Document that there is a delay before the --restart policy restart, and that its double the last one
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: 35873e747d5681e42582f51ea48993382cb893a6
Component: engine
2014-12-30 12:36:04 +10:00
a8c9181bdf Merge pull request #9800 from vieux/execIDs_inspect
Add ExecIDs to docker inspect
Upstream-commit: 12fef2d8df4e5da024418e324f7e3c3e82220a27
Component: engine
2014-12-29 15:32:33 -08:00
2156fea332 add test
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: c0bb1c77ee2461f8bceb03202f60f5673815c026
Component: engine
2014-12-29 23:00:17 +00:00
6f0f7a7c16 Merge pull request #9827 from LK4D4/test_for_removing_cgroups
Test for issue #9699
Upstream-commit: d47020d18ab22a061982a56f4d0d90658ce5e66a
Component: engine
2014-12-29 13:46:29 -08:00
7ca522fb8e Merge pull request #9847 from LK4D4/fix_net_host_test
Fix net host test
Upstream-commit: b4d09da71508e47f1f1365a65b38776962f261c6
Component: engine
2014-12-29 13:28:15 -08:00
4e25d58828 Add Jenkins Build Status
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7b0519d1ec8edcec773ef5d1e8f24d6a1b0b29f3
Component: engine
2014-12-29 13:15:51 -08:00
3e645815a0 Rewrite TestRunNetHost to compare namespaces
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e98c08a88fb5f3eedde158a3647a731c31bd4faa
Component: engine
2014-12-29 13:10:30 -08:00
94c4f7ea4b Fix done messages and error message for ipc tests
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 74ee405a27b19f2d91caaf50029cea3b13ddcaf2
Component: engine
2014-12-29 13:10:16 -08:00
c84951b952 Merge pull request #9842 from jfrazelle/make-whitespace-fixes
Fix tabs in project/make.sh
Upstream-commit: 9404e95c08f38cf7ce1474f92903bd813a0bc25f
Component: engine
2014-12-29 12:34:38 -08:00
77c4011e73 Merge pull request #9565 from duglin/DocPtrs
Make README point to other critical docker projects
Upstream-commit: b1f620538309efb65e7aacd896353fa2728aee04
Component: engine
2014-12-29 11:17:34 -08:00