Commit graph

36946 commits

Author SHA1 Message Date
Sebastiaan van Stijn
6605a26c75
Dockerfile.e2e: use /build to be consistent with main Dockerfile
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 045beed6c8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-05-13 15:24:41 -07:00
Sebastiaan van Stijn
ce9cabf0f0
Dockerfile.e2e: re-order steps for caching
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 63aefbfbca)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-05-13 15:24:32 -07:00
Sebastiaan van Stijn
dc6d1ac663
Dockerfile.e2e: move frozen-images to a separate stage
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5554bd1a7b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-05-13 15:24:24 -07:00
Sebastiaan van Stijn
1fdd24579c
Dockerfile.e2e: use alpine 3.9
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 20262688df)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-05-13 15:24:15 -07:00
Sebastiaan van Stijn
3afbf83cc5
Dockerfile.e2e fix TestBuildPreserveOwnership
The Dockerfile missed some fixtures, which caused this test
fail when running from this image.

I also noticed some other fixtures missing in integration-cli,
where the image had symlinks to some certificates, but the
original files were not included;

```
|-- integration-cli
    |-- fixtures
    |   |-- auth
    |   |   `-- docker-credential-shell-test
    |   |-- credentialspecs
    |   |   `-- valid.json
    |   |-- https
    |   |   |-- ca.pem -> ../../../integration/testdata/https/ca.pem
    |   |   |-- client-cert.pem -> ../../../integration/testdata/https/client-cert.pem
    |   |   |-- client-key.pem -> ../../../integration/testdata/https/client-key.pem
    |   |   |-- client-rogue-cert.pem
    |   |   |-- client-rogue-key.pem
    |   |   |-- server-cert.pem -> ../../../integration/testdata/https/server-cert.pem
    |   |   |-- server-key.pem -> ../../../integration/testdata/https/server-key.pem
    |   |   |-- server-rogue-cert.pem
    |   |   `-- server-rogue-key.pem
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 48fd0e921c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-05-13 15:23:48 -07:00
Ian Campbell
61a234d562
client: do not fallback to GET if HEAD on _ping fail to connect
When we see an `ECONNREFUSED` (or equivalent) from an attempted `HEAD` on the
`/_ping` endpoint there is no point in trying again with `GET` since the server
is not responding/available at all.

Once vendored into the cli this will partially mitigate https://github.com/docker/cli/issues/1739
("Docker commands take 1 minute to timeout if context endpoint is unreachable")
by cutting the effective timeout in half.

