Commit graph

26111 commits

Author SHA1 Message Date
Sebastiaan van Stijn
8a8a63aa32 Merge pull request #25137 from justincormack/32bit-seccomp-test
Add a test that the default seccomp profile allows execution of 32 bit binaries
2016-07-28 17:01:04 +02:00
Brian Goff
b09f280161 Merge pull request #25168 from miaoyq/optimize-a-print
optimize a print in `volume/volume.go`
2016-07-28 09:16:17 -04:00
Yanqiang Miao
a503f3ac2f optimize a print in
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update 'optimize-a-print'

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-07-28 19:20:20 +08:00
Sebastiaan van Stijn
193b036159 Merge pull request #25152 from thaJeztah/re-enable-api-1.25
docs: re-enable API 1.25
2016-07-28 09:38:20 +02:00
Sebastiaan van Stijn
14664beda9 Merge pull request #25020 from jfrazelle/update-non-events
update security non-events
2016-07-28 09:29:51 +02:00
Sven Dowideit
352c720d69 Merge pull request #25156 from londoncalling/docs-v112-getstarted-a
modifed d4mac and d4win download links to stable for v1.12
2016-07-28 17:08:54 +10:00
Victoria Bialas
ef528abcda modifed d4mac and d4win download links to stable for v1.12
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-07-27 18:57:38 -07:00
Sebastiaan van Stijn
2b9838eafe
docs: re-enable API 1.25
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-28 02:11:34 +02:00
Jess Frazelle
6837cfc13c update non-events
Signed-off-by: Jess Frazelle <jessfraz@google.com>
2016-07-27 19:21:16 -04:00
Arnaud Porterie
95ede360e8 Merge pull request #25013 from dnephin/remove-extraneous-aliases
Remove extraneous mount cli aliases
2016-07-27 22:51:56 +00:00
Sebastiaan van Stijn
1a7d339d36 Merge pull request #24816 from stevvooe/service-ps-over-tasks
cli: `docker service|node|stack ps` instead of tasks
2016-07-27 23:13:28 +02:00
Michael Crosby
297745b1cd Merge pull request #24760 from anusha-ragunathan/plugin-events
Make daemon events listen for plugin lifecycle events.
2016-07-27 13:36:49 -07:00
Daniel Nephin
39a3700c01 Remove extraneous mount aliases.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-27 15:05:31 -04:00
Tibor Vass
b90f6d780a Merge pull request #25131 from mavenugo/restoreln
Vendoring libnetwork to fix #25109
2016-07-27 11:09:27 -07:00
Stephen J Day
0aa4e1e689
cli: docker service|node|stack ps instead of tasks
Rather than conflict with the unexposed task model, change the names of
the object-oriented task display to `docker <object> ps`. The command
works identically to `docker service tasks`. This change is superficial.

This provides a more sensical docker experience while not trampling on
the task model that may be introduced as a top-level command at a later
date.

The following is an example of the display using `docker service ps`
with a service named `condescending_cori`:

```
$ docker service ps condescending_cori
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 13 minutes ago  Running        6c6d232a5d0e
```

The following shows the output for the node on which the command is
running:

```console
$ docker node ps self
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
b1tpbi43k1ibevg2e94bmqo0s  mad_kalam.1           mad_kalam           apline  Accepted 2 seconds ago  Accepted       6c6d232a5d0e
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 12 minutes ago  Running        6c6d232a5d0e
4x609m5o0qyn0kgpzvf0ad8x5  furious_davinci.1     furious_davinci     redis   Running 32 minutes ago  Running        6c6d232a5d0e
```

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-07-27 11:06:42 -07:00
Justin Cormack
93bbc76ee5 Add a test that the default seccomp profile allows execution of 32 bit binaries
While testing #24510 I noticed that 32 bit syscalls were incorrectly being
blocked and we did not have a test for this, so adding one.

This is only tested on amd64 as it is the only architecture that
reliably supports 32 bit code execution, others only do sometimes.

