Commit graph

25461 commits

Author SHA1 Message Date
Kenfe-Mickael Laventure
fd1129d31a Prevent CI from getting stuck if shims are left alive
This will kill any left over containerd-shims to avoid the integration
script to stay stuck while it waits on them.

It will then causes CI to fail (even if all the tests succeeded).

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-28 10:05:05 -07:00
Brian Goff
83e6197380 Merge pull request #24025 from AkihiroSuda/fixzfsdoc
update storagedriver/zfs-driver.md for Ubuntu 16.04 LTS
2016-06-28 10:05:44 -04:00
Vincent Demeester
e7e9b183fd Merge pull request #24032 from feldan/24030-malformed_history_layer
Fix Malformed history layer - missing Sprintf
2016-06-28 13:37:49 +02:00
danf
29b6a69660 Fix Malformed history layer - missing Sprintf in append of shell in Builder run config
Signed-off-by: Dan Feldman <danf@jfrog.com>
2016-06-28 11:09:39 +03:00
Qiang Huang
1997081096 Fix comments in Dockerfile.aarch64
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-06-28 14:31:34 +08:00
Akihiro Suda
ddf9b6f666 update storagedriver/zfs-driver.md for Ubuntu 16.04 LTS
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-06-28 06:11:03 +00:00
Sebastiaan van Stijn
2875c5404e Merge pull request #24021 from londoncalling/add-redirect-for-getting-started
added another alias for getting started stuff
2016-06-27 23:01:09 -07:00
Victoria Bialas
4060eb02ef added another alias for getting started stuff
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-06-27 18:58:16 -07:00
Sebastiaan van Stijn
1c06ebeeee Merge pull request #23950 from jstarks/no_clone_tp5
Windows: Disable VM cloning for TP5 image
2016-06-27 15:13:50 -07:00
Alexander Morozov
378f0657f9 daemon/logger: fix races in channel close
it's actually not okay to do such trick from multiple goroutines

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-06-27 14:14:23 -07:00
Sebastiaan van Stijn
8e8ef7c724 Merge pull request #23182 from crosbymichael/maxkeys
Change root_maxkeys
2016-06-27 13:46:11 -07:00
Vincent Demeester
ee658a5aa5 Merge pull request #24002 from crosbymichael/update-containerd-jun27
Update containerd to b93a33be39bc4ef0fb00bfcb79147
2016-06-27 22:35:38 +02:00
Michael Crosby
48eba0bfe6 Merge pull request #23677 from anusha-ragunathan/mv_test_stable
Move daemon restart tests from experimental to stable.
2016-06-27 13:07:55 -07:00
Vincent Demeester
276ed3755e Merge pull request #22980 from thaJeztah/deprecate-shorthand-help
deprecate '-h' shorthand and remove '-help'
2016-06-27 21:45:04 +02:00
Vincent Demeester
47a6196fc8 Merge pull request #23993 from allencloud/change-code-in-plugin
fix bug in plugins
2016-06-27 21:32:28 +02:00
Tibor Vass
b01c46e1d8 Merge pull request #23867 from thaJeztah/fix-install-script
Fix installation script for RHEL
2016-06-27 12:27:56 -07:00
Michael Crosby
91fa49071d Merge pull request #23775 from mlaventure/change-stock-runtime-alias
Use "runc" as alias for the default runtime
2016-06-27 11:55:46 -07:00
Michael Crosby
7db7e04631 Update containerd to b93a33be39bc4ef0fb00bfcb79147
This updates containerd to b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
fixing the start sync issues.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-27 11:45:05 -07:00
Sebastiaan van Stijn
6add695084 deprecate '-h' shorthand and remove '-help'
This deprecates the shorthand '-h', because we don't mention it as an option,
and it conflicts with the 'docker create -h/--hostname' option, so cannot be
used for all commands consistently.

This also removes the (single-dash) '-help' option. The single-dash variant was
marked "deprecated" in version 1.5.0 (basically, since it was added in
a2b529ead2), but still kept around to
prevent '-help' being treated as '-h -e -l -p', causing confusing
warnings.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-27 11:29:37 -07:00
Michael Crosby
ca3e4545aa Change root_maxkeys
Most modern distros have the limit for the maximum root keys at 1000000
but some do not.  Because we are creating a new key for each container
we need to bump this up as the older distros are having this limit at
200.

