Commit Graph

1032 Commits

Author SHA1 Message Date
e8b4f63208 Merge pull request #17557 from aaronlehmann/update-distribution
Vendor updated version of docker/distribution
Upstream-commit: 6964f4235035c5e94f6a0c35149783e910fed313
Component: engine
2015-11-02 14:37:04 -08:00
bf1b372cbc Vendor updated version of docker/distribution
This updates the vendored docker/distribution to the current master
branch.

Note the following changes:

- The manifest package was split into manifest/schema1. Most references
  to the manifest package in the engine needed to be updated to use
  schema1 instead.

- Validation functions in api/v2 were replaced by the
  distribution/reference package. The engine code has been updated to
  use the reference package for validation where necessary. A future PR
  will change the engine to use the types defined in
  distribution/reference more comprehensively.

- The reference package explicitly allows double _ characters in
  repository names. registry_test.go was updated for this.

- TestPullFailsWithAlteredManifest was corrupting the manifest JSON, now
  that the schema1 package unmarshals the correct payload. The test is
  being changed to modify the JSON without affecting its length, which
  allows the pull to succeed to the point where digest validation
  happens.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 257c59251bd9a03aea4f3188a8160c54f37950ae
Component: engine
2015-11-02 12:40:18 -08:00
88f746d118 Merge pull request #17619 from jfrazelle/canonical-update
rebased canonical/json off go 1.5.1
Upstream-commit: b95048758a06097469901590e68f40bafb5d1762
Component: engine
2015-11-02 11:42:26 -08:00
dd117ef001 Merge pull request #17620 from vdemeester/unit-test-TESTDIRS
Bring TESTDIRS back for unit-tests
Upstream-commit: f962c0715f153b806742cefaa6e9c9adf4e25273
Component: engine
2015-11-02 11:41:19 -08:00
b9cfc706d4 Add TESTDIRS back
Makes it simpler to test only one package.
Was removed by #17491.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4a54ab387f4b11310476414f575fb2502970b65d
Component: engine
2015-11-02 19:44:09 +01:00
9601e97681 rebased canonical/json off go 1.5.1
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0d881349e88b55a3ea4e15eef1c464b2ca64a441
Component: engine
2015-11-02 10:23:02 -08:00
106476f022 Vendoring libnetwork
Vendoring libnetwork @ 05a5a1510f85977f374a9b9804a116391bab5089

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 10e1b9f02ee633349bc45631dac18cb4cc5baa61
Component: engine
2015-11-02 08:33:52 -08:00
cc98d1ba33 Vendoring in libnetwork to fix an ungraceful restart case
Also picked up a minor typo fix

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2361edbcea22113aea639a3d74edb35791fd8aef
Component: engine
2015-10-30 16:24:02 -07:00
d73613b841 Merge pull request #17514 from mavenugo/ugr
Fixing a case of dangling endpoint during ungraceful daemon restart
Upstream-commit: 17a8fbeaebf1991fa8d97adb3f217edbecd651ea
Component: engine
2015-10-30 13:38:27 -04:00
9514b66cfb Merge pull request #16640 from samuelkarp/awslogs-logging-driver
[awslogs] Auto-detect region and set user-agent
Upstream-commit: c545dce004a4b833994478a2fc993ee8e2b3b2cd
Component: engine
2015-10-30 12:38:40 -04:00
8c783d1695 Vendoring libnetwork to solve an ungraceful restart condition
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: ebf76171f6d63938558cdd5bef33565b48d664b7
Component: engine
2015-10-29 18:56:17 -07:00
ff7c252b26 Merge pull request #17491 from LK4D4/seq_tests
Run unit tests as single command
Upstream-commit: d30caedbf8860b0cc07aa2429ca20dafb5e918e2
Component: engine
2015-10-29 16:29:24 -07:00
f8757c11b0 Merge pull request #17490 from aboch/pm
Libnetwork vendoring & overlay networking fixes
Upstream-commit: 7f7950aa187e551bdc4d6128523207c2b8343250
Component: engine
2015-10-29 13:45:19 -07:00
691e7791f8 Run unit tests as single command
For me it increased speed of unit-tests tremendously, however this disabled
coverage profiles generation, which I think is pretty good tradeoff.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 1c23de0e64887f6c36b2156dd65717f723493775
Component: engine
2015-10-29 09:39:51 -07:00
4a8db513f4 Vendoring libnetwork 20351a84241aa1278493d74492db947336989be6
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 90744fe9432d988bae187a8dab7c606b2dc13895
Component: engine
2015-10-29 09:24:48 -07:00
0317f9b3fb Merge pull request #16898 from hqhq/hq_bump_bolt
Bump bolt to v1.1.0
Upstream-commit: b6e1f4dd69a865df847dd4f6efe12df21f5c34dd
Component: engine
2015-10-28 18:51:23 -04:00
b78e8b7756 docker-py: upgrade and fix test script
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 8db141049f5323d754584f265b267e52ee5d9e17
Component: engine
2015-10-28 12:56:50 -04:00
72e420120c Merge pull request #17418 from diogomonica/bump-go-1.5
Bump go 1.5
Upstream-commit: 96a6e810de0bfabe6cc59588f237470810703656
Component: engine
2015-10-27 20:12:43 -07:00
cc55863497 Revert "dockerversion placeholder for library-import"
This reverts commit d5cd032a86617249eadd7142227c5355ba9164b4.

