Commit Graph

21431 Commits

Author SHA1 Message Date
2f7e1dc6a8 Merge pull request #21159 from runcom/fix-retry-push-bug
distribution: errors: do not retry if no credentials provided
Upstream-commit: 0b962f72a97c5e1cde020cc948704e61ab8dfc0a
Component: engine
2016-03-14 09:47:13 -07:00
937fbaecf3 Merge pull request #21131 from estesp/gcc-devmapper-test-broken
Fix gcc compile test with proper flag ordering
Upstream-commit: 3771a1713bac935721ffe2ed7c828a47dbe4924e
Component: engine
2016-03-14 09:46:49 -07:00
cd7673772c Merge pull request #21123 from justincormack/libseccomp23
Update statically linked libseccomp to 2.3.0
Upstream-commit: d95723f5efbda12c854491250b06931b47145228
Component: engine
2016-03-14 09:45:29 -07:00
83045d547d Merge pull request #20970 from dmcgowan/login-oauth
OAuth support for registries
Upstream-commit: b9361f02da25108af75238093959634e433d72a0
Component: engine
2016-03-14 15:49:44 +01:00
38c767cc35 Merge pull request #20990 from sds/fix-data-volume-rest-api-docs
Fix documentation for creating containers with data volumes
Upstream-commit: f480c696251906d86c800b5cf3660c48335e361c
Component: engine
2016-03-14 15:06:40 +01:00
9fbfb6e6c5 Merge pull request #21134 from tophj-ibm/fix-logtest-on-empty-log
Fix error-checking when looking at empty log
Upstream-commit: 93e04e705a3cdd639b90aef18ca98eb5db9518d3
Component: engine
2016-03-14 10:00:57 -04:00
7c5d8d17ae Merge pull request #21138 from tophj-ibm/add-notary-binary-test-requirement
Add notary binary requirement for tests
Upstream-commit: 30999ba50c8b1258de8cc6b5f05452114a87590e
Component: engine
2016-03-14 13:34:06 +01:00
cad593b9ac integration-cli: add tests for case a) and d) in #21054
- add test for pull from private registry with no credentials
- add test for push to docker hub with no credentials

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Signed-off-by: Antonio Murdaca <amurdaca@localhost.localdomain>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 6d23c3c57a733436d902b7883f2f0b00846df9e2
Component: engine
2016-03-14 12:43:10 +01:00
10aa342590 Merge pull request #21160 from mavenugo/staleep
Include all endpoints in network inspect object
Upstream-commit: 901c67a8eeabc64e53539b5f3d5aac9c9196a037
Component: engine
2016-03-14 11:36:04 +01:00
5963d3bf40 Fix the typo url and info
Some info is not consistent between context and word.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: f6bd62a8d735d4748dc4e5e4235e04284a7f5af6
Component: engine
2016-03-14 06:34:08 +00:00
b92020dc4b Merge pull request #21120 from lirantal/feature/21119-docker-config-for-windows
closes #21119 updating documentation for Windows and OSx users
Upstream-commit: f3485bc125afbb0930674e9f5a4f02cdd9989aea
Component: engine
2016-03-14 01:38:26 +01:00
f960c0a25f Include all endpoints in network inspect object
Prior to this change, the "docker network inspect" contains only the
endpoints that have active local container. This excludes all the remote
and stale endpoints. By including all the endpoints, it makes debugging
much simpler and also allows the user to cleanup any stale endpoints
using "docker network disconnect -f {network} {endpoint-name}".

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2ef00ba89fc04b0a7571aa050d8a11c06f758d9b
Component: engine
2016-03-13 16:58:53 -07:00
3d62a1d04d Merge pull request #21122 from mavenugo/mviv
Vendor libnetwork v0.7.0-dev.7 : Experimental MacVlan and IPVlan network drivers
Upstream-commit: 2d74f78ab59c4e24c5f328f3d85671359b8ed828
Component: engine
2016-03-13 11:32:58 -07:00
60406a0aa6 closes #21119 - updating documentation for Windows and OSx users
Updating Docker's documentation file docker configuration file on Windows hosts.
This is of importance for Windows users whom are utilizing the Docker Toolbox.