Signed-off-by: Ian Campbell <ijc@docker.com>
(cherry picked from commit 8c8457b0f2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-05-13 15:17:51 -07:00
Akihiro Suda
ac48309ac4
Merge pull request #39128 from thaJeztah/bump_go_units
bump docker/go-units v0.4.0
2019-04-24 19:01:23 +09:00
Sebastiaan van Stijn
e64afff964
Merge pull request #39132 from tonistiigi/update-buildkit
vendor: update buildkit to 8818c67c
2019-04-24 10:09:06 +02:00
Sebastiaan van Stijn
79b5b19439
Merge pull request #39103 from lsilvs/master
Add Satoshi Nakamoto to names generator
2019-04-24 08:29:39 +02:00
Tonis Tiigi
a3fdd5bf7e vendor: update buildkit to 8818c67c
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-04-23 19:02:06 -07:00
Sebastiaan van Stijn
2bfa24b393
Merge pull request #39129 from thaJeztah/bump_libnetwork
bump libnetwork 9ff9b57c344df5cd47443ad9e65702ec85c5aeb0
2019-04-23 23:27:07 +02:00
Sebastiaan van Stijn
7f2c564b23
bump libnetwork 9ff9b57c344df5cd47443ad9e65702ec85c5aeb0
full diff: 48f846327b...9ff9b57c34

- docker/libnetwork#2368 (windows) Pick a random host port if the user does not specify a host port

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-23 18:37:36 +02:00
Sebastiaan van Stijn
c782aef653
bump docker/go-units v0.4.0
relevant changes:

- docker/go-units#33 Fix handling of unlimited (-1) ulimit values
- docker/go-units#34 Revert 46 minute threshold

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-23 16:56:57 +02:00
Vincent Demeester
0320a312d2
Merge pull request #39126 from SvenDowideit/loose-spelling
I can lose a screw if its on too loose
2019-04-23 13:00:47 +02:00
Lucas Silvestre
4bfd23b7ee
Add Satoshi Nakamoto to names generator
Signed-off-by: Lucas Silvestre <lukas.silvestre@gmail.com>
2019-04-23 10:32:53 +02:00
Sven Dowideit
29ad9379f4 I can lose a screw if its on too loose
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2019-04-23 11:36:31 +10:00
Sebastiaan van Stijn
aac801ac75
Merge pull request #39091 from cpuguy83/cross_toolchains_all_the_things
Make CC toolchains available for other targets
2019-04-20 22:34:05 +02:00
Sebastiaan van Stijn
28d7dba41d
Merge pull request #39032 from thaJeztah/improve_version_negotiation
Add client.WithAPIVersionNegotiation() option
2019-04-20 13:34:22 +02:00
Sebastiaan van Stijn
8202330984
Merge pull request #39117 from seemethere/allow_version_overwrite
Add ability to override the version in make.ps1
2019-04-20 00:40:11 +02:00
corbin-coleman
edc639e99f Add ability to override the version in make.ps1
Checks for environment variable VERSION if it exists then it sets dockerVersion to VERSION

Signed-off-by: corbin-coleman <corbin.coleman@docker.com>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2019-04-19 18:39:57 +00:00
Akihiro Suda
94e228b227
Merge pull request #39066 from thaJeztah/bump_pkg_errors
bump pkg/errors v0.8.1
2019-04-19 13:52:02 +09:00
Brian Goff
7ccc4f70de
Merge pull request #39108 from Microsoft/jjh/lcowrs5plus
LCOW: (Experimental) Require RS5+ builds
2019-04-18 21:10:25 -07:00
Yong Tang
97c25f6814
Merge pull request #39074 from thaJeztah/bump_fluentd
Bump fluent/fluent-logger-golang v1.4.0
2019-04-18 19:00:02 -07:00
Yong Tang
bbc6d06e67
Merge pull request #39080 from thaJeztah/bump_etcd
bump github.com/coreos/etcd v3.3.12
2019-04-18 18:59:00 -07:00
John Howard
80daf64216 Revendor Microsoft/hcsshim@672e52e9
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-04-18 09:51:27 -07:00
John Howard
e0b528fe08 LCOW: (Experimental) Require RS5+ builds
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-04-18 09:43:37 -07:00
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
a688d85c48
bump pkg/errors v0.8.1
https://github.com/pkg/errors/compare/v0.8.0...v0.8.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-18 02:09:14 +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
f067a0acaa Make CC toolchains available for other targets
This cross-compiling other binaries simpler.
It would be nice if the cross Makefile target built all the required
bins, but at least this is a first step.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-04-17 11:11:08 -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
Sebastiaan van Stijn
048bd8d179
bump tinylib/msgp v1.1.0
full diff: 3b556c6454...v1.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-16 11:06:43 +02:00
Sebastiaan van Stijn
688e67e1d3
bump fluent/fluent-logger-golang v1.4.0
- Add RequestAck to enable at-least-once message transferring
- Add Async option to update sending message in asynchronous way
- Deprecate AsyncConnect (Use Async instead)

full diff: https://github.com/fluent/fluent-logger-golang/compare/v1.3.0...v1.4.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-16 11:06:30 +02: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
23416c1b36
re-align userland-proxy with vendored version
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-15 18:15:04 +02:00
Sebastiaan van Stijn
676eb8c631
bump github.com/coreos/etcd v3.3.12
full diff: https://github.com/etcd-io/etcd/compare/v3.3.9...v3.3.12

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-15 18:11:06 +02: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