There is no 32 bit libc in the buildpack-deps so we cannot build
32 bit C code easily so use the simplest assembly program which
just calls the exit syscall.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-27 18:42:34 +01:00
Aaron Lehmann
a861255ac2 Merge pull request #25010 from sfsmithcha/change_rolling_update
update rolling update tutorial to reflect default parallelism
2016-07-27 10:13:16 -07:00
Charles Smith
6440cacd49 update rolling update tutorial to reflect default parallelism and update on failure
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-27 09:36:05 -07:00
Brian Goff
abf0e9f071 Merge pull request #25111 from coolljt0725/fix_25110
Fix daemon panic on restoring containers
2016-07-27 11:43:45 -04:00
Madhu Venugopal
b1ae883d3f Vendoring libnetwork to fix #25109
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-27 08:41:46 -07:00
Sebastiaan van Stijn
2c947a4b00 Merge pull request #25067 from lixiaobing10051267/masterBreak
Add break after found = true
2016-07-27 14:44:13 +02:00
Sven Dowideit
296378d575 Merge pull request #25120 from thaJeztah/put-back-1.12-links
Add back links to 1.12 release in deprecated.md
2016-07-27 21:48:10 +10:00
Sven Dowideit
415ef83e02 Merge pull request #25119 from thaJeztah/pre-1.12-ga-fixes
Remove release-candidate advisories
2016-07-27 21:43:37 +10:00
Sebastiaan van Stijn
e07ff10f70 Merge pull request #25104 from cpuguy83/fix_TestApiSwarmRaftQuorum
fix race in TestApiSwarmRaftQuorum
2016-07-27 12:50:09 +02:00
Vincent Demeester
ef63637b99 Merge pull request #25107 from stevvooe/cleanup-leader-election-test
integration-cli: cleanup leader election tests
2016-07-27 12:47:33 +02:00
Vincent Demeester
6857c0a040 Merge pull request #25057 from lixiaobing10051267/masterTestChtimes
Modify func name from TestChtimes to TestChtimesLinux
2016-07-27 11:58:04 +02:00
Vincent Demeester
468ca5bb08 Merge pull request #25071 from yongtang/07252016-docs-bundlefile-example
Add a bundlefile example in the documentation
2016-07-27 11:56:38 +02:00
Vincent Demeester
ffd96a7c73 Merge pull request #25080 from crosbymichael/build-directive
Move directive out of globals
2016-07-27 11:35:25 +02:00
Sebastiaan van Stijn
cd69b94241
Add back links to 1.12 release in deprecated.md
These links were temporarily changed, because the
docs were published before the 1.12.0 tag was
available.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-27 11:30:42 +02:00
Sebastiaan van Stijn
fb7edde4f2 Merge pull request #25118 from thaJeztah/various-docs-fixes
fix minor docs issues
2016-07-27 11:27:34 +02:00
Sebastiaan van Stijn
053ac127ab
Remove release-candidate advisories
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-27 11:24:16 +02:00
Sebastiaan van Stijn
d8434eba46
fix minor docs issues
this brings back the trailing whitespace in "runmetrics",
that were there intentially to force a line-break

