0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
27905 commits 14 branches 412 tags 338 MiB
Commit graph

27905 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Demeester
e40c512f60 Merge pull request #27392 from Microsoft/jjh/securitydescriptor 
Windows: Set administrators ACL on debug listener
 2016-10-17 17:13:38 +02:00
Vincent Demeester
b0f3d7a1b5 Merge pull request #27367 from Microsoft/jjh/fieldsincontainer 
Windows: Factor out unused fields in container
 2016-10-17 16:50:39 +02:00
Vincent Demeester
a7c883fb04 Merge pull request #27074 from cyli/bump-notary-version 
Bump notary version to 0.4.2
 2016-10-17 16:35:57 +02:00
Lei Jitang
55cd8f53c9 Merge pull request #27419 from yongtang/10162016-warning 
Fix an incorrect `WARNING` output in `docker run/create`
 2016-10-17 18:37:03 +08:00
Sebastiaan van Stijn
a2ad359730 Merge pull request #27431 from thaJeztah/improve-more-examples 
Improve API format examples
 2016-10-17 05:35:10 +02:00
Sebastiaan van Stijn
8e02b29d24
Improve API format examples 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-10-16 19:54:08 -07:00
Sebastiaan van Stijn
6f8d11d440 Merge pull request #27428 from thaJeztah/improve-example-format 
Improve example for env vars in API docs
 2016-10-17 04:32:58 +02:00
Sebastiaan van Stijn
441c9411e3
Improve example for env vars in API docs 
This was added in e41de3e631,
but can be a bit confusing due to the "outer" brackets
being for JSON, and the "inner" brackets to indicate
optional values.

During review of that change, this alternative
format was suggested.

Updating the example to use the format that was discussed
during review :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-10-16 19:22:42 -07:00
Yong Tang
40f25809ab Fix an incorrect WARNING output in docker run/create 
This fix tries to fix an incorrect `WARNING` output in `docker run/create`:
```
ubuntu@ubuntu:~/docker$ docker run -d --cpu-percent 80 busybox top
WARNING: %s does not support CPU percent. Percent discarded.
WARNING: linux
e963d1108e455e7f8f57626ca1305b5f1999e46025d2865b9a21fc8abc51a546
```

The reason was that in `daemon/daemon_unix.go`, the warning string
was not combined with `fmt.Sprintf` before appended to the output.

This fix fixes this issue.

This fix has been manually tested and verified:
```
ubuntu@ubuntu:~/docker$ docker run -d --cpu-percent 80 busybox top
WARNING: linux does not support CPU percent. Percent discarded.
fcf53f79d389235bae846d3d40804834659ac025edbc0d075ed91841a8e4c740
```

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-10-16 17:11:39 -07:00
Sebastiaan van Stijn
319a929c37 Merge pull request #27416 from AkihiroSuda/fix-failing-TestBuildLabelsOverride 
[test] fix failure of TestBuildLabelsOverride on Windows
 2016-10-16 15:14:57 -07:00
Vincent Demeester
9f5ffa2a81 Merge pull request #27236 from allencloud/return-nil-when-no-node-or-service 
return nil when no node or service to avoid additional api call
 2016-10-16 18:41:31 +02:00
Akihiro Suda
bb17d1fabb [test] fix failure of TestBuildLabelsOverride on Windows 
TestBuildLabelsOverride was consistently failing due to "Windows does not support FROM scratch" error

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-10-16 11:05:31 +00:00
Sebastiaan van Stijn
2a3ba03424 Merge pull request #27341 from milindchawre/doc-change 
Fixes #27095 : Removing registrytoken field from doc as it is depreca…
 2016-10-15 11:40:48 -07:00
milindchawre
72dd684c88 Fixes #27095 : Removing registrytoken field from doc as it is deprecated by identitytoken field 
Signed-off-by: milindchawre <milindchawre@gmail.com>
 2016-10-15 08:38:33 +00:00