Signed-off-by: Liran Tal <liran.talh@gmail.com>
Upstream-commit: d2aa521822135009168fe5a13d372fbc6969dc91
Component: engine
2016-03-13 17:55:34 +02:00
05bbd93137 Merge pull request #20977 from allencloud/fix-delete-response-status-code
return status code http.StatusNoContent in deleting network when OK
Upstream-commit: a04e16ac35e8dd9ec10462cccebf13cf29b49a51
Component: engine
2016-03-13 11:30:32 -04:00
890088fca6 Merge pull request #21155 from mountkin/broken-links
docs: fix broken links
Upstream-commit: ed6fb41321dac41f5a8975be2ca3c64fa78e28f1
Component: engine
2016-03-12 23:53:24 +01:00
2909d7c372 distribution: errors: do not retry if no credentials provided
Fix and add test for case c) in #21054

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 497d545093bce4f01455bf8d2e1658435dbb040b
Component: engine
2016-03-12 20:41:47 +01:00
1a1627292d Merge pull request #21150 from cyphar/fix-pids-stats
client: stats: fill in stats info on client
Upstream-commit: 4e7df42aa872a0244e5d4bbc5b8876046f922c7d
Component: engine
2016-03-12 11:25:15 -08:00
3bff8135d8 docs: fix broken links
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 36506b7944cf9cea9b3618f00ecfc68a41f86dd8
Component: engine
2016-03-12 21:24:55 +08:00
96dba4b028 docs: add $ before HOME
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 219e5fdda36a18104f7593da9ed8ca097a60aab3
Component: engine
2016-03-12 14:11:01 +01:00
1f1351f12b client: stats: fill in stats info on client
This code was lost in a rebase in the PIDs cgroup merge, fix it so that
`docker stats` actually shows statistics from the PIDs cgroup.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: 084241a37b5d3f680228e6bd6cb50f9d0507a365
Component: engine
2016-03-12 14:45:30 +11:00
f4df2c2057 Windows CI: Fix unit test failures
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 1fbaf6ee8b6cd0c149472bf465bbffb4e78f8b96
Component: engine
2016-03-11 19:31:08 -08:00
4f429751a9 Merge pull request #21140 from Microsoft/FlakyTestFix
Fixing flaky tests on Windows (again)
Upstream-commit: 77f501a0c6f1b584aeb0e0856e6af1ba1fbdc156
Component: engine
2016-03-11 18:49:38 -08:00
1f4d8056b5 Merge pull request #21017 from cpuguy83/use_forked_gocheck
Use forked gocheck
Upstream-commit: c73f2c95cbb89e54ae4a60701afb66d5cf1ed5dd
Component: engine
2016-03-11 20:42:44 -05:00
32fe9a153d docs for experimental vlan net drivers
Signed-off-by: Brent Salisbury <brent@docker.com>
Upstream-commit: 9cb6b51fa24b95789693fa65aa58fe3ad1f36014
Component: engine
2016-03-11 16:01:01 -08:00
b48a88b791 Experimental it for net vlan drivers
Signed-off-by: Brent Salisbury <brent@docker.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: afeea8c9ca71780cd02abc86ad61e587f26be620
Component: engine
2016-03-11 16:00:27 -08:00
2f2f22770f Merge pull request #21047 from icecrime/update_patch_process
Update patch release process
Upstream-commit: 471a1aeda8d66114d6690d45ea706bfb3e2034fc
Component: engine
2016-03-12 00:44:01 +01:00
2b71072aac Update patch release process
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 9596e3c50172fb21940f941fab686bfecfc6d239
Component: engine
2016-03-11 15:40:19 -08:00
00281f64cd Fixing flaky tests on Windows (again)
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: b756f89e1d399146fd96c20152bd4efc8505bb62
Component: engine
2016-03-11 14:48:52 -08:00
5bcbfd7abb Add notary binary requirement for tests
This PR adds the "notary" binary requirement for tests.

Previously, NotaryHosting was checking for the "notary-server"
binary under the name notaryBinary. This renames that reference to
notaryServerBinary, so that notaryBinary can rightly refer
to the actual "notary" binary.

Currently only one test actually uses the notary binary, so it's been
updated accordingly.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: db700a678d1da4275553ff7201e2597c7a8016ee
Component: engine
2016-03-11 17:36:12 -05:00
f943c3b499 Vendor libnetwork v0.7.0-dev.7
* Experimental support for macvlan and ipvlan drivers

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 9047cd40c2b2eb0609132800b9b8752d1cad0fcc
Component: engine
2016-03-11 14:22:25 -08:00
0bad8836e9 Merge pull request #21076 from calavera/fix_builtin_graphdriver_init
Make sure we call every graph init with the same root path.
Upstream-commit: e2d245ad816af8ace52647345ca77b9d0eab641e
Component: engine
2016-03-11 14:20:39 -08:00
78153006fc Make sure we call every graph init with the same root path.
Remove O(n^2) check for several prior configured drivers.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: ed6e33eedeaa6b7da44d3b0b3e2eac020b09277a
Component: engine
2016-03-11 17:15:55 -05:00
54863887b3 Document Volume Removal in User Guide
Resolves: #20113
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>

