Commit Graph
15316 Commits
Author SHA1 Message Date
Jessie Frazelle 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
Alexander Morozov 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
Jessica Frazelle 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
Evan Carmi 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
Matthew Riley 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
Fred Lifton 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
Fred Lifton 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
Michael Crosby 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
Doug Davis 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
Vincent Batts 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
James Turnbull 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
Lorenz Leutgeb 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
PatrickJS 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
https://github.com/docker/docker/commit/a27b4b8cb8e838d03a99b6d2b30f76bdaf2f9e5d

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
Lorenz Leutgeb 0c43fe055f doc: Fix curl invocation
Using --insecure is (you guessed it) *insecure* as the server side
certificate is not being validated. To offer the same degree of
security as invocations of the docker client in "Secure by default"
with cURL, the trusted CA certificate must be supplied.

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: 26187bd851141236a909c0bada5a2743fc237e0e
Component: engine
2015-01-05 01:24:33 +01:00
Lorenz Leutgeb 102933617e doc: Let OpenSSL handle serial file
With -CAcreateserial the serial file will be automatically created
and initialized if it is missing.

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: 131c62d7661ace86453de540cb1a58956b59e347
Component: engine
2015-01-04 21:49:16 +01:00
Lorenz Leutgeb f3f1f9c919 doc: Spice up generated CA
Use AES (the successor of DES) to encrypt private key. Further
reading:

 * http://csrc.nist.gov/publications/nistpubs/800-131A/sp800-131A.pdf
 * https://ssllabs.com/downloads/SSL_TLS_Deployment_Best_Practices.pdf
   "3DES provides about 112 bits of security. This is below the
    recommended minimum of 128 bits, but it's still strong enough. A
    bigger practical problem is that 3DES is much slower than the
    alternatives. Thus, we don't recommend it for performance reasons,
    but it can be kept at the end of the cipher list for
    interoperability with very old clients."

 * http://csrc.nist.gov/publications/nistpubs/800-67-Rev1/SP-800-67-Rev1.pdf

Use SHA256 for our CA. This avoids accidental use of SHA1 or MD5 which
could be default values.

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: a3d5f874c108d3e7d58a7f86c0ef0eea6fcca85f
Component: engine
2015-01-04 21:45:06 +01:00
Lorenz Leutgeb 753c527fc2 doc: Do not encrypt private keys
Do not encrypt private keys in the first place, if the encryption
is stripped anyway.

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: f957f258d722fa563ead0a14978acca7c6745d3f
Component: engine
2015-01-04 21:05:54 +01:00
Derek 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
Alexander Morozov 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
Lorenz Leutgeb 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
Daehyeok Mun 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
Daehyeok.Mun 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
Tianon Gravi 2b984cd633 Add initial new IRC administration cheat sheet of sorts
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 0c21905a3d7cdae98ebad3155e4a1b3fe98f29a7
Component: engine
2015-01-02 23:42:45 -07:00
Tianon Gravi 74fe90f089 Simplify builder TestTestData slightly by using ioutil.ReadFile instead of os.Open+ioutil.ReadAll
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: f6cb1ea85a7a75193644b8ba4516cb586c5dc52f
Component: engine
2015-01-02 22:38:52 -07:00
Tianon Gravi d0cdce5ce4 Simplify builder ast.Dump by using strconv.Quote instead of a custom QuoteString function (the only change to existing files is literal tabs becoming \t, but future files may use nonprintable characters and the like now)
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 1edf16e977a3dd18f9ff15b4acf40b0c1ac64788
Component: engine
2015-01-02 22:36:58 -07:00
Nathan Hsieh d4fbd0ffc5 updated docs with information regarding search pagination
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
Upstream-commit: 1aac999f707773e4530c1d126ce51ec19cf9d243
Component: engine
2015-01-02 16:21:51 -08:00
Srini Brahmaroutu 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
Nathan Hsieh 70c14a39fb updated search api docs to include pagination changes
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
Upstream-commit: 686585f33a80f7dfaa45400b700235d0615b7fce
Component: engine
2015-01-02 13:01:28 -08:00
Fred Lifton 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
Tianon Gravi 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
daehyeok mun 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
Harald Albers 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
Harald Albers 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
Fred Lifton 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
Fred Lifton 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
Fred Lifton 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
James Turnbull 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
Nate Eagleson 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
Eric Windisch 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
Jessie Frazelle 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
Jessie Frazelle 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
Sven Dowideit 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
Sven Dowideit 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
Sven Dowideit 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
Sven Dowideit 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
Alexander Morozov 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
Victor Vieux 2156fea332 add test
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: c0bb1c77ee2461f8bceb03202f60f5673815c026
Component: engine
2014-12-29 23:00:17 +00:00
Jessie Frazelle 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
Jessie Frazelle 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
Jessica Frazelle 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