Commit Graph

20821 Commits

Author SHA1 Message Date
e56e27b666 Move getContext… function to builder package
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 312f5e435bed2ca45477dc9e4713d35aabe37075
Component: engine
2016-02-11 20:59:59 +01:00
c9c9d43ade Move listeners and port allocation outside the server.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 34c29277c2c1fd1d1adc4409dc7075685f681de4
Component: engine
2016-02-11 14:42:49 -05:00
98ae33ee9b Add "dummy" network module for arm images.
A few libnetwork integration tests require that the kernel be configured
with the "dummy" network interface and has the module loaded. However,
the dummy module is not available by default on arm images. This ensures
that it is built and loaded.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: f3b2233d126aec8ab15fa589f5a9360eec280f01
Component: engine
2016-02-11 10:53:51 -08:00
bd6d7c6931 Fall back to V1 when there are no basic auth credentials
This makes the behavior consistent with having incorrect credentials.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 7b81bc147cf75cb32697e8fdf88e05ae879cb879
Component: engine
2016-02-11 10:48:11 -08:00
ece54e525a Update vendored docker/distribution
The registry/client/auth package now provides ErrNoBasicAuthCredentials.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 4436f07ef42d367a801695c9bfac521e85072033
Component: engine
2016-02-11 10:28:18 -08:00
3f33957369 Merge pull request #20124 from calavera/fix_vendor_codec_cleanup
Do not purge github.com/ugorji/go/codec from vendor.
Upstream-commit: 944e4cab2ed8370f088416ccb3cad890f3aa5102
Component: engine
2016-02-11 12:51:35 -05:00
2d3744313f Merge pull request #20234 from kiawin/20232-improve-overriding-user-command-details
Improve usage details on overriding USER command in Docker run refere…
Upstream-commit: d4d0b8a42bcf5e5e1df3565101277dc10843735a
Component: engine
2016-02-11 18:18:26 +01:00
8625825024 Merge pull request #20214 from mavenugo/vin0.7.0-dev.1
Vendor libnetwork v0.7.0-dev.2
Upstream-commit: 6672d7de200d938f6a6c4e372c31712318e54dc2
Component: engine
2016-02-11 12:12:58 -05:00
743f98d553 Merge pull request #20233 from tianon/busybox-dbus
Remove "--group-add dbus" from busybox example (no dbus group in busybox anymore)
Upstream-commit: f6523a44ccae5a69aba41a769a3b1b054e1f22ad
Component: engine
2016-02-11 11:43:28 -05:00
66b576e776 Merge pull request #20230 from estesp/zfs-ref-counting
Add proper refcounting to zfs graphdriver
Upstream-commit: 803e3d4d1e7b9f029bbe31a80197403bf4d27252
Component: engine
2016-02-11 08:27:26 -08:00
ac0021ada8 Do not purge github.com/ugorji/go/codec from vendor.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d11a2c758a497500bba08495f218b8f242fafad3
Component: engine
2016-02-11 11:22:55 -05:00
784a3213bb Remove "--group-add dbus" from busybox example (no dbus group in busybox anymore)
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: b1e5c773b28d27a67d20c0aa0182d40005cfdb50
Component: engine
2016-02-11 08:20:28 -08:00
d0366b3eb4 Improve usage details on overriding USER command in Docker run reference page
Signed-off-by: Sian Lerk Lau <kiawin@gmail.com>
Upstream-commit: bc3e02b9ec4702981bbbd337e4f6ca12bf4eb202
Component: engine
2016-02-12 00:05:32 +08:00
b27ac0630e Merge pull request #20209 from aaronlehmann/upper-case-hostnames
Allow uppercase characters in image reference hostname
Upstream-commit: acd8baccff10642e1d44a342414cd196b81a4605
Component: engine
2016-02-11 10:50:05 -05:00
4a90ae0f7e Merge pull request #19720 from vdemeester/carry-pr-18912
Carry #18912 : Docker Remote API documentation update
Upstream-commit: f923e5a5a441ab3f7fc70816f339f06718ea13bb
Component: engine
2016-02-11 16:40:59 +01:00
3410e379c1 Merge pull request #19840 from aaronlehmann/resumable-downloads
Add support for resuming downloads on transfer failure
Upstream-commit: 2edd5f698ce28659154b8404034250bbfeb2ac52
Component: engine
2016-02-11 10:32:17 -05:00
47f5776cce Improve remote integration-cli tests
Progress toward being able to run integration-cli campaign using a
client hitting a remote host.

