Commit Graph

1555 Commits

Author SHA1 Message Date
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
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
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
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
Arnaud Porterie
dc430944b9 Merge pull request #22262 from kencochrane/fix_release_deb
Create the correct directory structure for apt-ftparchive
2016-05-11 12:38:12 -10:00
Tibor Vass
e421668b1b Merge pull request #21708 from tianon/InRelease
Also generate "InRelease" files for newer APT clients
2016-05-11 13:21:15 -04:00
Alexander Morozov
da74f9653d Merge pull request #22642 from amitkris/uprev_gozfs
update go-zfs to include Solaris support
2016-05-11 07:41:17 -07:00
Amit Krishnan
efb3946171 update go-zfs to include Solaris support
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
2016-05-10 13:51:03 -07:00
Michael Crosby
4e290986cd Update protobufs to 8d92cf5fc15a4382f8964b08e1f42a
This syncs the protobuf version with the one that is used with
containerd.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-09 15:21:41 -07:00
Michael Crosby
cfb9764386 Update runc and containerd deps
containerd:     57b7c3da915ebe943bd304c00890959b191e5264
runc:           d49ece5a83da3dcb820121d6850e2b61bd0a5fbe

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-09 15:05:44 -07:00
Alexander Morozov
a603fa33d5 Merge pull request #22317 from cyli/bump-notary-version
Bump notary version to v0.3.0-RC1
2016-05-06 12:54:53 -07:00
Alexander Morozov
ebc5a61593 Merge pull request #22076 from thtanaka/rpmbuild-error
DWZ problem with multiple golang binary caused OL7 RPM build to fail
2016-05-06 11:22:27 -07:00
Alexander Morozov
4531c01509 Merge pull request #22236 from kencochrane/remove_git_from_rpm
Exclude .git directories from the source RPMS and debian packages
2016-05-06 11:16:12 -07:00
cyli
88c6675ed2 Bump notary version to v0.3.0-RC1
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-05-06 10:59:26 -07:00
Mrunal Patel
97d95604e0 Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-05-05 18:36:09 -04:00
Vincent Demeester
af916d316a Merge pull request #22519 from mlaventure/add-dockerd-to-rpm-packaged-files
Add dockerd to the list of files included in generated rpms
2016-05-05 13:16:06 +02:00
Vincent Demeester
4de672690c Merge pull request #22270 from runcom/too-many-login
distribution: errors: do not retry if too many login attempts
2016-05-05 09:44:09 +02:00
Kenfe-Mickael Laventure
6118952e44 Add dockerd to the list of files included in generated rpms
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-04 20:45:22 -07:00
Tibor Vass
0c68402887 Merge pull request #22403 from mlaventure/fix-docker-build-pkgs
Update build-deb to make correct use of DOCKER_BUILD_PKGS
2016-05-04 17:55:20 -04:00
Antonio Murdaca
305ebfda8b vendor docker/distribution 9ec0d742d6
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-04 18:57:35 +02:00
Kenfe-Mickael Laventure
20e1b9593e Update build-deb to make correct use of DOCKER_BUILD_PKGS
An environment variable cannot directly be used as a bash array, this
patch loops through all the IFS separated value (which default to
space) instead.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-02 11:22:01 -07:00
Brian Goff
988f481643 Update engine-api
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-05-02 14:17:40 -04:00
Brian Goff
ba6209f744 Merge pull request #22367 from dnephin/fix_dockerd_lookup_and_warn
Fix lookup of dockerd when called from outside of $PATH
2016-05-02 13:58:57 -04:00
Daniel Nephin
8983d42988 Raise a more relevant error when dockerd is not available on the platform.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-02 11:59:25 -04:00
Vincent Demeester
ba901bb062 Vendor engine-api with pull fixes
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-04-30 17:24:25 +02:00
John Starks
57aef3b490 Windows: Support running dockerd as a service
This adds support for Windows dockerd to run as a Windows service, managed
by the service control manager. The log is written to the Windows event
log (and can be viewed in the event viewer or in PowerShell). If there is
a Go panic, the stack is written to a file panic.log in the Docker root.

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-26 14:04:47 -07:00
John Howard
0c7eab3157 Make dockerd debuggable
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-26 09:35:22 -07:00
Vincent Demeester
dc7664d62e Merge pull request #22308 from tianon/dockerd-consistency
Tweak hack/make/*-{client,daemon} to be consistent
2016-04-26 15:32:06 +02:00