also removes a duplicate redirect, that was present
on two pages

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-27 11:09:57 +02:00
Sebastiaan van Stijn
d8c9fd0af9 Merge pull request #24970 from sfsmithcha/daemonless_containers
add doc for live-restore setting and daemonless containers, fix admin…
2016-07-27 11:00:15 +02:00
Sebastiaan van Stijn
59e341667f Merge pull request #24955 from sfsmithcha/add_how_services_work
add how services work to how swarm mode works guide
2016-07-27 10:59:08 +02:00
Lei Jitang
c75de8e33c Fix daemon panic on restoring containers
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-07-26 22:52:52 -04:00
Brian Goff
5d65ba4ca7 Merge pull request #25085 from aaronlehmann/restart-delay-integration-tests
Specify a lower restart delay for swarm integration tests
2016-07-26 22:18:28 -04:00
Brian Goff
ebeee32b4e Merge pull request #25084 from yongtang/25029-flaky-TestSwarmNodeTaskListFilter
Fix flaky TestSwarmNodeTaskListFilter by waiting for task fully deployed
2016-07-26 22:16:54 -04:00
Stephen J Day
946e23776b
integration-cli: cleanup leader election tests
Ensure convergence before moving on with testing leader election
conditions. This reduce the flakiness of this test when run in different
environments.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-07-26 19:12:27 -07:00
lixiaobing10051267
1df9f0932e Modify func name from TestChtimes to TestChtimesLinux
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Modify func note

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-07-27 10:05:59 +08:00
Brian Goff
4a856d7a87 fix race in TestApiSwarmRaftQuorum
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-26 21:32:56 -04:00
Brian Goff
bb27d017f3 Merge pull request #25086 from dmcgowan/overlay2-fix-sub-directory-whiteouts
Fix overlay2 sub directory whiteouts
2016-07-26 20:45:41 -04:00
Alexander Morozov
646f04799c Merge pull request #25053 from AkihiroSuda/fixPluginPanic
Fix pkg/plugins TLSConfig panic
2016-07-26 16:49:49 -07:00
Michael Crosby
5c18c207cb Merge pull request #25094 from crosbymichael/remvoe-systemd-require
Remove the Require on the socket for the rpm
2016-07-26 15:01:19 -07:00
Michael Crosby
3cddda3bbb Remove the Require on the socket for the rpm
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-07-26 14:56:27 -07:00
Brian Goff
3b8ef038c1 Merge pull request #25083 from mapk0y/fix-doc-ipaddress
fixes the ipaddress of the explanation.
2016-07-26 16:07:51 -04:00
Aaron Lehmann
c93c649258 Specify a lower restart delay for swarm integration tests
If no restart delay is specified for a swarm service, the default
restart delay is 5 seconds. This is a reasonable value for actual
deployments - one example of where it's useful is that if a bad image is
specified, the orchestrator will wait 5 seconds between attempts to
restart it instead of restarting it in a tight loop.

In integration tests, this 5 second delay is dead time. The tests run
faster if the delay is reduced. Set it to 100 ms to avoid the waste of
time.

This appears to speed up a few tests:

DockerSwarmSuite.TestApiSwarmForceNewCluster 37.241s -> 34.323s
DockerSwarmSuite.TestApiSwarmRestartCluster  22.038s -> 15.545s
DockerSwarmSuite.TestApiSwarmServicesMultipleAgents 24.456s -> 19.853s
DockerSwarmSuite.TestApiSwarmServicesStateReporting 19.240s -> 10.049s

...a small step towards making the Swarm integration tests run in a
reasonable amount of time.

Also, change the update delay for the rolling update test from 8 seconds
to 4 seconds, which should be sufficient to differentiate between
batches of updated tasks. This reduces the runtime for
DockerSwarmSuite.TestApiSwarmServicesUpdate from 28s to 20s.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-26 12:12:43 -07:00
Derek McGowan
1c0f6653ba Fix files in subdirectories creating bad whiteout
Closes #23863

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-07-26 12:03:55 -07:00
Derek McGowan
5c05b8447d Update diff apply test to check sub directories
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-07-26 12:03:55 -07:00
Yong Tang
63c0366bc9 Fix flaky TestSwarmNodeTaskListFilter by waiting for task fully deployed
This is an attempt to fix the flaky test of TestSwarmNodeTaskListFilter in 25029.

Basically this fix adds a check to wait until 3 containers has already up,
before processing `node tasks ...`.

This might fix 25029.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-07-26 11:56:58 -07:00
Charles Smith
08d1995fbf Merge pull request #25076 from sfsmithcha/add_manage_nodes_guide
author merge: add swarm manage nodes guide
2016-07-26 11:33:46 -07:00