Most of these fixes imply flagging tests that assume they are running on
the same host than the Daemon. Also fixes the `contrib/httpserver` image
that couldn't run because of a dynamically linked Go binary inside the
busybox image.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: a943c401509e7994ae5c574a4b7e23354e44a105
Component: engine
2016-02-11 07:31:49 -08:00
1d794c30ed Docker Remote API documentation update
I was confused for the longest time on how to actually use and make requests against the remote API, so I think that it might help for those getting started with it to know how to actually test it out via curl. I added in parts on how to access the remote API via curl against the default unix socket, and also on how to configure the docker daemon to expose the API on a TCP port as well if desired.

Signed-off-by: Michelle Liu <michelle@michelleliu.io>
Upstream-commit: 2c60a9cba2e0920c9f1e8a193dcf0b6ddad71c5a
Component: engine
2016-02-11 16:28:15 +01:00
09392de00e Merge pull request #20222 from vdemeester/update-shakers-vendor-licence
Update shakers vendoring to include the LICENSE 😇
Upstream-commit: e7cd3b0897a8c6009eb099eae416b4c0eebb706d
Component: engine
2016-02-11 10:23:10 -05:00
663fe6f381 Vendor libnetwork v0.7.0-dev.2
- Expose EnableIPV6 option
- discoverapi refactoring
- Fixed a few typos & docs update
- Fixes https://github.com/docker/docker/issues/20140

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: b2e609176d1233eb845785dfdd72b4b747171178
Component: engine
2016-02-11 07:09:53 -08:00
b547022504 Merge pull request #20052 from aditirajagopal/19301-overlay-network-unique-hostname
Overlay Network needs Unique Hostname
Upstream-commit: 2cca097ea83aeffb2d2f64ef322bad9a7a79299b
Component: engine
2016-02-11 15:41:54 +01:00
704fe83e00 Merge pull request #20161 from tkopczynski/docs-before-since-filters
docker ps before and since filters documentation
Upstream-commit: 89f94ec03b73cb26963215b81e231f3cc433a38c
Component: engine
2016-02-11 15:32:50 +01:00
dd28cfc3c0 Merge pull request #20216 from Microsoft/jjh/testunit-pkgplugins-v2
Windows CI: test-unit on pkg\plugins
Upstream-commit: 5627e400fe666da8159dd7555853e4ca8fbd5933
Component: engine
2016-02-11 12:39:08 +01:00
f97ab8e007 Merge pull request #20213 from Microsoft/jjh/testunit-pkgmount
Windows CI: Unit Test - pkg/mount is Unix specific
Upstream-commit: d18c0d88f4504f258d3b3ce31f22b4205717d39c
Component: engine
2016-02-11 12:27:38 +01:00
cdd4058063 Update shakers vendoring to include the LICENSE 😇
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9ee8f0ad9d0128788440b245457e6447e52b97b4
Component: engine
2016-02-11 08:38:09 +01:00
9a0f7a0e19 Add proper refcounting to zfs graphdriver
Fixes issues with layer remounting (e.g. a running container which then
has `docker cp` used to copy files in or out) by applying the same
refcounting implementation that exists in other graphdrivers like
overlay and aufs.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 922986b76e2ac596faed6a724cebcf7082174980
Component: engine
2016-02-11 01:00:54 -05:00
7f00edaeb1 Update Dockerfile
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 8d673d9471d80bc8032f3280001bcd46f015a84a
Component: engine
2016-02-10 20:40:30 -08:00
31b16ed933 Windows CI: test-unit on pkg\plugins
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4b3001e85aff2c51a69eec205023e32384bebbdf
Component: engine
2016-02-10 19:28:30 -08:00
7f7a4e0915 Merge pull request #20184 from fkautz/pr_out_adding_backup_key_server_in_install_script
Adding backup key server in install script
Upstream-commit: e2a0618fb1f32572f2b5b11f97278634be4ea31c
Component: engine
2016-02-10 19:08:49 -08:00
34dcc50973 Windows CI: Unit Test - pkg/mount is Unix specific
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d509e615404d8e6f568cf30b6ad37311d4698ece
Component: engine
2016-02-10 18:09:15 -08:00
91c83926d7 Remove back-compat hacks from for volume plugins.
Hacks were added as interim support for 1.10 but should not be needed
for 1.11.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 3403a01b07a73defe9f15c30e16ec8dfcab50439
Component: engine
2016-02-10 20:43:20 -05:00
13ec79c31c Probe all drivers if volume driver not specified
This fixes an issue where `docker run -v foo:/bar --volume-driver
<remote driver>` -> daemon restart -> `docker run -v foo:/bar` would
make a `local` volume after the restart instead of using the existing
volume from the remote driver.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 00ec6102d993a752bd8dfb4ee393a4e58e59a4fe
Component: engine
2016-02-10 20:43:15 -05:00
e9caeb643b Merge pull request #20210 from Microsoft/jjh/hcswin32-v2
Windows: Revendor HCS to use revised error scheme
Upstream-commit: dfebb6074f62891368cb3c668380c186f3bebb33
Component: engine
2016-02-10 17:20:14 -08:00
145acef25d Merge pull request #19903 from londoncalling/cloud-installs-rel-a
added better what's next topics to point to new machine docs related …
Upstream-commit: ae8551c14482be085a6872f9541e3aa8c59a8ba3
Component: engine
2016-02-11 01:33:26 +01:00
c35751d5f0 Merge pull request #20170 from Microsoft/10662-TestBuildCI5
Fifth set of TestBuild CI enables for Windows
Upstream-commit: 9be87be582f1c4539e84385c1ac917418c015cdd
Component: engine
2016-02-10 16:02:26 -08:00
d9ac9a5f49 Merge pull request #20208 from Microsoft/jjh/testunit-layer
Windows CI UnitTest TestLayerSize-->Unix
Upstream-commit: f1bf015ed805aa37b700ebe5d920a00f7f604ec8
Component: engine
2016-02-10 15:30:14 -08:00
0fe9b6b4f3 Windows: Use new error code mechanism from HCS
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 54263a93933a4a53f44ddea58ac16b2526e136e3
Component: engine
2016-02-10 14:48:24 -08:00
3e249a8f81 added better what's next topics to point to new machine docs related to Issue #18282
updated cloud install example per Olivier's comments, added better command examples

