Commit graph

36713 commits

Author SHA1 Message Date
Sebastiaan van Stijn
92a6266c9d
Merge pull request #39079 from thaJeztah/bump_swarmkit
bump docker/swarmkit 59163bf75df38489d4a10392265d27156dc473c5
2019-04-18 18:08:57 +02:00
Sebastiaan van Stijn
65e432abe3
Merge pull request #39090 from cpuguy83/cross_support_goarm
Add support for setting GOARM in cross target.
2019-04-18 00:53:12 +02:00
Brian Goff
fbb001d1f9 Add support for setting GOARM in cross target.
This adds to the existing format of `<GOOS>/<GOARCH>` to allow for
`<GOOS>/arm/v<GOARM>`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-04-17 13:19:14 -07:00
Brian Goff
4ed9059e55
Merge pull request #39095 from StefanScherer/fix-TestPullWindowsImageFailsOnLinux
Use existing Windows image for test instead of microsoft/nanoserver
2019-04-17 10:46:14 -07:00
Sebastiaan van Stijn
a83cbae8fb
Merge pull request #39101 from thaJeztah/update_authors
Update AUTHORS and .mailmap
2019-04-17 15:59:16 +02:00
Stefan Scherer
aad7e9797b
Use current windows servercore image
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2019-04-17 15:24:23 +02:00
Sebastiaan van Stijn
36a79575b5
Update AUTHORS and .mailmap
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-17 13:22:59 +02:00
Sebastiaan van Stijn
1742b9dfd5
Merge pull request #39099 from AkihiroSuda/akihirosuda-email
MAINTAINERS: update Akihiro Suda's email address
2019-04-17 13:06:32 +02:00
Akihiro Suda
774de425b0 MAINTAINERS: update Akihiro Suda's email address
No affiliation change (NTT).

The former email address will continue to be available for the time
being.

For daily communication, I still prefer to use my gmail.com address.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-04-17 18:26:21 +09:00
Akihiro Suda
ad9362bb15
Merge pull request #39055 from thaJeztah/add_with_timeout_option
Add client.WithTimeout() option
2019-04-16 17:05:40 +09:00
Akihiro Suda
680c594ede
Merge pull request #39083 from cpuguy83/bump_fsnotify
Bump fsnotify to HEAD.
2019-04-16 17:04:04 +09:00
Brian Goff
a5c2dfad49 Bump fsnotify to HEAD.
This specifically has a fix for leaking epoll fd's.

Full diff: 1485a34d5d

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-04-15 19:23:39 -07:00
Sebastiaan van Stijn
3b3b95c6ae
Merge pull request #39072 from thaJeztah/small_bumps
Various minor vendoring bumps
2019-04-16 01:19:23 +02:00
Brian Goff
ce1f7a186e
Merge pull request #39069 from thaJeztah/fix_cross
Fix DOCKER_CROSS being overwritten
2019-04-15 16:01:09 -07:00
Sebastiaan van Stijn
c524e15f30
Merge pull request #38952 from alexei38/master
fluentd log driver. failed parse last partial message in fluentd #38951
2019-04-15 20:40:57 +02:00
Sebastiaan van Stijn
934b3a3841
Fix DOCKER_CROSS being overwritten
Not exactly sure why, but this line;

   build: DOCKER_CROSS ?= false

Always overwrote `DOCKER_CROSS` when running `make cross`.
Perhaps because it is set in `cross: DOCKER_CROSS := true`,
and in a different scope? May also be dependent on the
version of `make` in use.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-15 18:37:56 +02:00
Brian Goff
a85a64e3b4
Merge pull request #39073 from thaJeztah/end_of_upstream_packages
vendor.conf: reserve space for downstream projects
2019-04-15 09:27:42 -07:00
Sebastiaan van Stijn
b000d5321a
bump docker/swarmkit 59163bf75df38489d4a10392265d27156dc473c5
full diff: 18e7e58ea1...59163bf75d

- Add missing return when configuring VXLAN port
- Prevent possible panic in cnmallocator.IsAttachmentAllocated()
- update github.com/pivotal-golang/clock
  - new name for package: code.cloudfoundry.org/clock

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-15 18:04:36 +02:00
Sebastiaan van Stijn
66edc40e86
Merge pull request #39075 from giovanism/39067-swagger
Update container name pattern in swagger.yaml
2019-04-15 16:24:43 +02:00
giovanism
65e68f6222 Update container name pattern in swagger.yaml
Signed-off-by: giovanism <giovanism@outlook.co.id>
2019-04-15 16:41:46 +07:00
Sebastiaan van Stijn
86449c2ef8
bump matttproud/golang_protobuf_extensions v1.0.1
no local changes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 23:55:32 +02:00
Sebastiaan van Stijn
4b8f129fc7
bump beorn7/perks e7f67b54abbeac9c40a31de0f81159e4cafebd6a
no local changes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 23:55:30 +02:00
Sebastiaan van Stijn
9234218c50
bump containerd/fifo a9fb20d87448d386e6d50b1f2e1fa70dcf0de43c
- containerd/fifo#17 Expose underlying file's `SyscallConn` method

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 23:55:27 +02:00
Sebastiaan van Stijn
f18971fc5d
bump containerd/go-runc 7d11b49dc0769f6dbb0d1b19f3d48524d1bad9ad
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 23:55:24 +02:00
Sebastiaan van Stijn
c69f7f27c5
bump containerd/typeurl 2a93cfde8c20b23de8eb84a5adbc234ddf7a9e8d
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 23:55:22 +02:00
Sebastiaan van Stijn
179d51ba98
bump mistifyio/go-zfs d5b163290a48f624cbf244ebe4e89ce38653064c
full diff: 22c9b32c84...f784269be4

relevant changes:

- mistifyio/go-zfs#50 Fix GetProperty always returning 'VALUE'
  - fixes mistifyio/go-zfs#49 dataset.GetProperty(key) always returns 'VALUE'
- mistifyio/go-zfs#53 Fix parseLine for fragmentation field
  - fixes mistifyio/go-zfs#52 setUint receives empty string for fragmentation in some cases
- mistifyio/go-zfs#54 Add 'referenced' to zfs properties
- mistifyio/go-zfs#72 Switch to google/uuid
  - removes the github.com/pborman/uuid dependency

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 23:55:19 +02:00
Sebastiaan van Stijn
da1fbb3f2b
bump syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2
full diff: 2c00daeb6c...d98352740c

relevant changes:

- syndtr/gocapability#11 Add support for ambient capabilities
- syndtr/gocapability#13 Fix issue #12: break too early
- syndtr/gocapability#16 Fix capHeader.pid type

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 23:55:16 +02:00
Sebastiaan van Stijn
8fa04b3a06
bump hashicorp/golang-lru v0.5.1
0fb14efe8c...7087cb70de

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 23:55:12 +02:00
Sebastiaan van Stijn
1bcbdc6085
vendor.conf: reserve space for downstream projects
This helps merge conflicts in situations where downstream
projects have additional dependencies.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 16:18:50 +02:00
Sebastiaan van Stijn
9b2eaa8a5d
Merge pull request #39063 from tao12345666333/bump-golang-1.12.4
Bump Golang 1.12.4
2019-04-13 19:23:35 +02:00
Jintao Zhang
23c1f16ac3 Bump Golang 1.12.4
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2019-04-13 10:56:06 +08:00
Sebastiaan van Stijn
ed07e11528
Merge pull request #38968 from imxyb/overlay2-contanst
change hard code: add some overlay2 constant to replace the hard code.
2019-04-12 22:50:16 +02:00
Sebastiaan van Stijn
f7ec606fc1
Merge pull request #39042 from crosbymichael/oci-opts
Refactor few spec generation ops
2019-04-11 21:07:08 +02:00
Yong Tang
bfe6a05d5c
Merge pull request #39052 from thaJeztah/more_import_comments
Add more import comments
2019-04-11 09:29:43 -07:00
Sebastiaan van Stijn
50063e9091
Merge pull request #39060 from thaJeztah/supermassive_black_hole
Add Katie Bouman to names generator
2019-04-11 15:59:59 +02:00
Sebastiaan van Stijn
44982c775e
Add client.WithTimeout() option
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-11 13:35:48 +02:00
Sebastiaan van Stijn
fc52433fa6
Merge pull request #39058 from thaJeztah/format_vendor
Reformat vendor.conf and pin all deps by git-sha
2019-04-11 13:03:08 +02:00
Sebastiaan van Stijn
191c0fec8c
Add Katie Bouman to names generator
Katherine Louise Bouman is an imaging scientist and Assistant Professor
of Computer Science at the California Institute of Technology. She
researches computational methods for imaging, and developed an algorithm
that made possible the picture first visualization of a black hole
using the Event Horizon Telescope. - https://en.wikipedia.org/wiki/Katie_Bouman

Thank you for being amazing!

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-11 12:43:30 +02:00
Sebastiaan van Stijn
99e930f93f
Reformat vendor.conf and pin all deps by git-sha
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-11 02:28:07 +02:00
Michael Crosby
c478553640 Export all spec generation opts
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-04-10 15:38:36 -04:00
Sebastiaan van Stijn
6d18c6a062
Merge pull request #39010 from cpuguy83/cross_build_image
Support cross-compile for arm
2019-04-10 20:41:57 +02:00
Sebastiaan van Stijn
c725eff3e2
Add more import comments
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-10 16:59:33 +02:00
Sebastiaan van Stijn
8aa3262f29
Merge pull request #39043 from thaJeztah/dont_pin_version_if_empty
Fix empty WithVersion blocking version negotiation
2019-04-10 16:37:56 +02:00
Brian Goff
61a3285864
Support cross-compile for arm
Pretty much cross-compile doesn't work because  of this:

> profiles/seccomp/seccomp.go:13:2: build constraints exclude all Go files in /go/src/github.com/docker/docker/vendor/github.com/seccomp/libseccomp-golang

This changes adds a new Dockerfile target for cross compilation with the
neccesary arch specific libseccomp packages and CC toolchains.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-10 14:13:32 +02:00
Sebastiaan van Stijn
0041e2419a
Fix empty WithVersion blocking version negotiation
commit 3d72963ab8 fixed
situations where a version negotiation could override
the version, even though a client was initialized with a
fixed version.

In situations where the "fixed" version is empty, we
should ignore the option, and treat the client as
"not having a fixed version", so that API version
negotiation can still be performed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-10 11:14:37 +02:00
Sebastiaan van Stijn
c2cb72e085
Merge pull request #39012 from thaJeztah/bump_dependencies
Bump various dependencies
2019-04-10 11:10:32 +02:00
Vincent Demeester
96b0efa0c3
Merge pull request #39044 from thaJeztah/client_options_type
client: define "Opt" type
2019-04-10 10:45:20 +02:00
Vincent Demeester
d9d9eccdc8
Merge pull request #39013 from thaJeztah/bump_golang_org_deps
Bump golang.org/x/net, sys, crypto
2019-04-10 08:32:27 +02:00
Yong Tang
bc9fdd05a9
Merge pull request #39034 from tao12345666333/bump-golang-1.12.3
Bump Golang 1.12.3
2019-04-09 18:23:56 -07:00
Sebastiaan van Stijn
0c17c01526
Merge pull request #39038 from alexei38/plugin_partial
Adds PartialLogMetadata to encode protobuf for logger plugins
2019-04-10 03:09:33 +02:00