Commit caused issues on systems with case-insensitive filesystems.
Revert for now

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b78ca243d9fc25d81c1b50008ee69f3e71e940f6
Component: engine
2015-10-27 21:23:53 -04:00
ff53341015 Bump bolt to v1.1.0
It adds ARM64, ppc64le, s390x, solaris support, and a bunch of
bugfixs.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: a41917c2c88bd7f694d141ac67f4a194aaa16fa1
Component: engine
2015-10-28 08:49:45 +08:00
2e7de41d92 Update vendored aws-sdk-go
Signed-off-by: Samuel Karp <skarp@amazon.com>
Upstream-commit: 70083e6fc3a7f64755fcf4752e6d24758bdd0543
Component: engine
2015-10-27 23:43:51 +00:00
99471f9ab2 update to binaries, fix parsers package, non-parallel test unit
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 9bcbb39fa8b91ceb54c3da7b245e79b56de1cb6b
Component: engine
2015-10-27 14:43:25 -07:00
9cd08e6796 Merge pull request #17350 from vdemeester/11699-auto-libraryimport
dockerversion placeholder for library-import
Upstream-commit: 6276c676a897ab8a4c7fdcd78d18c8fc3a761707
Component: engine
2015-10-27 13:39:40 -07:00
4d261096ec dockerversion placeholder for library-import
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d5cd032a86617249eadd7142227c5355ba9164b4
Component: engine
2015-10-27 20:36:07 +01:00
7c4b8bccf9 Merge pull request #17381 from mavenugo/rc3v1
Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
Upstream-commit: 91de5ddf1896347c05f5292b8a0de0fbad3e4ce2
Component: engine
2015-10-26 17:06:01 -07:00
b67a8a66b5 Merge pull request #17285 from Microsoft/10662-exectp4workaround
Windows [TP4] Trap Hyper-V exec failure
Upstream-commit: fe1e04a84f51b3abf5fd426a6a4ee0125683aa11
Component: engine
2015-10-26 16:47:51 -07:00
641ecc1ebd Merge pull request #17002 from jfrazelle/apparmor-check-version-on-deb-install
apparmor check version on deb install
Upstream-commit: 9312a738d84e880bf4635ba4b7729b3c2e017fbc
Component: engine
2015-10-26 22:44:11 +01:00
0759578039 Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 139d1e13e29ed987face1494471fdb6c986d6c4a
Component: engine
2015-10-26 13:56:56 -07:00
1c1efd72ec Vendor in libnetwork changes to support container rename
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 1041f3967086052438a3e34cee3db14e2277b629
Component: engine
2015-10-23 16:27:03 -07:00
878c53917a Windows [TP4] HCSShim Revendor
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a3c43964cf994cc1315af1590155f63dc588e32c
Component: engine
2015-10-23 08:41:30 -07:00
c31c8acf2e Vendoring in libkv to be aligned with libnetwork
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 793b20ba093acedfb53ea2a3344601322e97893f
Component: engine
2015-10-22 14:12:46 -07:00
58a78457b3 Vendoring in Libnetwork
This carries fixes for
- Internal racy /etc/hosts updates within container during SD
- Renable SD service record watch after cluster-store restarts
- Fix to allow remote IPAM driver to return no IP if the user prefers
- Fix to allow --fixed-cidr and --bip to be in same range

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 52df87ac2b83693a48efcdc7167575449f122e25
Component: engine
2015-10-22 14:12:46 -07:00
95b57bebf2 Merge pull request #17274 from aboch/ai
Turn off discovery when icc == false
Upstream-commit: 2afdc6582b203c2beaeaca6ff14f61ae50f8cab9
Component: engine
2015-10-22 13:08:31 -07:00
389b888060 Merge pull request #17144 from thaJeztah/fix-16668-update-fish-completions-dest
RPM change install location of Fish completions
Upstream-commit: af6743a6c61b3c854d647975bca3f826ec654b20
Component: engine
2015-10-21 14:36:50 -07:00
7356782f88 Merge pull request #17145 from thaJeztah/deb-add-fish-completions
deb: add fish completions
Upstream-commit: 08fb49597563e66d708098b4391ad7e13d3e619d
Component: engine
2015-10-21 13:58:22 -07:00
c0edcf2339 release: fix bash bug in script
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 420e07cc2c8189cb3c1f361aa0c1c1d1156b9eda
Component: engine
2015-10-21 16:02:14 -04:00
2bfb10b6f8 Vendoring in libnetwork for the anonymous endpoint
- commit f3c8ebf46b890d4612c5d98e792280d13abdb761

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 1be540b99bdf7557d4c3183b822b5bea230b0141
Component: engine
2015-10-21 09:32:48 -07:00
b1184809c8 Merge pull request #17229 from mavenugo/ds_fix
Fixing bootup inconsistencies due to invalid cluster-store config
Upstream-commit: bb5551746bdccc1b032fbf8c32914c282ff94668
Component: engine
2015-10-21 12:00:07 -04:00
82f86233a6 Vendoring in libnetwork to fix daemon bootup instabilities
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2de2192c27bf72e5036e9914b984ab6d71f70c60
Component: engine
2015-10-20 19:56:59 -07:00
72a0fc71b0 some bugfixes on getting tuf files, this is backed by a lot of new unit tests in gotuf
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
Upstream-commit: 43ba8a0426e9414c936d6f5fdab9bb0311fb7b8c
Component: engine
2015-10-20 13:22:06 -07:00
c19683280b Merge pull request #17188 from jfrazelle/fix-release-rpm
fix copy of multiple rpms
Upstream-commit: a7868191d43f4a0f73bf792973869f3df5dc8d37
Component: engine
2015-10-20 11:31:35 -07:00
f3edec8c49 Vendoring libnetwork
Vendoring libnetwork @ 05890386de89e01c73f8898c2941b020bbe57052

