Commit Graph
41774 Commits
Author SHA1 Message Date
GordonTheTurtle ff8bdfb5f9 Merge component 'engine' from git@github.com:docker/engine master 2018-08-01 21:04:10 +00:00
Tibor Vass 1e5cba450a Merge pull request #37489 from poizan42/fix-mips-no-pie
-buildmode=pie is not supported on Linux on MIPS either
Upstream-commit: 724c5f317e0aabb3fb95933e5dd95ab9d71b5cdb
Component: engine
2018-08-01 10:39:55 -07:00
GordonTheTurtle c8b3283839 Merge component 'cli' from git@github.com:docker/cli master 2018-08-01 16:36:51 +00:00
Silvin ed3a613040 Merge pull request #1258 from wyckster/patch-2
Fixed wrong apostrophe character
Upstream-commit: 261ff66d61
Component: cli
2018-08-01 18:09:36 +02:00
wyckster 691f30bc72 Fixed wrong apostrophe character
Changed unexpected Unicode character 0x1fbf GREEK PSILI that was standing in as an imposter for an apostrophe:  an _impostrophe_.

Signed-off-by: Chad Faragher <wyckster@hotmail.com>
Upstream-commit: b59823c784
Component: cli
2018-08-01 11:06:07 -04:00
Vincent Demeester 52c1a41d81 Merge pull request #1249 from vdemeester/compose-template-pkg-enhancement
Add a new `ExtractVariables` function to `compose/template` package
Upstream-commit: da544e8938
Component: cli
2018-08-01 16:18:46 +02:00
Vincent Demeester 0bdf126d62 Add a new ExtractVariables function to compose/template package
It allows to get easily all the variables defined in a
composefile (the `map[string]interface{}` representation that
`loader.ParseYAML` returns at least) and their default value too.