Sebastiaan van Stijn
6f54d70a54 Merge pull request #27174 from duglin/Issue26027 
Don't env-var evaluate labels from docker build cmd line
 2016-10-14 20:57:41 -07:00
Tõnis Tiigi
9b2970283b Merge pull request #26928 from thaJeztah/update-release-checklist 
Add updating AUTHORS to the release checklist
 2016-10-14 18:33:26 -07:00
Tõnis Tiigi
4a6b37eb3e Merge pull request #27322 from yongtang/25855-deploy-dab-extension 
Allow `docker deploy` command accept stack with/without extension
 2016-10-14 18:26:49 -07:00
Tõnis Tiigi
1221294386 Merge pull request #27368 from morelena/move_close 
integration-cli: move Close() after error check
 2016-10-14 18:25:36 -07:00
cyli
0797af39c2 Fix API incompatibilities between notary v0.3.0 and v0.4.2: 
- some function signatures have changed - use the new ones
- re-generate the notary delegation key certs, since notary doesn't allow SHA1
- fix some error message mapping because now if a root rotation fails to validate trusted operations will fail

Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-10-14 17:53:34 -07:00
cyli
5f4dcd8252 Bump vendored and dockerfile notary version to v0.4.2 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-10-14 17:52:56 -07:00
Sebastiaan van Stijn
f2c094cb99 Merge pull request #27334 from darrenstahlmsft/ExpandSandboxSizeZero 
Windows: Stop expanding sandbox size when no new size is specified
 2016-10-14 17:51:32 -07:00
Sebastiaan van Stijn
68951594ef Merge pull request #27403 from ry4nz/restore-logo 
Restore Docker logo in README.md
 2016-10-14 16:15:55 -07:00
Ryan Zhang
59357bab8c Restore Docker logo in README.md 
Signed-off-by: Ryan Zhang <ryan.zhang@docker.com>
 2016-10-14 16:12:27 -07:00
Sebastiaan van Stijn
07aa2629e3 Merge pull request #27401 from mstanleyjones/toml_to_yaml 
Convert Markdown frontmatter to YAML
 2016-10-14 15:46:21 -07:00
Misty Stanley-Jones
b30609446d Convert Markdown frontmatter to YAML 
Some frontmatter such as the weights, menu stuff, etc is no longer used
'draft=true' becomes 'published: false'

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-14 15:44:55 -07:00
Alexander Morozov
678ff27f0f Merge pull request #27395 from mrjana/net 
Vendoring libnetwork @04025f2a2eebb
 2016-10-14 14:54:47 -07:00
John Howard
d0a17e4813 Merge pull request #27385 from jphuynh/update-jessfraz-github-handle 
Fix incomplete change from PR #27347 (jessfraz github handle update.)
 2016-10-14 14:24:20 -07:00
Misty Stanley-Jones
fba04ed0ab Merge pull request #27332 from mstanleyjones/27297 
Remove contents of docs/ except for reference, point to new location
 2016-10-14 14:12:09 -07:00
Misty Stanley-Jones
3aeaa9f8fd Add a link to the new build instructions 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-14 14:05:48 -07:00
Yong Tang
1e9d04c458 Allow docker deploy command accept filename with/without extension 
This fix tries to address the issue raised in 25855 where the command
`docker deploy` can only accept a STACK without extension of `.dab`.
In other words, `docker deploy hellojavaee.dab` gives an error:
```
Bundle hellojavaee.dab.dab not found. Specify the path with --file
```

This fix updates the way namespace STACK is taken so that in case
`STACK.dab` is provided with `docker deploy`:
```
$ docker deploy STACK.dab
```
The `STACK` is used as namespace (instead of `STACK.dab`).

NOTE: This fix will only allows `.dab` extension in namespace, because
it is not possible to have a namespace with `.` in the middle. In other
words, a namespace `hello.java.ee` will not work anyway (whether the file
`hello.java.ee` exists or not).

