docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
47,845 Commits 92 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Morozov
e16753ce19 Merge pull request #22465 from allencloud/handle-error-when-getting-hostname-in-docker-info 
handle error when getting hostname in info api
 2016-05-09 14:57:36 -07:00
Riyaz Faizullabhoy
eadda460db Merge pull request #726 from docker/rethink-timeouts 
Increase timeout for RethinkDB (default is 0), remove extra wait
 2016-05-09 14:38:18 -07:00
Ying Li
6081e96224 Merge pull request #727 from cyli/save-root-role-only-on-rotate 
Do not save old root roles until the first root rotation
 2016-05-09 14:35:24 -07:00
Derek McGowan
db713e127b Generate the certificate directory with a pretest script 
fixes #1690

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-05-09 14:21:53 -07:00
Ying Li
2699ced85e Simplify even further and only save the previous role during a root rotation 
so that in the saved roles named "root.version", the version is the latest
version for which that root role was valid.

Signed-off-by: Ying Li <ying.li@docker.com>
 2016-05-09 14:10:25 -07:00
Sebastiaan van Stijn
e8aac7de4c Merge pull request #22611 from tonistiigi/attach-docs 
docs: clarify docker attach
 2016-05-09 22:59:07 +02:00
Tonis Tiigi
da1dbd2093 docs: clarify docker attach 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-05-09 13:35:34 -07:00
Riyaz Faizullabhoy
6c87dbe4c6 Remove wait after dbCreate 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-05-09 13:25:07 -07:00
Ying Li
2f43fa66cc Shift the code that saves the roles around to be slightly more clear what 
roles it's saving and why.

Signed-off-by: Ying Li <ying.li@docker.com>
 2016-05-09 12:02:48 -07:00
French Ben
8df589cf8f Merge pull request #1529 from alexandrev/issue-1521 
Changes to the Gruntfile to allow to create a release version on Windows
 2016-05-09 14:51:19 -04:00
French Ben
e8098e6e5e Merge pull request #1394 from alexandrev/issue-1369 
Fix stop the machine on close on Windows
 2016-05-09 14:47:21 -04:00
Ying Li
9d717780d2 Do not save old root roles until the first root rotation 
Signed-off-by: Ying Li <ying.li@docker.com>
 2016-05-09 11:30:08 -07:00
Sebastiaan van Stijn
251b273fd2 Merge pull request #22609 from cyli/minor-docs-update 
Minor tense correction for deprecated docs
 2016-05-09 19:48:12 +02:00
cyli
d73589331d Minor tense correction for deprecated docs 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-05-09 10:29:42 -07:00
Brian Goff
c5e3644f03 Merge pull request #22562 from tonistiigi/fix-loopback-release 
Clean loopbacks in TestDaemonNoSpaceLeftOnDeviceError
 2016-05-09 13:28:08 -04:00
Alexander Morozov
fad0305ee3 Merge pull request #22574 from yongtang/05072016-remove-deprecated-trust-env 
Remove deprecated Docker Content Trust ENV passphrase variables
 2016-05-09 10:10:27 -07:00
Jess Frazelle
6f06e98f57 docs: add security non-events 
Signed-off-by: Jess Frazelle <jess@mesosphere.com>
Signed-off-by: Jess Frazelle <me@jessfraz.com>
 2016-05-09 09:35:19 -07:00
Tibor Vass
9ffd2652e2 Merge pull request #22606 from mlaventure/allow-changing-wheezy-backport-mirror 
Allow changing wheezy deb builder backport mirror
 2016-05-09 12:23:58 -04:00
Kenfe-Mickael Laventure
6a033e617f Allow changing wheezy deb builder backport mirror 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-05-09 09:10:30 -07:00
Richard Scothern
4f2ee029a2 Add 'us-gov-west-1' to the valid region list. 
Signed-off-by: Richard Scothern <richard.scothern@docker.com>
 2016-05-09 16:38:16 +01:00
Vincent Demeester
20d5d10983 Merge pull request #21115 from wenchma/linkable 
update link comments
 2016-05-09 14:37:34 +02:00
Anton Simernia
4b01f6dcd6 add msg attribute to ProjectError class 
Signed-off-by: Anton Simernia <anton.simernya@gmail.com>
 2016-05-09 18:26:20 +07:00
Sebastiaan van Stijn
3deb2d7280 Merge pull request #22572 from yongtang/05072016-add-missing-subtitle-in-deprecated-docs 
Add the missing subtitle in deprecated docs for --security-opt
 2016-05-09 12:18:11 +02:00
Wen Cheng Ma
c52a373bc8 update link comments 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-05-09 14:12:28 +08:00
Sven Dowideit
f1603a3ee2 Merge pull request #3092 from wenchma/service_image 
Update image format for service conf reference
 2016-05-09 10:16:37 +10:00
Sven Dowideit
5fa81c4044 Merge pull request #3417 from spectralsun/patch-1 
Small typo
 2016-05-09 10:15:56 +10:00