This commit also does some small function extract on substitution
funcs to reduce a tiny bit duplication.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: afb87e42f2
Component: cli
2018-08-01 16:12:49 +02:00
Vincent Demeester 6951f936e1 Merge pull request #1256 from silvin-lubecki/update-reviewers
Remove outdated completion reviewers file
Upstream-commit: 2093fd6e52
Component: cli
2018-08-01 15:19:36 +02:00
Silvin Lubecki d180792961 Remove outdated completion reviewers file
Clean maintainers and code owners files

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: 9022a00fbe
Component: cli
2018-08-01 15:08:36 +02:00
Sebastiaan van Stijn b6bdcc10a5 Merge pull request #37485 from fcrisciani/resolv
Systemd-resolved proper handling
Upstream-commit: e1584514c15f6ad91b9ef5bc530a1eef46f18267
Component: engine
2018-08-01 14:52:33 +02:00
Vincent Demeester 1e6a95f11f Merge pull request #37522 from vdemeester/bump-some-deps
Bump a bunch of dependencies to more recent versions
Upstream-commit: 1dfcf4fe77e47d740939271aea516e11b5f9bcba
Component: engine
2018-08-01 13:45:30 +02:00
Sebastiaan van Stijn 5483ae0078 Merge pull request #37573 from thaJeztah/windows-rs3-ci
Temporarily disable failing tests on Windows RS3
Upstream-commit: 27f663a2532bb1b4c7fc375f8597d08064ce1890
Component: engine
2018-08-01 12:16:12 +02:00
Vincent Demeester 14dcb25448 Bump a bunch of dependencies to more recent versions
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b0d108aa6ba4a52db1dd2bba0fd512903ab725ca
Component: engine
2018-08-01 10:37:27 +02:00
Vincent Demeester 546812f824 Merge pull request #37438 from adshmh/fix-flaky-test-TestRunContainerWithBridgeNone
fix the race condition in the integration test TestRunContainerWithBridgeNone
Upstream-commit: 9149ef67be8ac945d68fafb16a1aa4ccb2f72249
Component: engine
2018-08-01 09:57:29 +02:00
John Stephens ef87b4e0a0 Temporarily disable failing tests on Windows RS3
Signed-off-by: John Stephens <johnstep@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1b05ea472703ddc47ec5052bc031fc23e60356c4
Component: engine
2018-07-31 23:49:36 +02:00
GordonTheTurtle ba6994fe02 Merge component 'cli' from git@github.com:docker/cli master 2018-07-31 20:37:42 +00:00
Sebastiaan van Stijn 42c10fc02b Merge pull request #1215 from albers/completion-service-logs-options
Add bash completion for `service logs --details|--raw`
Upstream-commit: 08f5f52cdc
Component: cli
2018-07-31 22:25:36 +02:00
Brian Goff f13fff9319 Merge pull request #1246 from vdemeester/bump-mergo
Bump mergo to v0.3.6
Upstream-commit: 24b7effa30
Component: cli
2018-07-31 10:59:41 -07:00
Brian Goff de583a8acb Merge pull request #36630 from AkihiroSuda/hijack-dialer
client: add WithDialContext() and client.Dialer()
Upstream-commit: 562df8c2d6f48601c8d1df7256389569d25c0bf1
Component: engine
2018-07-31 10:49:27 -07:00
Vincent Demeester 038c38eeb6 Merge pull request #37570 from kolyshkin/typpo
loggerutils: fix a typo
Upstream-commit: 62739828d0bdf75b6dfc38e43d9d496c3da3db96
Component: engine
2018-07-31 18:57:18 +02:00
GordonTheTurtle 9822d56542 Merge component 'cli' from git@github.com:docker/cli master 2018-07-31 16:36:41 +00:00
Silvin 99b63333cb Merge pull request #1248 from marcov/add-help-target
Add `help` and remove `watch` targets in docker.Makefile
Upstream-commit: 74071f2347
Component: cli
2018-07-31 16:52:07 +02:00
Kir Kolyshkin a8fa741f70 loggerutils: fix a typo
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 2c6fbd864ae089e9cb544666949b8b2d897b3b23
Component: engine
2018-07-31 15:44:46 +03:00
Marco Vedovati eda72c01e5 Add help and remove watch targets in docker.Makefile
* Add the `help` target to document make targets when building using a
container
* Remove the `watch` target (filewatcher was removed with c0588a9c) from
docker.Makefile and Makefile

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
Upstream-commit: 760ca04709
Component: cli
2018-07-31 14:38:51 +02:00
GordonTheTurtle 5bd951adc2 Merge component 'cli' from git@github.com:docker/cli master 2018-07-31 12:36:48 +00:00
Vincent Demeester 2514c7af88 Merge pull request #1247 from marcov/make-help
Allow running `make help` without out-of-container warning
Upstream-commit: 7f853fee87
Component: cli
2018-07-31 14:04:10 +02:00
Sebastiaan van Stijn 7007293101 Merge pull request #37567 from vdemeester/bump-mergo
Bump mergo to v0.3.6
Upstream-commit: 9cf8feebbf9d94629882a14d77a2b73ce3b14b70
Component: engine
2018-07-31 13:10:13 +02:00
Kasper Fabæch Brandt 63b2aa93fd -buildmode=pie is not supported on Linux on MIPS either
Signed-off-by: Kasper Fabæch Brandt <poizan@poizan.dk>
Upstream-commit: daba5daf4fc76fe530f093125efe094c2dd93e8c
Component: engine
2018-07-31 13:02:01 +02:00
Marco Vedovati 04c5e8c6df Allow running make help without out-of-container warning
Signed-off-by: Marco Vedovati <mvedovati@suse.com>
Upstream-commit: 265dec037b
Component: cli
2018-07-31 10:56:48 +02:00
GordonTheTurtle 928dc2de5e Merge component 'cli' from git@github.com:docker/cli master 2018-07-31 08:36:45 +00:00
Vincent Demeester a87b47f24d Merge pull request #1242 from cyphar/buildmode-pie
build: add -buildmode=pie
Upstream-commit: 40650cfbd5
Component: cli
2018-07-31 10:09:11 +02:00
Vincent Demeester 0f058dae99 Bump mergo to v0.3.6
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a550b0ae475ebbfcffe92d9bf40734f5b3de2f7e
Component: engine
2018-07-31 10:03:43 +02:00
Vincent Demeester 89febef540 Bump mergo to v0.3.6
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 1f1507b0a4
Component: cli
2018-07-31 09:57:56 +02:00
Sebastiaan van Stijn 1f48874f14 Merge pull request #1244 from vdemeester/expose-compose-transform
Exposes compose `loader.Transform` function…
Upstream-commit: 70d5cb0dd0
Component: cli
2018-07-31 09:43:13 +02:00
Vincent Demeester 7ff97deeb6 Exposes compose loader.Transform function…
This should make it easier for people to write custom composefile
parser without duplicating too much code. It takes the default
transformers and any additional number of transformer for any
types. That way it's possible to transform a `cli/compose` map into a
custom type that would use some of `cli/compose` types and its own.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0246bc1b3b
Component: cli
2018-07-31 09:37:09 +02:00
GordonTheTurtle c19b8d90ba Merge component 'cli' from git@github.com:docker/cli master 2018-07-30 16:36:46 +00:00
Sebastiaan van Stijn a013875ea3 Merge pull request #1230 from vdemeester/update-k8s-and-other-deps
Update k8s and other deps
Upstream-commit: b4e50635a2
Component: cli
2018-07-30 17:49:11 +02:00
Vincent Demeester 499075c042 Merge pull request #1240 from thaJeztah/datapath_addr_api_annotation
Add API-version anotation for --data-path-addr
Upstream-commit: 19653e7fad
Component: cli
2018-07-30 17:47:52 +02:00
Silvin d5c619e6c1 Merge pull request #1222 from thaJeztah/its_not_standard_but_its_in
Update --compose-file flag description to mention stdin
Upstream-commit: 6cd0e2fe70
Component: cli
2018-07-30 16:23:29 +02:00
Vincent Demeester cb923e6307 Re-order vendor.conf alphabeticaly
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: fffec04374
Component: cli
2018-07-30 16:14:52 +02:00
GordonTheTurtle 2533a526f1 Merge component 'cli' from git@github.com:docker/cli master 2018-07-30 12:36:43 +00:00
Sebastiaan van Stijn fca724f301 Merge pull request #37543 from Snorch/do_not_lose_error_message
Don not lose an error message from d.StartWithError in d.Start
Upstream-commit: 73d73ba9622596b9c405f1ac955474804b286be6
Component: engine
2018-07-30 13:20:01 +02:00
Sebastiaan van Stijn 3cb14e951e Merge pull request #37462 from cwgem/37453_slash_prefix_removal
Remove slash prefix when matching name filters (Fixes #37453)
Upstream-commit: 7b46fbc17ab991804126588a8dfd09e54ec5902b
Component: engine
2018-07-30 13:17:40 +02:00
Sebastiaan van Stijn 6f7a62be58 Merge pull request #990 from vdemeester/e2e-iddfile-from-moby
Import TestBuildIidFileSquash from moby to cli
Upstream-commit: ed335aba8c
Component: cli
2018-07-30 11:37:36 +02:00
Aleksa Sarai 4a40f4d761 build: add -buildmode=pie
Make all dynbinary builds be position-independent (this adds both
security benefits and can help with flaky builds on POWER
architectures).

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: 164e812b7a
Component: cli
2018-07-30 19:34:01 +10:00
Sebastiaan van Stijn 6ec35e4b2d Add API-version anotation for --data-path-addr
This flag was added in Docker 17.06, API version 1.31 through
moby@8dc8cd4719f165c01c98e7d3ce1d6cea6a8f60b8, but didn't add
API-version annotations.

This patch adds the missing annotations to hide this flag if
the CLI is connected to an older version of the daemon that
doesn't support that API.

Before this patch:

    DOCKER_API_VERSION=1.30 docker swarm init --help | grep data-path-addr
          --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)

    DOCKER_API_VERSION=1.31 docker swarm init --help | grep data-path-addr
          --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)