updates per @thaJeztah comments

fixed links per @theJeztah comments, renamed cloud.md to overview.md for better URL name

updates per @moxiegirl comments, added alias for renamed file, modified links, changed a title

fixed link errors

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 4e9e95fe8d9ba177ec77727b6fca558a0ba8f01f
Component: engine
2016-02-10 14:19:05 -08:00
633d5a3bff Windows: Revendor HCSShim@43858ef3
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: fadbbd335cfb6d32566267385e820b36c356c14e
Component: engine
2016-02-10 14:14:45 -08:00
176a1e6aa2 Allow uppercase characters in image reference hostname
This PR makes restores the pre-Docker 1.10 behavior of allowing
uppercase characters in registry hostnames.

Note that this only applies to hostnames, not remote image names.
Previous versions also prohibited uppercase letters after the hostname,
but Docker 1.10 extended this to the hostname itself.

- Vendor updated docker/distribution.

- Add a check to "normalize" that rejects remote names with uppercase
  letters.

- Add test cases to TestTagValidPrefixedRepo and
  TestTagInvalidUnprefixedRepo

Fixes: #20056

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: e2afab9c4a8be800dffee9b60b2197350987543c
Component: engine
2016-02-10 14:03:41 -08:00
2e29d70d4a Windows CI UnitTest TestLayerSize-->Unix
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 298d28014323a02b49614d2b91cd2adf0baa6ae1
Component: engine
2016-02-10 13:57:26 -08:00
58e5e14eef Revendor engine-api @ ddfd776c
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: dfdce6e35ce67c8cb8b321588a577adbb02caca5
Component: engine
2016-02-10 13:26:35 -08:00
f35a03ff6d Windows: Fix 'isolation'
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d4b0732499feac87cf7c433b9490a4e21e94fb45
Component: engine
2016-02-10 13:19:19 -08:00
87cce96d08 Merge pull request #20205 from calavera/remove_last_daemon_references
Remove daemon dependency from api/server.
Upstream-commit: 2658341b5fe9dec5c4839f0721219111fb08b43f
Component: engine
2016-02-10 13:13:53 -08:00
291efe0a93 Merge pull request #19814 from Microsoft/10662-TestBuildCI3
Third set of TestBuild* CI enabling for Windows
Upstream-commit: ab0102d671d9d531f99e176858ec5b2506bc77e3
Component: engine
2016-02-10 21:49:39 +01:00
104ddcecd2 Fifth set of TestBuild CI enables for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 0adcce10a1b9373c0926eaee1269f50765a49f02
Component: engine
2016-02-10 12:37:58 -08:00
5c97141da9 Remove daemon dependency from api/server.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1af76ef5970202bdbc7024d825c0fcfcc4ec6ede
Component: engine
2016-02-10 15:16:59 -05:00
c8a52b977d Windows CI: Another reliability fix
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 7853193edbd55ea5596c4df54895132ee88dc8fe
Component: engine
2016-02-10 11:07:29 -08:00
def405f4e4 Merge pull request #20165 from vdemeester/move-validatecontextdirectory-to-builder
Move validateContextDirectory to builder package.
Upstream-commit: e18eb6ef394522fa44bce7a3b9bb244d45ce9b56
Component: engine
2016-02-10 08:35:25 -08:00
f6ab952c46 Merge pull request #20183 from hypriot/fix-20002-for-multiarch
Fix TestAuthZPluginAllowEventStream for multiarch
Upstream-commit: 7e44d0ca5872290a9b56c0a381bc370a3ffbc603
Component: engine
2016-02-10 09:42:35 -05:00