1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

27876 commits

Author SHA1 Message Date
Sebastiaan van Stijn
68951594ef Merge pull request 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 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 from mrjana/net
Vendoring libnetwork @04025f2a2eebb
2016-10-14 14:54:47 -07:00
John Howard
d0a17e4813 Merge pull request from jphuynh/update-jessfraz-github-handle
Fix incomplete change from PR  (jessfraz github handle update.)
2016-10-14 14:24:20 -07:00
Misty Stanley-Jones
fba04ed0ab Merge pull request 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
Jana Radhakrishnan
9ae9f9812b Vendoring libnetwork @04025f2a2eebb
Fixes 

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-10-14 11:12:24 -07:00
Sebastiaan van Stijn
e8e1c4dfb9 Merge pull request from tealtail/26227-add-stack-ps-to-docs
add documentation for `docker stack ps`, Fixes 
2016-10-14 10:02:26 -07:00
Jean-Pierre Huynh
666ac08fab Fix incomplete change from PR (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 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 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 from barracks510/master
Simplify function signature
2016-10-13 18:54:01 -07:00
Sebastiaan van Stijn
21a79b503a Merge pull request 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 from darrenstahlmsft/PauseResume
Implement Pause Resume support for Windows
2016-10-13 18:08:11 -07:00
Sebastiaan van Stijn
ba2c13fcf5 Merge pull request from ripcurld00d/fix_stats_mutex
Hide the mutex lock in formatter.ContainerStats
2016-10-13 17:38:22 -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 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 from morelena/loop_append
all: replace loop with single append
2016-10-13 14:52:59 -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 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 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
yuexiao-wang
90bddb4243 Fix the incorrect description for NewInStream
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-13 22:33:09 +08:00
Tibor Vass
535f52c932 Merge pull request from tonistiigi/wait-tasks
Wait until tasks have been created in TestSwarmTaskListFilter
2016-10-13 15:02:43 +02:00
Tibor Vass
33cc134663 Merge pull request from tonistiigi/rm-checkpoint-methods
Remove checkpoint methods from builder backend
2016-10-13 15:02:23 +02:00
Justin Cormack
13279b77d2 Merge pull request from jphuynh/update-jessfraz-github-handle
Update jessfraz's github handle after she decided to break the internet
2016-10-13 13:57:29 +01:00
Jean-Pierre Huynh
30e61051af Update Jess' github handle after she decided to break the internet
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
2016-10-13 11:36:05 +01:00
Sebastiaan van Stijn
0542dcc2d0 Merge pull request from tonistiigi/deprecate-repo-shortid
Deprecate repo:shortid syntax
2016-10-12 23:44:38 -07:00
Dennis Chen
445620f231 Simplify function signature
Signed-off-by: Dennis Chen <barracks510@gmail.com>
2016-10-12 21:31:55 -04:00
John Mulhausen
29f08cf49b Remove old documentation, add README.md with pointer
Signed-off-by: John Mulhausen <john@docker.com>
2016-10-12 16:23:33 -07:00
Yong Tang
e3f484241d Use ListOpt for docker network create --label and docker volume create --label
This fix is related to 27049 and 27047. For `--label` flag, if string slice is
used (like 27047), then quote can not be used in command and will result in
an error :
```
line 1, column 14: bare " in non-quoted-field
```

The issue 27047 has been fixed by 27049.

Recently I found out that both `docker network create --label` and `docker volume create --label`
still use string slice and will return the same error when quotes are used.

This fix fixes `docker network create --label` and `docker volume create --label`
by using `ListOpt` (as 27049) as well.

This fix has been tested and verified manually.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-10-12 16:06:34 -07:00
Tibor Vass
8658748ef7 Merge pull request from anusha-ragunathan/use-pluginv2-authz
Make authz use pluginv2
2016-10-13 00:28:43 +02:00
Victor Vieux
aba3a99804 Merge pull request from tonistiigi/net-tests
Add requirements for tests that require network
2016-10-12 15:08:50 -07:00
Victor Vieux
32f93fdd25 Merge pull request from vieux/1.12.2_changelog
add 1.12.2 changelog
2016-10-12 13:20:02 -07:00
Victor Vieux
f77a31a58a add 1.12.2 changelog
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-10-12 13:12:08 -07:00
Tõnis Tiigi
98d19efe50 Merge pull request from yongtang/27294-docs-Size-RefCount
Update docs for `Size` and `RefCount` for `UsageData`
2016-10-12 11:51:21 -07:00
Tõnis Tiigi
c8e8be8478 Merge pull request from LK4D4/fix_racy_auth
pkg/authorization: make it goroutine-safe
2016-10-12 11:18:59 -07:00
Tonis Tiigi
da9ef68f06 Add requirements for tests that require network
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-12 11:11:23 -07:00
John Howard
e736b9a172 Merge pull request from swernli/servicing-error-reporting
Fixing error reporting on servicing failure
2016-10-12 08:47:54 -07:00
Vincent Demeester
9db4698929 Merge pull request from Microsoft/jjh/servicingcitest
Windows: Test for container servicing
2016-10-12 15:50:52 +02:00
Vincent Demeester
310068f606 Merge pull request from darrenstahlmsft/CreateTests
Windows: Enable more create tests
2016-10-12 15:08:32 +02:00
Tibor Vass
8d1d9eebe3 Merge pull request from AkihiroSuda/mask-sys-firmware-2
oci/defaults_linux.go: mask /sys/firmware
2016-10-12 14:10:12 +02:00
Tibor Vass
625e9f786a Merge pull request from aboch/cfg
Update required modules for overlay dataplane encryption
2016-10-12 14:07:18 +02:00
Antonio Murdaca
d3ee780bc5 Merge pull request from stevvooe/deterministic-client-scheme
client: deterministically resolve http scheme
2016-10-12 10:50:55 +02:00
Akihiro Suda
8b1772c86b oci/defaults_linux.go: mask /sys/firmware
On typical x86_64 machines, /sys/firmware can contain SMBIOS and ACPI tables.
There is no need to expose the directory to containers.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-10-12 06:07:13 +00:00
Stefan J. Wernli
f65647463e Fixing error reporting on servicing failure
The code that handles waiting for the servicing container to complete correctly grabs the exit code and logs a failure, but doesn't return that failure to the caller, mistakenly causing servicing operations to look successful when they really failed during processing.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2016-10-11 17:11:56 -07:00
Alexander Morozov
a616cf3b88 pkg/authorization: make it goroutine-safe
It was racy on config reload

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-10-11 16:31:45 -07:00