p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,334 Commits 2 Branches 295 Tags
102933617ecd2e3f3248b04dd7f9c8ca267c68d2
Commit Graph

2779 Commits

Author SHA1 Message Date
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
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
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
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
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
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
James Turnbull
fbd81bd660 Merge pull request #9819 from huslage/remove-equal 
Remove -t="" and -m="".
Upstream-commit: 311d6276adc340c3bcd7ae3be283fca2821874f7
Component: engine
 2014-12-29 01:56:15 -05:00
Aaron Huslage
7959035342 Remove -t="" and -m="". Make -t and -m options consistent with help text and other documentation. 
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com> (github: huslage)
Upstream-commit: 8d7ee3697036d2d1f6c43efcb50b8d8b6c627584
Component: engine
 2014-12-26 12:31:01 -05:00
Victor Vieux
055349b7c9 add docs 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: bbb92e1436b5a288d07ef8ea0fad80f2c4715faa
Component: engine
 2014-12-24 00:12:35 +00:00
Phil Estes
ab25e4ba52 Add "OOM killed" event based on OOM state information 
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 44cab4a4ff05cb1e499fba19394aadb20fc887b8
Component: engine
 2014-12-23 18:22:31 -05:00
Sven Dowideit
50e537246c Merge pull request #9783 from SvenDowideit/pr_out_debian_wheezy_backports_kernel_updated_to_3_16 
Debian Wheezy backports kernel updated to 3.16
Upstream-commit: 7a3efc9aa5441285c85724e360811abf6146c464
Component: engine
 2014-12-23 11:19:26 +10:00
panticz
147e9f2038 Debian Wheezy backports kernel updated to 3.16 
Replaces #9723

fix by: panticz <mail@konczalski.de> (github: panticz)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: 973c3c768be19b80543631ad9515fe05b95b2d22
Component: engine
 2014-12-23 11:14:14 +10:00
Sven Dowideit
af134040ea Merge pull request #9740 from SvenDowideit/pr_out_fixes_as_requested 
Login with PUTTY instead of using the CMD
Upstream-commit: 197281f5858a90f7fdf8418e19b362fa57a052f3
Component: engine
 2014-12-23 11:11:53 +10:00
Sven Dowideit
892e46c364 fixes as requested 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: db165f7d2c3e05bbd7bac8c1188145370c7b1171
Component: engine
 2014-12-23 11:06:45 +10:00
Krasimir Georgiev
4725a40462 Changing the windows installation doc to include instructions how to login 
using putty instead of CMD

Signed-off-by: Krasimir Georgiev <support@vip-consult.co.uk>

Docker-DCO-1.1-Signed-off-by: Krasimir Georgiev <support@vip-consult.co.uk> (github: SvenDowideit)
Upstream-commit: 948f33263e95997a9c6596d695c92ab03c630899
Component: engine
 2014-12-23 11:06:44 +10:00
Sven Dowideit
4f66ac7b6d Merge pull request #9782 from SvenDowideit/pr_out_update_debian_version_to_7_7 
Update Debian version to 7.7
Upstream-commit: dda2b194394f1e0a10219c0b92583276a8b0a788
Component: engine
 2014-12-23 11:02:50 +10:00
panticz
fab564562c Update Debian version to 7.7 
Replaces #9724

fix by: panticz <mail@konczalski.de> (github: panticz)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: 491ff81a0b6653d75b2bc4ca81251d7bf5ee9f3f
Component: engine
 2014-12-23 10:53:36 +10:00
Alexander Morozov
5364411768 Merge pull request #7003 from porjo/6034-fowardChain 
Move per-container forward rules to DOCKER chain
Upstream-commit: 04117e4021da9d7fcd376b345074b84ebbd4f0ce
Component: engine
 2014-12-22 14:40:42 -08:00
Jean-Tiare Le Bigot
10b295c1df start new API v1.17 docs 
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr>
Upstream-commit: 800a8e896e810019b625ad0161c4fc4a04c26845
Component: engine
 2014-12-22 09:01:33 +01:00
Ian Bishop
c1a6d58dbd Update networking.md with new iptables behaviour 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
Upstream-commit: 137ceae9138e535f8b3f4e76bda18f6db954c231
Component: engine
 2014-12-21 12:57:32 +10:00