Using 1000000 as the limit because that is that most distros are setting
this to now.  If someone has this value configured over that we do not
change it.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-27 10:23:37 -07:00
allencloud
2281ce7e98 add err handling, close fd
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-27 23:51:54 +08:00
Brian Goff
cccfe63e86 Merge pull request #23868 from albers/completion-swarm-enhancements
bash completion enhancements for `docker {swarm,node,service}`
2016-06-27 10:55:54 -04:00
Brian Goff
e2a26744f9 Merge pull request #23697 from dongluochen/blockServiceModeChange
Do not allow service mode change
2016-06-27 10:53:53 -04:00
Brian Goff
982fc5edca Merge pull request #23967 from duglin/removeLine
Remove blank line on daemon output when there are no containers to load
2016-06-27 09:48:41 -04:00
Vincent Demeester
1cfd37f432 Merge pull request #23801 from inercia/fix_docker_cli_by_digest
Make sure some integration tests check for the right return code
2016-06-27 15:37:59 +02:00
Brian Goff
c83a97f62f Merge pull request #23982 from allencloud/uppercase-output-in-node-inspect
uppercase output in node inspect to keep consistency
2016-06-27 09:24:36 -04:00
allencloud
89582e1a34 uppercase output in node inspect to keep consistency
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-27 18:29:27 +08:00
Alvaro Saurin
b5f51e5281 Change the comments in TestPullFailsWithAlteredLayer and TestPullFailsWithAlteredLayer
Signed-off-by: Alvaro Saurin <alvaro.saurin@gmail.com>
2016-06-27 11:06:32 +02:00
Sven Dowideit
1d2adbdd52 Merge pull request #23743 from alxempirical/alxempirical-20160618-clarify-role-of-dockerhost
Clarify the role of `dockerhost` in the apt-cacher-ng example.
2016-06-27 11:42:56 +10:00
Sven Dowideit
96b0323cf0 Merge pull request #23842 from tjanez/docs-systemd-default-target
Use 'default.target' in systemd unit file example
2016-06-27 11:42:05 +10:00
Doug Davis
478dd721ab Remove blank line on daemon output when there are no containers to load
Its a minor thing but the daemon's output looks like this when there are
no containers to load:
```
INFO[0001] Loading containers: start.

INFO[0001] Loading containers: done.
```
That blank line (or more correctly, the \n) is unnecessary when
there are no containers to load since there is no `.` printed

Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-06-26 10:51:34 -07:00
Yong Tang
3707a76921 Fix wrong CPU count after CPU hot-plugging on Windows
This fix tries to fix wrong CPU count after CPU hot-plugging.
On windows, GetProcessAffinityMask has been used to probe the
number of CPUs in real time.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-25 22:20:29 -07:00
Yong Tang
33badc189c Revendor golang.org/x/sys/ to have unix package included.
This commit updates golang.org/x/sys/ in order to have needed unix
package included.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-25 20:50:02 -07:00
Yong Tang
8b2383f5c1 Fix wrong CPU count after CPU hot-plugging
This fix tries to address issues raised in #23768 where the CPU count
is not updated after cpu ho-plugging.

This fix follows the suggestion from #23768 and replace go's `runtime.NumCPU()`
with `sysconf(_SC_NPROCESSORS_ONLN)` so that correct CPU count could
be obtained even after CPU hot-plugging.

This fix is tested manually, as is suggested in #23768.

This fix fixes #23768.

The NumCPU() in Linux is based on @wmark 's implementation.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-25 20:48:36 -07:00
Brian Goff
d4bff5e3aa Merge pull request #23944 from tonistiigi/disable-iptables
Disable iptables in swarm test daemons
2016-06-25 20:22:59 -04:00
Sebastiaan van Stijn
5c33d13cd8 Merge pull request #23956 from vdemeester/docs-dsb-to-dab
Update experimental docs dsb -> dab
2016-06-25 10:20:00 -07:00
Vincent Demeester
8af760c910
Update experimental docs dsb -> dab
Fixing bundle extension in experimental documentation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-25 19:08:03 +02:00
Vincent Demeester
58f1ae1641 Merge pull request #23945 from aanand/update-bundle-extension
Update bundle extension
2016-06-25 17:00:33 +02:00
Vincent Demeester
9ed0feece8 Merge pull request #23939 from vdemeester/rename-same-no-lock
No need for container.Lock if rename same name
2016-06-25 14:56:20 +02:00
Vincent Demeester
eae254d98b Merge pull request #23942 from aaronlehmann/sanbox
Fix "sanbox" typos
2016-06-25 11:27:46 +02:00
Alexander Morozov
b2ba44b11d Merge pull request #23934 from cpuguy83/23862_fix_bind_opts
Fix panic due to nil bind options
2016-06-24 16:17:38 -07:00
John Starks
8e34322253 Windows: Disable VM cloning for TP5 image
The Windows TP5 image is not compatible with the Hyper-V isolated
container clone feature. Detect old images and pass a flag specifying that
clone should not be enabled.

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-06-24 16:12:44 -07:00
John Starks
e602225160 Revendor github.com/Microsoft/hcsshim
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-06-24 16:12:43 -07:00
Tonis Tiigi
caaf92f7b4 Disable iptables in swarm test daemons
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-24 15:47:37 -07:00
John Starks
5fd8edec1c Report load progress on compressed layer size
When calling docker load on an image tar containing a compressed layer,
apply NewProgressReader to the compressed layer (whose size is known), not
the uncompressed stream. This fixes progress reporting to the client in
this case.

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-06-24 15:28:26 -07:00
Sebastiaan van Stijn
e5a8a7747e Merge pull request #23281 from yongtang/23211-spf13-cobra-update
Use spf13/cobra for docker update
2016-06-24 14:31:53 -07:00
Tonis Tiigi
1acb8ef825 Add test for force-new-cluster
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-24 13:57:11 -07:00
Tonis Tiigi
1a8a473017 Fix race on clearing swarm nodes on stop
On stop there were multiple places that marked
`cluster.node` nil. Now stop waits for the node to
set itself nil.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-24 13:57:02 -07:00
Brian Goff
7ff546467d Merge pull request #23940 from allencloud/fix-err-msg
fix error message and typos in swarm cluster
2016-06-24 16:57:01 -04:00
Brian Goff
824290a37e Merge pull request #23935 from LK4D4/fix_net_create_use
cli: fix network create usage
2016-06-24 16:55:12 -04:00