Commit Graph

1579 Commits

Author SHA1 Message Date
Michael Crosby
d17b9f3da0 Update containerd to cf554d59dd96e459544748290eb91
This bumps containerd to cf554d59dd96e459544748290eb9167f4bcde509 and
includes various fixes and updates the grpc package and types generated
for use.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-07 15:27:23 -07:00
Sebastiaan van Stijn
f061f556f2 Merge pull request #23269 from vdemeester/migrate-import-to-cobra
Use spf13/cobra for docker import
2016-06-07 13:07:30 +02:00
Vincent Demeester
8e63de1f63 Merge pull request #23236 from runcom/fix-spec
Fix spec and man
2016-06-07 12:54:42 +02:00
Arnaud Porterie
7d08f3a5ad Merge pull request #22866 from jstarks/foreign_layers
Support layers from external URLs
2016-06-07 00:27:40 +00:00
Vincent Demeester
ca01e57d55 Update cobra to 75205f23b3ea70dc7ae5e900d074e010c23c37e9
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-06 13:58:18 +02:00
Brian Goff
3f970819bb Merge pull request #23063 from yongtang/22961-aws-sdk-go
Update aws-sdk-go to v1.1.30
2016-06-05 16:01:52 -04:00
David Calavera
feab8db60d Vendor docker-credential-helpers v0.3.0
Fix a bug in the vendor helpers that took packages
that started with github.com/docker/docker like if
they were from within the project.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-06-04 10:06:07 -07:00
Sebastiaan van Stijn
ed87071632 bump engine-api to 772250a752e34cacaeef7c92b8e0ddf43450b629
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-04 14:16:36 +02:00
Antonio Murdaca
e6637f8d9e Merge pull request #23124 from kencochrane/fix_redhat_install_script
Fix issues with get.docker.com install script with redhat
2016-06-04 00:04:09 +02:00
Antonio Murdaca
1514b499f0 docker-engine.spec: install man8
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-06-03 15:27:24 +02:00
Sebastiaan van Stijn
726ef47d5c Merge pull request #23215 from BlackYoup/pkg-config
make.sh: use PKG_CONFIG environment variable if it exists
2016-06-03 15:04:37 +02:00
Sebastiaan van Stijn
f1755b2560 Merge pull request #23227 from yongtang/06032016-engine-api
Vendor engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6
2016-06-03 14:15:31 +02:00
Brian Goff
9bb54f89ad Add make install task
This installs docker and dockerd to `$DOCKER_MAKE_INSTALL_PREFIX/bin`, which
defaults to `/usr/local/bin`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-03 12:08:33 +02:00
Yong Tang
10c35196b1 Vendor engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6
This fix tries to update engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6

This fix brings engine-api up to date, which includes changes from:
https://github.com/docker/engine-api/pull/256
https://github.com/docker/engine-api/pull/254

This fix is related to

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-03 02:27:17 -07:00
Arnaud Porterie
f02ffd9e19 Bump etcd to 2.3.2
Bump etcd to 2.3.2 and `github.com/ugorji/go` accordingly.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-06-02 18:35:45 -07:00
Sebastiaan van Stijn
76d8b0dab7 Bump engine-api to fa04f66c7871183dd53a5ec666479f49b452743d
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-03 00:14:55 +02:00
Vincent Demeester
eb9274844e Merge pull request #23140 from Microsoft/HcsshimRevendor
Revendor hcsshim
2016-06-02 22:09:19 +02:00
Arnaud Lefebvre
20bf00dfa5 Use PKG_CONFIG environment variable if it exists
pkg-config is not always available in the path
so let people choose where it's located

Signed-off-by: Arnaud Lefebvre <a.lefebvre@outlook.fr>
2016-06-02 21:53:28 +02:00
Sebastiaan van Stijn
4399d3b309 Merge pull request #23206 from mlaventure/fix-release-deb
Fix release-deb script
2016-06-02 21:22:49 +02:00
Kenfe-Mickael Laventure
afc2579d1a Fix release-deb script
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-02 08:53:33 -07:00
Vincent Demeester
8ea051f012 Update engine-api to 009ba1641d669613b38818f6f6385b0e74c5728f
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-02 16:55:49 +02:00
Alexander Morozov
28676fc04b Merge pull request #22769 from dnephin/integrate_cobra
Use spf13/cobra for the cli
2016-06-01 14:18:23 -07:00
Yong Tang
1dab9af5d5 Vendor engine-api to 6facb3f3c38717b8f618dcedc4c8ce20d1bfc61e
This fix updates engine-api to 6facb3f3c38717b8f618dcedc4c8ce20d1bfc61e.

This fix is related to #23090.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-01 09:44:25 -07:00
Daniel Nephin
3d624ed5d6 Update cobra vendor
- adds support for usage strings on flag errors
- adds support for arg validation

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-31 15:43:13 -07:00
Darren Stahl
d96e36cbbf Revendor hcsshim
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-05-31 14:42:01 -07:00
Daniel Nephin
8c77c73e7b Vendor spf13/cobra and spf13/pflag
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-31 14:41:37 -07:00
Ken Cochrane
dcc407a820 Fix issues with get.docker.com install script with redhat fixes #23101
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-05-31 08:44:40 -04:00
Yong Tang
51f0a04223 Update aws-sdk-go to v1.1.30
This fix tries to update aws-sdk-go to v1.1.30.