With this patch applied:

    DOCKER_API_VERSION=1.30 docker swarm init --help | grep data-path-addr
    # (no result)

    DOCKER_API_VERSION=1.31 docker swarm init --help | grep data-path-addr
          --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 91b1ad9d2b
Component: cli
2018-07-30 11:05:20 +02:00
Pavel Tikhomirov 0cd2e6ef4a Don not lose an error message from d.StartWithError in d.Start
Else it is harder to understand where we've failed in StartWithLogFile

We have an errror:

[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
docker_cli_userns_test.go:27:
    s.d.StartWithBusybox(c, "--userns-remap", "default")
/go/src/github.com/docker/docker/internal/test/daemon/daemon.go:203:
    t.Fatalf("Error starting daemon with arguments: %v", args)
... Error: Error starting daemon with arguments: [--userns-remap default]

[d42ce729d0b06] exiting daemon

Likely it is "[..] Daemon exited during startup" case, but these error
message is lost

Also we lose the error returned by waiting daemon so also add it

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Upstream-commit: 2ed53943f37c26017260759b12d32cfdd75be152
Component: engine
2018-07-30 10:33:03 +02:00
Sebastiaan van Stijn 2525e6162b Merge pull request #37542 from kolyshkin/int-msg
integration: fix log message
Upstream-commit: b9bb3bae5161f931c1dede43c67948c599197f50
Component: engine
2018-07-30 10:31:29 +02:00
Sebastiaan van Stijn 2d0e7870e2 Merge pull request #37551 from Quasilyte/quasilyte/fixErrorReturn
pkg/system: return nil explicitly
Upstream-commit: 0211de67ab92cd62ab4484bac28c33f9cbd92b7f
Component: engine
2018-07-30 10:22:51 +02:00
Iskander Sharipov 2d2f5454b7 pkg/system: return nil explicitly
Makes code less confusing.
Otherwise it looks like an error (typo of "==" instead "!=").

Signed-off-by: Iskander Sharipov <quasilyte@gmail.com>
Upstream-commit: cda9d5f7f0c4a155d1ae9e06c203fcb89600ff2a
Component: engine
2018-07-29 01:31:08 +03:00