Vincent Demeester
1e4068713b Merge pull request #22589 from duglin/fixErr 
Err was never being returned
 2016-05-08 17:31:43 +02:00
Doug Davis
0687d76ab1 Err was never being returned 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2016-05-08 05:51:59 -07:00
Antonio Murdaca
6a96684442 pkg: authorization: cleanup tests 
- do use use log pkg
- do not t.Fatal in goroutine
- cleanups

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-05-08 14:18:38 +02:00
Vincent Demeester
ac2f4dd71b Merge pull request #22400 from runcom/fix-git-branch-name 
Makefile: clean git branch before building
 2016-05-08 13:50:43 +02:00
Antonio Murdaca
a4192471cd Makefile: clean git branch before building 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-05-08 11:52:38 +02:00
Sun Hongliang
b1f42fb8cc hide error in info when empty 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-05-08 15:32:19 +08:00
Yong Tang
1f0d5aba50 Remove deprecated Docker Content Trust ENV passphrase variables 
Since 1.9, Docker Content Trust Offline key has been renamed to
Root key and the Tagging key has been renamed to Repository key.
The corresponding environment variables
`DOCKER_CONTENT_TRUST_OFFLINE_PASSPHRASE`
`DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE`
have also been deprecated and renamed to
`DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE`
`DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE`

This fix removed the deprecated ENV passphrase variables for
1.12 and updated the docs.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-05-07 14:25:28 -07:00
Vincent Demeester
08ec3606f1 Merge pull request #21889 from cpuguy83/logscmd_add_attrs 
Add support for reading logs extra attrs
 2016-05-07 20:26:33 +02:00
Shijiang Wei
391441c28b fix LogConfig for containers created before docker 1.12 on daemon startup 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2016-05-08 00:29:38 +08:00
Yong Tang
018c22880d Add the missing subtitle in deprecated docs for --security-opt. 
The colon separator(`:`) of `--security-opt` flag was deprecated
in 1.11.0. However, the subtitle in deprecated docs is missing
so it is placed under the same subtitle as the deprecated `-e` and
`--email` flags.

This fix adds the missing subtitle in deprecated docs.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-05-07 08:46:15 -07:00
Sebastiaan van Stijn
2301052d74 Merge pull request #22569 from sunyuan3/inherit 
from inheritted to inherited
 2016-05-07 11:31:25 +02:00
Sebastiaan van Stijn
e8b00316b2 Merge pull request #22565 from tophj-ibm/ppc64le-remove-seccomp-buildtags 
ppc64le: remove seccomp from docker buildtags
 2016-05-07 11:21:18 +02:00
Yuan Sun
fe1130b7ba from inheritted to inherited 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2016-05-07 17:15:02 +08:00
Alexander Morozov
0b59ea60b2 Merge pull request #22094 from thaJeztah/autocreate-on-windows 
Enable auto-creation of host-path on Windows
 2016-05-06 23:19:26 -07:00
Vincent Demeester
3b7a2f5816 Merge pull request #22559 from larsks/bug/clarity-on-systemd-dropins 
docs: note requirements for systemd drop-in filenames
 2016-05-07 07:58:46 +02:00
Lei Jitang
5e5e1d7ada Fix docker create with duplicate volume failed to remove 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-05-06 22:48:02 -04:00
allencloud
a1c950913f handle error when getting hostname in info api 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-05-07 08:51:52 +08:00
Riyaz Faizullabhoy
a69f9b85e4 Make default 60s timeout for rethindkb (default is 0) 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-05-06 17:46:17 -07:00
Brian Goff
bd9d14a07b Add support for reading logs extra attrs 
The jsonlog logger currently allows specifying envs and labels that
should be propagated to the log message, however there has been no way
to read that back.

This adds a new API option to enable inserting these attrs back to the
log reader.

With timestamps, this looks like so:
```
92016-04-08T15:28:09.835913720Z foo=bar,hello=world hello
```

The extra attrs are comma separated before the log message but after
timestamps.

Without timestaps it looks like so:
```
foo=bar,hello=world hello
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-05-06 20:42:20 -04:00
John Howard
7f66598583 Windows: docker cp consistent paths 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-05-06 16:08:53 -07:00
Sebastiaan van Stijn
d8c4bb19fb Add "process" labels 
Add description for "process" labels to the reviewing
documentation. Also changed some headings from h1 -> h2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-05-07 00:56:55 +02:00
Sebastiaan van Stijn
4e080347af Enable auto-creation of host-path on Windows 
Auto-creation of host-paths has been un-deprecated,
so to have feature-parity between Linux and Windows,
this feature should also be present on Windows.

This enables auto-creation on Windows.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-05-07 00:55:16 +02:00
Sebastiaan van Stijn
926725b470 Merge pull request #22433 from rhatdan/labels 
We should always return the MountLabel
 2016-05-07 00:24:27 +02:00
Christopher Jones
31cc7dc135 ppc64le: remove seccomp from docker buildtags 
Removes seccomp from ppc64le as a buildtag

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-05-06 17:24:50 -04:00