Has bug fixes for 1.9

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 9750dd0088bbb23968a19a74f5ae8c58b56328fc
Component: engine
2015-10-19 21:29:26 -07:00
2b52981204 add test script for built debs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 14e85c8c556bae67584e71f5c4bb6322c77a3ef5
Component: engine
2015-10-19 16:15:27 -07:00
ee5b4b81d9 add generate aa profile to deb install
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 8369f00d30cc1d7823723dec6147f0419e67ad46
Component: engine
2015-10-19 16:15:25 -07:00
3fd414a4f5 fix copy of multiple rpms
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: f549b1c9ea7ff99f9f17e59d65f234d93e85c36c
Component: engine
2015-10-19 16:14:06 -07:00
56a008d359 deb: add fish completions
This adds the Fish completions to the .deb package.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6b1a643ac8bf599d04510b26d6d5befefc30ccde
Component: engine
2015-10-17 23:28:11 -07:00
d1e9f4d92c RPM change install location of Fish completions
External completions for fish should be installed
in /usr/local/share/fish/vendor_completions.d to
not conflict with built-in completions.

for reference, see:
https://github.com/fish-shell/fish-shell/issues/1485

fixes #16668

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fb372e66bb9b52bb57d15de04d8af4b94c9e0c14
Component: engine
2015-10-17 22:58:09 -07:00
c93afd4f9e Merge pull request #17056 from vdemeester/16756-integration-cli-checkers-api-build
Vendoring new go-check checkers and use checker for docker_api_build_test.go
Upstream-commit: cffd50752c2b2243519193a4ca458156291eb8af
Component: engine
2015-10-17 08:50:51 -07:00
e7f314a486 Vendoring shakers library and update go-check
The shakers library defines a bunch of go-check checkers to ease
writing tests.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9685b4767fc49c4a43ba762a5afbcd175f3d9245
Component: engine
2015-10-17 14:28:08 +02:00
dabf81be3c Merge pull request #16831 from jfrazelle/release-updates
Release updates
Upstream-commit: e3fabf3ea1548afa3d147eb6f41b8656a70569b7
Component: engine
2015-10-16 16:57:10 -07:00