The following dependencies has been added:
github.com/go-ini/ini 060d7da055ba6ec5ea7a31f116332fe5efa04ce0
github.com/jmespath/go-jmespath 0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74
Note: the commits matches v1.1.30 of aws-sdk-go.

The following dependency has been removed
github.com/vaughan0/go-ini a98ad7ee00ec53921f08832bc06ecf7fd600e6a1

This fix fixes #22961.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-28 18:49:17 -07:00
Christy Perez
d864a14620 Bump the seccomp versions to pull in fixes and new commits
enabling s390 and ppc64le function

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2016-05-27 11:12:47 -04:00
Alexander Morozov
9b0d385975 Merge pull request #22840 from runcom/go1.6
Upgrade to golang 1.6.2
2016-05-27 06:54:57 -07:00
Sebastiaan van Stijn
75109b32db Merge pull request #22861 from vdemeester/daemon-images-search-refactoring
Daemon images search refactoring
2016-05-26 12:34:31 +02:00
John Howard
c7ee503082 Merge pull request #22958 from Microsoft/hcs_rpc
Windows: Use the new HCS RPC API
2016-05-25 09:25:22 -07:00
John Starks
fa82c0aa10 Windows: work around Go 1.6.2/Nano Server TP5 issue
This works around golang/go#15286 by explicitly loading shell32.dll at
load time, ensuring that syscall can load it dynamically during process
startup.

Signed-off-by: John Starks <jostarks@microsoft.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-25 11:59:28 +02:00
Vincent Demeester
522698dd43 Merge pull request #22967 from srinsriv/master
Update dind
2016-05-25 09:55:10 +02:00
srinsriv
27afaf3774 Update dind
Typo

Signed-off-by: Srinivasan Srivatsan <srinivasan.srivatsan@hpe.com>
2016-05-24 20:42:28 -07:00
Darren Stahl
959c1a52bf Change Docker to use the new HCS RPC API
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-05-24 16:36:51 -07:00
Vincent Demeester
5812b6927c Vendor engine-api updates
Adds UniqueExactMatch method to filters along other changes.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-05-24 11:02:19 +02:00
Amit Krishnan
86d8758e2b Get the Docker Engine to build clean on Solaris
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
2016-05-23 16:37:12 -07:00
Tibor Vass
80f61c4108 Allow granular vendoring
hack/vendor.sh can now accept command line arguments

`./hack/vendor.sh github.com/docker/engine-api` will revendor only the
engine-api dependency.

`./hack/vendor.sh github.com/docker/engine-api v0.3.3` will vendor only
engine-api at the specified tag/commit.

`./hack/vendor.sh git github.com/docker/engine-api v0.3.3` is the same
but specifies the VCS for cases where the VCS is something else than git

`./hack/vendor.sh git golang.org/x/sys
eb2c74142fd19a79b3f237334c7384d5167b1b46
https://github.com/golang/sys.git` will vendor only golang.org/x/sys
downloading from the specified URL

Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-22 16:44:25 +02:00
John Starks
9c902364fb Revendor docker/distribution
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-05-20 14:16:48 -07:00
Alexander Morozov
af705ca0ae Merge pull request #22765 from cyphar/update-boltdb
vendor: bump boltdb to v1.2.1
2016-05-18 06:03:02 -07:00
Aleksa Sarai
a7781b130c vendor: bump boltdb to v1.2.1
This includes a fix to soft database corruption that would cause Docker
to fail to start if the daemon died in the middle of a transaction
write.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-05-17 16:19:35 +10:00
Alessandro Boch
1f9e3815aa Vendoring libnetwork b66c0385f30c6aa27b2957ed1072682c19a0b0b4
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-05-16 15:04:01 -07:00
Alessandro Boch
ebcf785f2f Update libnetwork dependencies for b66c038
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-05-16 15:04:01 -07:00
John Howard
4c6838137c Merge pull request #22728 from Microsoft/jstarks/improve_import
Windows: reexec during layer import
2016-05-16 11:08:05 -07:00
Yong Tang
0f57f47ac3 Vendor engine-api to allow docker daemon reload event.
This fix updated the vendored engine-api to version
e374c4fb5b121a8fd4295ec5eb91a8068c6304f4, which defines a new event
type of `DaemonEventType`. The purpose is to allow emitting`
`daemon reload` event as is raised in #22463.

This fix is related to #22463 and #22590.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-13 20:39:24 -07:00
John Starks
6d40104f11 Windows: revendor go-winio
This fixes a variety of small bugs in layer handling and adds a new API
for acquiring privileges for the whole process.

Fixes #22404 (but only for new images -- existing images will need to be
re-pushed).

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-05-13 11:53:14 -07:00
Alexander Morozov
c95f1fcbd9 Merge pull request #22679 from cyli/bump-notary-version
Bump notary version up to 0.3.0 and re-vendor.
2016-05-12 14:38:07 -07:00
cyli
6094be63ac Bump notary version up to 0.3.0 and re-vendor.
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-05-11 22:57:51 -07:00
Qiang Huang
ed868a2e11 Update go-check
It includes a small improvement, we hit test timeout sometimes
for some reason, print out the timed out case would be very
helpful.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-05-12 09:19:23 +08:00