James Turnbull
93c395dffa Merge pull request #9657 from moxiegirl/9655 
Clarify Mac OS X experience. Signed-off by: Mary Anthony (moxieandmore@g...
Upstream-commit: 3e3749fe4b72c6fe9afd44c35c79c804b3ef1678
Component: engine
 2014-12-18 21:29:02 -05:00
Mary Anthony
bdb7f879f7 Argghhh...I need to automate that signoff. Fixing lack of signoff 
Signed-off-by: Mary Anthony <moxieandmore@gmail.com>
Upstream-commit: 801fd1af256134b749ee3dd29ea5ed41d2594482
Component: engine
 2014-12-18 09:10:08 -08:00
Alexander Morozov
4af408b6c1 Merge pull request #9635 from duglin/Issue3936 
Allow for relative paths on ADD/COPY
Upstream-commit: 364720b5e7e725cdc466171de873eefdb8609a33
Component: engine
 2014-12-18 06:58:50 -08:00
Doug Davis
a9b8d39261 Allow for relative paths on ADD/COPY 
Moved Tianon's PR from: https://github.com/docker/docker/pull/7870
on top of the latest code

Closes: #3936

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: f21f9f856e9d5af23521f131799028c2e67c04ed
Component: engine
 2014-12-18 05:13:04 -08:00
Fred Lifton
9667f960f7 Merge pull request #9683 from SvenDowideit/docker-exec-error-when-paused 
Update the documentation for #9356 fix
Upstream-commit: f2b89166cf3d352298496ea19a7b72bf5b1cba54
Component: engine
 2014-12-17 17:04:25 -08:00
Fred Lifton
f644595194 Merge pull request #9682 from SvenDowideit/scottstamp-stale-links-pr-carry 
Scottstamp stale links pr carry
Upstream-commit: 5df189a1b0b63d66f1478e12e4e738e2378f26b0
Component: engine
 2014-12-17 16:03:55 -08:00
Sven Dowideit
85fa2dc157 redirect openSUSE docs to SUSE doc 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: de2a91970dfd1f6078179ffffd63ec1842c95bd9
Component: engine
 2014-12-18 09:05:27 +10:00
Dan Walsh
21d58a4cf6 docker-run man page has screwed up indenting on --net option 
This patch fixes the indenting.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: bc1507dfce956846ba1515ccbfcd202c06aa995b
Component: engine
 2014-12-17 13:06:13 -05:00
Fred Lifton
8f8a34a48e Additions for 1.4.1 release 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 6afe5bf9ede46b81fb63283c55488dbbc50d5a07
Component: engine
 2014-12-16 17:40:02 -08:00
Alexander Morozov
9306adcecc Merge pull request #9652 from yadutaf/master 
Set HTTP upgrade headers when hijacking connection
Upstream-commit: f538e4be6b56ba4f69b5e5b909dd00b1bcc3081d
Component: engine
 2014-12-16 16:21:29 -08:00
Jean-Tiare Le Bigot
6447946d2c Update connection hijacking documentation with HTTP Upgrade Headers 
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr>
Upstream-commit: afb06a3ce2e769951a89a889f11b9ab5eea54dff
Component: engine
 2014-12-17 00:22:06 +01:00
Alexander Morozov
d76043e57c Merge pull request #9675 from JacobEdelman/patch-1 
Fixed two misspellings
Upstream-commit: 323c3c1381804f967ff41412be0a7cdf5fa98f11
Component: engine
 2014-12-16 12:06:23 -08:00
Fred Lifton
d2d0349752 Merge pull request #9601 from dchen1107/master 
Using container-vm image alias instead of specific name with version.
Upstream-commit: d79bc04e7bd728ed3ca4bffc463235bb2980670d
Component: engine
 2014-12-16 11:01:15 -08:00
Mary Anthony
1fd9831440 Updating per PR comment 
Signed-off-by: Mary Anthony <moxieandmore@gmail.com>
Upstream-commit: 078ac9ca456af1ecfc283a43aa60328ac800b205
Component: engine
 2014-12-16 10:16:20 -08:00
Mary Anthony
925862a57a Updating per PR comments 
Signed-off-by: Mary Anthony <moxieandmore@gmail.com>
Upstream-commit: 46748f1302c236457f0b646a746a9c945200ed12
Component: engine
 2014-12-16 10:14:03 -08:00
James Turnbull
f37c881351 Merge pull request #9651 from kdomanski/filter_docs 
Document container list filtering in API docs
Upstream-commit: 92d24e3b7cfca1a18ee8412c1bf6650758096355
Component: engine
 2014-12-16 01:38:49 -05:00
Sven Dowideit
7e0c2fb835 Update the documentation for #9356 fix 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: c9ca5c4dd3a90332cc40d25175e3b54aca1212a8
Component: engine
 2014-12-16 15:25:15 +10:00
Sven Dowideit
912c56d931 add Scott's link checker script, and fix what it finds 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: fbb9223b1adc16834768acaa7a5776697825deb2
Component: engine
 2014-12-16 14:46:25 +10:00
Scott Stamp
dcaedcf606 Update debian.md 
Fixed anchor links for Jessie/Wheezy (broken on docs.docker.com)

Update debian.md

Signed-off-by: Scott Stamp <scott@hypermine.com>
Upstream-commit: 4e7fb6b1f03173b0fbc41c18c9e9857b5708974a
Component: engine
 2014-12-16 12:49:53 +10:00
Jacob Edelman
fba1b014c8 Fixed two misspellings. 
Fixed two misspellings of the word "beginning".

Signed-off-by: JacobEdelman <edelman.jd@gmail.com>
Upstream-commit: 97f07bb61ccf6e5a3a0fcc72894d5f37310d0109
Component: engine
 2014-12-15 18:15:07 -05:00
Brian Goff
ecd4852381 Fix volumes-from/bind-mounts passed in on start 
Fixes #9628
Slightly reverts #8683, HostConfig on start is _not_ deprecated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d44c9f91472eb3df4c38c669134df04b2ccf9953
Component: engine
 2014-12-15 16:51:15 -05:00
Kamil Domanski
dd3d46bab0 Add available filters for containers, images and events to API docs. 
Signed-off-by: Kamil Domański <kamil@domanski.co> (github: kdomanski)
Upstream-commit: 51da97628a0ffb2a1c4be2c4d1bbcb09537d6c8d
Component: engine
 2014-12-15 16:51:29 +01:00
Kamil Domanski
159fd556c5 Add container list filtering to API docs. 
Signed-off-by: Kamil Domański <kamil@domanski.co> (github: kdomanski)
Upstream-commit: 37bdb05615763f94f7877cce3426752d43b48ff7
Component: engine
 2014-12-15 16:50:56 +01:00
James Turnbull
9158ffcf49 Merge pull request #9633 from estesp/docs-ubuntu-install 
DOCS: Update Ubuntu install instructions regarding dated Ubuntu docker.io
Upstream-commit: 24a81829284c9c9966f3dbc239dff9adca09d5ef
Component: engine
 2014-12-15 04:52:27 -05:00