An additional integration test has been added to cover the changes.

This fix fixes 25855.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-10-14 11:44:15 -07:00
Jana Radhakrishnan
9ae9f9812b Vendoring libnetwork @04025f2a2eebb 
Fixes #27323

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2016-10-14 11:12:24 -07:00
Sebastiaan van Stijn
e8e1c4dfb9 Merge pull request #27363 from tealtail/26227-add-stack-ps-to-docs 
add documentation for `docker stack ps`, Fixes #26227
 2016-10-14 10:02:26 -07:00
John Howard
192e6d9995 Windows: Set ACL on debug listener 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-10-14 09:15:17 -07:00
Jean-Pierre Huynh
666ac08fab Fix incomplete change from PR #27347 (jessfraz github handle update.) 
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
 2016-10-14 14:37:02 +01:00
Sebastiaan van Stijn
66177532b6 Merge pull request #27333 from yongtang/27049-ListOpt 
Use ListOpt for `docker network create --label` and `docker volume create --label`
 2016-10-14 00:31:09 -07:00
Tibor Vass
9ced849832 Merge pull request #27027 from tonistiigi/fix-name-collision 
Fix name collision handling in restore
 2016-10-14 08:59:56 +02:00
Sebastiaan van Stijn
429812f86a Merge pull request #27335 from barracks510/master 
Simplify function signature
 2016-10-13 18:54:01 -07:00
Sebastiaan van Stijn
21a79b503a Merge pull request #27366 from morelena/use_contains 
all: use strings.Contains instead Index
 2016-10-13 18:44:30 -07:00
Sebastiaan van Stijn
dd383898cd Merge pull request #26795 from darrenstahlmsft/PauseResume 
Implement Pause Resume support for Windows
 2016-10-13 18:08:11 -07:00
Sebastiaan van Stijn
ba2c13fcf5 Merge pull request #26819 from ripcurld00d/fix_stats_mutex 
Hide the mutex lock in formatter.ContainerStats
 2016-10-13 17:38:22 -07:00
Elena Morozova
2b9786a9b3 integration-cli: move Close() after error check 
Signed-off-by: Elena Morozova <lelenanam@gmail.com>
 2016-10-13 16:07:08 -07:00
Elena Morozova
a37027f6bd all: use strings.Contains instead Index 
Signed-off-by: Elena Morozova <lelenanam@gmail.com>
 2016-10-13 15:55:41 -07:00
Aaron Lehmann
245bd4c3d2 Merge pull request #27365 from morelena/remove_nil_check 
all: remove nil check for slices
 2016-10-13 15:27:37 -07:00
Alexander Morozov
f299335e6e Merge pull request #27360 from morelena/loop_append 
all: replace loop with single append
 2016-10-13 14:52:59 -07:00
John Howard
600f0ad211 Windows: Factor out unused fields in container 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-10-13 14:51:10 -07:00
Elena Morozova
ace53bbe65 all: remove nil check for slices 
Signed-off-by: Elena Morozova <lelenanam@gmail.com>
 2016-10-13 13:55:38 -07:00
Elena Morozova
64238fef8c all: replace loop with single append 
Signed-off-by: Elena Morozova <lelenanam@gmail.com>
 2016-10-13 13:31:52 -07:00
Alexander Morozov
f1e5349a03 Merge pull request #27338 from yuexiao-wang/instream-err 
Fix the incorrect description for NewInStream
 2016-10-13 12:32:43 -07:00
Tõnis Tiigi
62503f245f Merge pull request #27276 from yuexiao-wang/func-name 
Modify function name from SetDaemonLogLevel to SetLogLevel
 2016-10-13 12:10:59 -07:00
Alicia Lauerman
970ab9a224 add documentation for docker stack ps 
also updates related stack docs and removes stack_tasks.md

Signed-off-by: Alicia Lauerman <allydevour@me.com>
 2016-10-13 15:09:58 -04:00