beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
37840 commits 14 branches 412 tags 338 MiB
Commit graph

37840 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
ee0ef6c535
Dockerfile: sort packages alphabetically 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-11 15:51:43 +02:00
Sebastiaan van Stijn
1cfcce5e21
Dockerfile: use build-arg for vpnkit 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-11 15:49:20 +02:00
Sebastiaan van Stijn
a42b4144bc
Dockerfile: use spaces for indentation 
Indenting with tabs can cause the formatting to go wonky,
because the first line of any command is "indented" with spaces,
but following lines are not, therefore they can be mis-aligned with
the first line.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-11 15:49:17 +02:00
Sebastiaan van Stijn
f5eb39f75a
Merge pull request #39919 from jmartin84/36412-build-arg-override-binary-commits 
Use build args to override binary commits in dockerfile
 2019-10-11 15:43:27 +02:00
Akihiro Suda
97c084032a
Merge pull request #40053 from thaJeztah/harden_testdaemonevents 
integration-cli: rely less on CLI output format
 2019-10-11 18:20:45 +09:00
Tibor Vass
d56adcf0ec
Merge pull request #40059 from cpuguy83/move_source_copy 
Fix trick for `make BINDDIR=. shell` and `COPY .`
 2019-10-10 13:38:23 -07:00
Justen Martin
095ca77f48
Use build args to override binary commits in dockerfile 
Signed-off-by: Justen Martin <jmart@the-coder.com>
 2019-10-10 14:52:57 -05:00
Brian Goff
1c82d11908 Fix trick for make BINDDIR=. shell and COPY . 
This was inadvertently removed when updating the Dockerfile for buildkit
specific features.

Trick selects a different build target depending on if the source is
going to be bind-mounted in anyway, which prevents the need to copy the
whole source tree to the builder.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2019-10-10 11:47:23 -07:00
Tibor Vass
6f069f14e6
Merge pull request #40058 from cpuguy83/buildkit_dockerfile 
Fix `make cross` target
 2019-10-10 11:29:19 -07:00
Tibor Vass
d31633be7d
Merge pull request #39678 from thaJeztah/carry_39595_tailor_arm_ci 
[Carry 39595] Tailor CI for ARM, skip legacy integration test.
 2019-10-10 11:22:02 -07:00
Tibor Vass
b4e912b70e
Merge pull request #40038 from kolyshkin/go-swagger 
go-swagger: fix panic
 2019-10-10 11:13:49 -07:00
Sebastiaan van Stijn
8a3e8ac017
TestDaemonEvents: use is.Contains() for easier debugging 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-10 00:13:24 +02:00
Tibor Vass
0e0ab58a96
integration-cli: in TestDaemonEvents* use ioutil.WriteFile 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2019-10-10 00:13:22 +02:00
Sebastiaan van Stijn
24a419221d
integration-cli: TestDaemonEvents*: don't rely on CLI output format 
Running these tests with a different version of the CLI caused
some failures because the tests relied on the CLI's output format.

Although these tests should be rewritten to use the API directly,
in the meantime this makes them slightly more reliable.

Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-10 00:13:03 +02:00
Brian Goff
588d0e6133
Merge pull request #40064 from thaJeztah/requirement_helper 
integration-cli: make testRequires() a Helper
 2019-10-09 14:11:47 -07:00
Sebastiaan van Stijn
6afe0f38f6
integration-cli: make testRequires() a Helper 
Make this utility a helper, so that the "skip" message is printing
the location of the test, instead of the location of the helper,
which is what it's printing now:

    requirement.go:26: unmatched requirement bridgeNfIptables

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-09 21:44:22 +02:00
Tibor Vass
448db5a783
Merge pull request #40060 from thaJeztah/require_buildkit 
Makefile: force using buildkit if USE_BUILDX is not set
 2019-10-08 16:51:15 -07:00
Sebastiaan van Stijn
1be2cc2568
Makefile: force using buildkit if USE_BUILDX is not set 
Before this change:

```
unset DOCKER_BUILDKIT

make build
docker build  --build-arg=CROSS=false  -t "docker-dev:require-buildkit" -f "Dockerfile" .
Sending build context to Docker daemon  50.01MB
Error response from daemon: Dockerfile parse error line 17: Unknown flag: mount
make: *** [build] Error 1
```

After this change:

```
unset DOCKER_BUILDKIT

make build
docker build  --build-arg=CROSS=false  -t "docker-dev:require-buildkit" -f "Dockerfile" .
[+] Building 5.2s (71/71) FINISHED
 => [internal] load .dockerignore                                                                     0.1s
...
...
 => => exporting layers                                                                               0.9s
 => => writing image sha256:1ea4128a0e7f3bdee47de1675252609d9d6071e32da24a2aafee9fba96b2404b          0.0s
 => => naming to docker.io/library/docker-dev:require-buildkit                                        0.0s
...

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-08 21:47:07 +02:00
Kir Kolyshkin
93f9b902af go-swagger: fix panic 
This is an attempt to fix go-swagger panic under Golang 1.13.

Details:
 * https://github.com/go-openapi/jsonpointer/pull/4
 * https://github.com/go-swagger/go-swagger/pull/2059

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2019-10-08 11:29:59 -07:00
Brian Goff
e5bfaf19b1 Fix make cross target 
When changing the various cross targets in the Dockerfile I neglected
some `;`.
Instead of dealing with that now this just sets `--platform` on the
cross specific targets which only work on linux/amd64 anyway.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2019-10-08 10:54:39 -07:00
Tibor Vass
b3be2802d4
Merge pull request #39713 from thaJeztah/containerd_1.3 
bump containerd and dependencies to v1.3.0
 2019-10-08 10:43:56 -07:00
Sebastiaan van Stijn
eda98ad00f
Jenkinsfile: aarch64: use new labels to select agents 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-08 18:47:59 +02:00
Sebastiaan van Stijn
a0d670e516
Jenkinsfile: aarch64: sync with latest changes 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-08 18:47:57 +02:00
Sebastiaan van Stijn
14ea1f62eb
Jenkinsfile: aarch64: don't restrict to packet workers only 
Pick whatever is available; packet worker, or auto-scaling
a1.xlarge arm64 machines on AWS

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-08 18:47:55 +02:00
Sebastiaan van Stijn
9d5361de3f
Jenkinsfile: rename aarch64 to arm64 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-08 18:47:52 +02:00
Sebastiaan van Stijn
58d57c76b5
Jenkinsfile: aarch64: split into stages, add "print info" unit-tests 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-08 18:47:40 +02:00
Sebastiaan van Stijn
86e0c5a0d4
Jenkinsfile: aarch64: sync stage with other stages 
Also switch aarch64 to use overlay2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-08 18:37:17 +02:00
Sebastiaan van Stijn
402c7b1b27
Jenkinsfile: aarch64: move stage inside parallel group 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-08 18:37:15 +02:00
Michael Zhao
48b06a2561
Tailor CI for ARM, skip legacy integration test. 
Signed-off-by: Michael Zhao <michael.zhao@arm.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-08 18:37:13 +02:00
Michael Zhao
af86580000
Test to enable CI on aarch64. 
Signed-off-by: Michael Zhao <michael.zhao@arm.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-08 18:37:10 +02:00
Tibor Vass
dba8da8158
Merge pull request #40057 from andrewhsu/truetop 
integration-cli: TestDockerNetworkConnectLinkLocalIP return on failure
 2019-10-07 17:51:28 -07:00
Tibor Vass
72befc2218
Merge pull request #40043 from andrewhsu/true 
integration-cli: TestUserDefinedNetworkConnectDisconnectAlias return on failure
 2019-10-07 16:42:05 -07:00
Brian Goff
4faf65f250
Merge pull request #40056 from kolyshkin/dm-unit 
devmapper: fix unit test
 2019-10-07 15:43:08 -07:00
Andrew Hsu
318e279fd8 integration-cli: TestDockerNetworkConnectLinkLocalIP return on failure 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2019-10-07 22:27:24 +00:00
Andrew Hsu
7450f89f6c integration-cli: TestUserDefinedNetworkConnectDisconnectAlias return on failure 
Have the test return immediately if the test does not pass instead of
stuck in `top`.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2019-10-07 22:26:45 +00:00
Brian Goff
9425487117
Merge pull request #40054 from thaJeztah/swarmtests_more_debugging 
integration-cli: DockerSwarmSuite: show output on failures
 2019-10-07 13:50:05 -07:00
Kir Kolyshkin
8663d09334 devmapper: fix unit test 
It has been pointed out that sometimes device mapper unit tests
fail with the following diagnostics:

> --- FAIL: TestDevmapperSetup (0.02s)
>    graphtest_unix.go:44: graphdriver: loopback attach failed
>    graphtest_unix.go:48: loopback attach failed

The root cause is the absence of udev inside the container used
for testing, which causes device nodes (/dev/loop*) to not be
created.

The test suite itself already has a workaround, but it only
creates 8 devices (loop0 till loop7). It might very well be
the case that the first few devices are already used by the
system (on my laptop 15 devices are busy).

The fix is to raise the number of devices being manually created.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2019-10-07 13:21:14 -07:00
Sebastiaan van Stijn
d5f07220fc
integration-cli: DockerSwarmSuite: show output on failures 
Unfortunately quite some of these tests do output-matching, which
may be CLI dependent; this patch prints the output string, to help
debugging failures that may be related to the output having changed
between CLI versions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-07 21:28:49 +02:00
Sebastiaan van Stijn
31da04af21
Merge pull request #40045 from thaJeztah/bump_deps 
Bump logrus 1.4.2, go-shellwords, mergo, flock, creack/pty, golang/gddo, gorilla/mux
 2019-10-07 18:38:07 +02:00
Brian Goff
0abbb9e4eb
Merge pull request #40049 from CoRfr/buidx-typo 
Jenkinsfile: fix typo buidx -> buildx
 2019-10-06 10:39:54 -07:00
Bertrand Roussel
bef0aca449 Jenkinsfile: fix typo buidx -> buildx 
Addressing a small typo noticed in commit c04ea1133d

Signed-off-by: Bertrand Roussel <broussel@sierrawireless.com>
 2019-10-06 10:26:55 -07:00
Sebastiaan van Stijn
bb5650619e
bump gorilla/mux v1.7.3 
full diff: ed099d4238...00bdffe0f3

changes included:

- gorilla/mux#477 Improve CORS Method Middleware
    - implements gorilla/mux#477 Make CORSMethodMiddleware actually make sense
- gorilla/mux#489 Fix nil panic in authentication middleware example

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-06 11:38:53 +02:00
Sebastiaan van Stijn
38418287f7
bump olang/gddo 72a348e765d293ed6d1ded7b699591f14d6cd921 
no local code changes, just keeping up with upstream

full diff: 9b12a26f3f...72a348e765

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-06 11:30:52 +02:00
Sebastiaan van Stijn
e5dce0f8c5
bump creack/pty v1.1.9 
full diff: https://github.com/creack/pty/compare/v1.1.7...v1.1.9

adds go mod support

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-06 03:01:05 +02:00
Sebastiaan van Stijn
61a2b7ac94
bump gofrs/flock v0.7.1 
full diff: https://github.com/gofrs/flock/compare/v0.7.0...v0.7.1

- gofrs/flock#34 don't mention sync.Locker in package documentation
    - fixes gofrs/flock#33 incorrect interface
- gofrs/flock#35 Fix linting issues and add goreportcard badge

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-06 02:39:43 +02:00
Sebastiaan van Stijn
9bd1b1a8ec
bump imdario/mergo v0.3.8 
full diff: https://github.com/imdario/mergo/compare/v0.3.7...v0.3.8

includes:

- imdario/mergo#112 Add strict override
    - fixes imdario/mergo#111 WithOverride should be able to check types
- imdario/mergo#106 Fix merging of interface types with concrete values
- imdario/mergo#120 should not overwrite pointers directly, instead check embedded values
    - fixes imdario/mergo#114 Embedded struct of pointer types will overwrite the whole destination struct
- imdario/mergo#125 added WithOverrideEmptySlice config flag

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-06 02:39:24 +02:00
Sebastiaan van Stijn
7dee71e02f
bump mattn/go-shellwords v1.0.6 
full diff: https://github.com/mattn/go-shellwords/compare/v1.0.5...v1.0.6

relevant changes:

- mattn/go-shellwords#24 Add dir option for parser
- mattn/go-shellwords#26 Fix backquote in part of argument
    - fixes mattn/go-shellwords#25 Backtick "eats" all runes until isSpace
- mattn/go-shellwords#28 Fix dollar quote
    - fixes mattn/go-shellwords#27 Multi-commands inside of command substitution are throwing "invalid command line string" errors
- mattn/go-shellwords#24 Add dir option for parser
- mattn/go-shellwords#24 Add dir option for parser
- mattn/go-shellwords#24 Add dir option for parser

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-06 02:19:58 +02:00
Sebastiaan van Stijn
9fac44028e
bump logrus v1.4.2 
full diff: https://github.com/sirupsen/logrus/compare/v1.4.1...v1.4.2

- sirupsen/logrus#946 Fix solaris build
- sirupsen/logrus#966 Add a checkTerminal for nacl to support running on play.golang.org
- sirupsen/logrus#969 fix build break for plan9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-06 02:16:47 +02:00
Akihiro Suda
ed2f50f8cd
Merge pull request #39340 from cpuguy83/buildkit_dockerfile 
Buildkit-optimized dockerfile + buildx
 2019-10-06 07:22:23 +09:00
Sebastiaan van Stijn
82097c0f1f
bump hashicorp/golang-lru v0.5.3 
full diff: https://github.com/hashicorp/golang-lru/compare/v0.5.1...v0.5.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-04 15:05:35 -07:00