Carry #20160
Tighten language
Updating with comments
Removing articles which is empty
Adding Brian's comments
Putting back what I took out

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: ae66d536a5928c9134a4a70761ebc93de0320197
Component: engine
2016-03-11 12:29:47 -08:00
c65cd60941 Fix error-checking when looking at empty log
Fixes a bug when the log output is empty.

The length of a slice containing an empty string is 1, not 0, so
the test fails to catch when the log is empty. Instead, take a look at
out, which is just a string.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 2a0291489247b79058f0f94a2af7c5b3f89b78af
Component: engine
2016-03-11 15:09:00 -05:00
e515f9e88b Fix gcc compile test with proper flag ordering
This test for libdevmapper was always silently failing because the
linker never got the `-ldevmapper` information. Putting the flag last
corrects the test.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: e2076453071f9fc82478557919d327c958eec712
Component: engine
2016-03-11 15:08:58 -05:00
86b3710469 use per-check timeouts
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 11d3f7092e38e1e90d926595c5a4ab9ff0da535c
Component: engine
2016-03-11 14:38:52 -05:00
4f99aa8f32 Use forked gocheck and vendor
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e6e0837cbbebca0736f27b473ffa14c991c77787
Component: engine
2016-03-11 14:38:50 -05:00
14e98ee04a Merge pull request #21127 from icecrime/add_john_maintainer
Add @jhowardmsft to maintainers
Upstream-commit: 949e53a0f1407a550051753f3d92cad5e0670edc
Component: engine
2016-03-11 11:14:37 -08:00
2d0ed2163e Add @jhowardmsft to maintainers
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 11d10b77acd106c9a5857de382a719efb6b65a47
Component: engine
2016-03-11 10:47:14 -08:00
841463d9b8 Merge pull request #21129 from allencloud/fix_typos
fix typos
Upstream-commit: 9842c7a741ee480c71bfd8e71e1f22893d010411
Component: engine
2016-03-11 10:16:40 -08:00
b1a872ce31 Merge pull request #21100 from aaronlehmann/remove-windows-specific-registry
Remove Windows-specific default registry definitions
Upstream-commit: 12c67f42d85103c57c14f27579ff46fccdc3ee07
Component: engine
2016-03-11 09:31:55 -08:00
19d229cc30 Merge pull request #20476 from wenchma/19425-TestDaemonStartWithDaemonCommand
Optimize slow bottleneck tests of TestDaemonStartWithDaemonCommand
Upstream-commit: 1c0474ed63ac08a3e280ecf7eebcb9e53ae92c8d
Component: engine
2016-03-11 10:54:48 -05:00
1585d5df26 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: bbeb859b6490a03d7c4265762711b551c22e914d
Component: engine
2016-03-11 23:22:16 +08:00
8e1d3b0522 Update statically linked libseccomp to 2.3.0
Fixes #20550

This update to libseccomp supports the new versions of socket
system calls that can be called directly rather than via the
socketcall syscall in kernel versions 4.3 or later with new glibc.

Note this library version now supports s390x and ppc64le, so
seccomp can be potentially be enabled for these architectures now.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 68bda672dc0fb53c5247047104e09c7f8346e24e
Component: engine
2016-03-11 13:01:30 +00:00
a1a5012791 Merge pull request #21098 from kencochrane/fix_vendoring_script_macosx
Fix the vendoring script on MacOS X
Upstream-commit: 9ad946eded6fb05ddc331bd565473ea68b83bdd9
Component: engine
2016-03-10 22:45:55 -05:00
88e5d1888e Remove Windows-specific default registry definitions
Going forward, Docker won't use a different default registry on Windows.
This changes Windows to use the standard Docker Hub registry as the
default registry.

There is a plan in place to migrate existing images from the Windows
registry to Hub's normal registry, in advance of the 1.11 release. In
the mean time, images on the Windows registry can be accessed by
prefixing them with `registry-win-tp3.docker.io/`.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 87535ca2e9fee074b4174ecc5b01c91a9e922f54
Component: engine
2016-03-10 18:33:14 -08:00
f1c35029ca Put back the hack that was originally in place.
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: 94445b2fea906df1bedec40284591d752def18e2
Component: engine
2016-03-10 20:27:44 -05:00
2a8c1acb35 Merge pull request #21102 from tiborvass/template-improve-contrast
Improve github templates
Upstream-commit: edf3c0f11240368baf54ece0b3cb2b5214294b89
Component: engine
2016-03-10 20:18:30 -05:00
76b88b0399 Merge pull request #21045 from calavera/registry_config_options
Move registry service options to the daemon configuration.
Upstream-commit: 1d094255d57090d34b2c11c12b253c277ae1ce28
Component: engine
2016-03-11 00:48:55 +01:00