Commit Graph
42016 Commits
Author SHA1 Message Date
GordonTheTurtle 6c90f5dd52 Merge component 'cli' from git@github.com:docker/cli master 2018-08-22 00:14:18 +00:00
Sebastiaan van Stijn a610952c4f Merge pull request #1303 from thaJeztah/remove_buildkit_experimental_annotations
Remove "experimental" annotations for buildkit
Upstream-commit: 08cf36daa6
Component: cli
2018-08-22 00:57:27 +01:00
Sebastiaan van Stijn ab4d7a2303 Move "session" support out of experimental for API 1.39 and up
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a500c394df
Component: cli
2018-08-22 00:51:19 +02:00
Sebastiaan van Stijn ab525d6a99 Remove "experimental" annotations for buildkit
BuildKit can now be enabled without the daemon having
experimental features enabled.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 60c75fda67
Component: cli
2018-08-22 00:38:59 +02:00
GordonTheTurtle e5f0e2d12d Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-08-21 21:03:58 +00:00
Tibor Vass fc316c8fb4 Merge pull request #1225 from thaJeztah/told_you_so_I_wont_warn_you_again
Use warnings provided by daemon
Upstream-commit: ca782599fb
Component: cli
2018-08-21 13:42:16 -07:00
GordonTheTurtle 0528c321e1 Merge component 'cli' from git@github.com:docker/cli master 2018-08-21 20:36:57 +00:00
Sebastiaan van Stijn d6a674adf4 Use warnings provided by daemon
Warnings are now generated by the daemon, and returned as
part of the /info API response.

If warnings are returned by the daemon; use those instead
of generating them locally.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3c27ce21c9
Component: cli
2018-08-21 22:29:57 +02:00
Sebastiaan van Stijn 5c668597be bump docker/docker
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7da71329bc
Component: cli
2018-08-21 22:29:43 +02:00
Michael Crosby e421ac528c Merge pull request #1233 from selansen/default_addr_pool
Global Default Address Pool feature support
Upstream-commit: e97d004395
Component: cli
2018-08-21 14:55:24 -04:00
selansen 534b83a7cb Global Default Address Pool feature support
This feature brings new attribute/option for swarm init command.
default-addr-pool will take string input which can be in below format.
"CIDR,CIDR,CIDR...:SUBNET-SIZE".
Signed-off-by: selansen <elango.siva@docker.com>
Upstream-commit: 587a94c935
Component: cli
2018-08-21 14:34:00 -04:00
Eli Uriegas bd24fd7ae6 Merge pull request #148 from dhiltgen/license_message
Set up default product license for community engines
Upstream-commit: 7195f2116059c01b3a4cc4314c345510d04a2feb
Component: packaging
2018-08-21 11:15:36 -07:00
Eli Uriegas a16152031b Merge pull request #151 from docker/develop
Merging the develop changes into master
Upstream-commit: a119f42ef86517dc79e0b3749acdb457a63dea6d
Component: packaging
2018-08-21 11:15:07 -07:00
GordonTheTurtle f9e3c69ec9 Merge component 'engine' from git@github.com:docker/engine master 2018-08-21 13:02:40 +00:00
Sebastiaan van Stijn ab69f491e3 Merge pull request #37502 from thaJeztah/you_have_been_warned
Add "Warnings" to /info endpoint, and move detection to the daemon
Upstream-commit: 2629fe93266e82751af4f1c7568e21060f065b73
Component: engine
2018-08-21 10:37:27 +01:00
Sebastiaan van Stijn 07c22f44e1 Add "Warnings" to /info endpoint, and move detection to the daemon
When requesting information about the daemon's configuration through the `/info`
endpoint, missing features (or non-recommended settings) may have to be presented
to the user.

Detecting these situations, and printing warnings currently is handled by the
cli, which results in some complications:

- duplicated effort: each client has to re-implement detection and warnings.
- it's not possible to generate warnings for reasons outside of the information
  returned in the `/info` response.
- cli-side detection has to be updated for new conditions. This means that an
  older cli connecting to a new daemon may not print all warnings (due to
  it not detecting the new conditions)
- some warnings (in particular, warnings about storage-drivers) depend on
  driver-status (`DriverStatus`) information. The format of the information
  returned in this field is not part of the API specification and can change
  over time, resulting in cli-side detection no longer being functional.

This patch adds a new `Warnings` field to the `/info` response. This field is
to return warnings to be presented by the user.

Existing warnings that are currently handled by the CLI are copied to the daemon
as part of this patch; This change is backward-compatible with existing
clients; old client can continue to use the client-side warnings, whereas new
clients can skip client-side detection, and print warnings that are returned by
the daemon.

Example response with this patch applied;

```bash
curl --unix-socket /var/run/docker.sock http://localhost/info | jq .Warnings
```

```json
[
  "WARNING: bridge-nf-call-iptables is disabled",
  "WARNING: bridge-nf-call-ip6tables is disabled"
]
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a3d4238b9ce653d2863fbc93057ed4162a83221e
Component: engine
2018-08-21 11:36:15 +02:00
Vincent Demeester 6fd76fec3f Merge pull request #37679 from Microsoft/jjh/disable-rs5-failing-test
Disable TestExecWindowsOpenHandles on RS5 temporarily
Upstream-commit: 969adfc647f54a9aa1fc3f8a0c6541111cfcaf84
Component: engine
2018-08-21 11:35:47 +02:00
GordonTheTurtle 0aeba9b7ad Merge component 'engine' from git@github.com:docker/engine master 2018-08-21 05:02:44 +00:00
John Howard 3736c7fe0e Disable TestExecWindowsOpenHandles on RS5 temporarily
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 15a25f6eb94d0f033045fadc3b8beedcb32e426f
Component: engine
2018-08-20 19:48:20 -07:00
Tibor Vass e4dc477de6 Merge pull request #37558 from selansen/master
Global Default Address Pool feature support
Upstream-commit: 1800883bd16664846db1572b8c8fbe8c85892cee
Component: engine
2018-08-20 18:15:44 -07:00
Tibor Vass 438b026631 Merge pull request #37604 from dperny/task-wait-for-attachments
Block task starting until node attachments are ready
Upstream-commit: 9d71a574fe0197434b543d77332597c722129c1b
Component: engine
2018-08-20 18:14:44 -07:00
GordonTheTurtle 9a4c2433fd Merge component 'engine' from git@github.com:docker/engine master 2018-08-21 01:02:44 +00:00
GordonTheTurtle bf1cdbb0f9 Merge component 'cli' from git@github.com:docker/cli master 2018-08-21 00:36:49 +00:00
Daniel Hiltgen 06c4880d2c Set up default product license for community engines
This will report a fixed string for community engines
Upstream-commit: 140dd867085cbe97947a64353fe245b858284172
Component: packaging
2018-08-20 16:41:23 -07:00
Andrew Hsu a459cbb061 Merge pull request #1275 from AntaresS/buildkit-support
[enhancement] enable buildkit from daemon side
Upstream-commit: 2461cd618d
Component: cli
2018-08-20 16:15:32 -07:00
Anda Xu 17cb083800 vendor dependency
Signed-off-by: Anda Xu <anda.xu@docker.com>
Upstream-commit: acf43b62b5
Component: cli
2018-08-20 15:32:25 -07:00
GordonTheTurtle 10e40bd154 Merge component 'engine' from git@github.com:docker/engine master 2018-08-20 22:19:44 +00:00
Tibor Vass 3569cbf496 Merge pull request #37620 from tonistiigi/buildkit-net-modes
buildkit: enable net modes and bridge
Upstream-commit: cf72051c3746fa60d7e7995c0342eaca91f07bfd
Component: engine
2018-08-20 14:56:24 -07:00
GordonTheTurtle 4bfe96dbc6 Merge component 'cli' from git@github.com:docker/cli master 2018-08-20 21:53:07 +00:00
Eli Uriegas 6536c488a2 Merge pull request #150 from seemethere/require
Set containerd to be a systemd bind for docker
Upstream-commit: 710ecfcf0992363047d1f9bf57be20b7459ae0c7
Component: packaging
2018-08-20 14:31:22 -07:00
Eli Uriegas dbc4cb6ea0 Set containerd to be a systemd bind for docker
The daemon won't actually start without containerd

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 16037618282dc5076089c7b749cdd07376650f8d
Component: packaging
2018-08-20 21:17:32 +00:00
Sebastiaan van Stijn 524fe098d4 Merge pull request #37675 from cpuguy83/unused_logging_code
Remove now unused multireader.
Upstream-commit: 715aa064ade3576b778f0f71ba43829ba625bf69
Component: engine
2018-08-20 22:12:38 +01:00
Drew Erny e44dbe9123 Block task starting until node attachments are ready
Blocks the execution of tasks during the Prepare phase until there
exists an IP address for every overlay network in use by the task. This
prevents a task from starting before the NetworkAttachment containing
the IP address has been sent down to the node.

Includes a basic test for the correct use case.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 3c81dc3103d9c88cb333c80e0810f80ab80c374e
Component: engine
2018-08-20 15:28:15 -05:00
Eli Uriegas ca4ed4129e Merge pull request #149 from seemethere/offline_engine
Do offline bundles for engine installs
Upstream-commit: 99edae9143f8189a75aab661536c995d46c55231
Component: packaging
2018-08-20 13:23:00 -07:00
Eli Uriegas b3c9a88509 Do offline bundles for engine installs
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: fe03039776edbc90053b510ae6e72657340b1ccb
Component: packaging
2018-08-20 20:08:07 +00:00
selansen c9c36cf7eb Global Default Address Pool feature support
This feature allows user to specify list of subnets for global
default address pool. User can configure subnet list using
'swarm init' command. Daemon passes the information to swarmkit.
We validate the information in swarmkit, then store it in cluster
object. when IPAM init is called, we pass subnet list to IPAM driver.

Signed-off-by: selansen <elango.siva@docker.com>
Upstream-commit: f7ad95cab9cc7ba8925673a933028d53284c13f5
Component: engine
2018-08-20 15:07:08 -04:00
Anda Xu 01ffacab2e enable buildkit as builder from daemon; no env var needs to be set
Signed-off-by: Anda Xu <anda.xu@docker.com>
Upstream-commit: ef09ca8987
Component: cli
2018-08-20 11:59:39 -07:00
Tibor Vass 0f3d3cb192 Disable buildkit's subreaper until the issue is understood
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 4a40f921d3c73b056271bad128f9da7d90b1cd2a
Component: engine
2018-08-20 18:55:01 +00:00
Tonis Tiigi 0a604d1631 builder: enable add-host for buildkit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: d46fa93cb637e7de964769717f3b5770f6732bee
Component: engine
2018-08-20 18:55:01 +00:00
Tonis Tiigi 4020288a72 builder: allow setting host/none network mode
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: c6c680ad5b1e4d17faaebc753e1123d8662ad297
Component: engine
2018-08-20 18:55:01 +00:00
Tonis Tiigi 3214172ab1 builder: setup code for a bridge networking
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: d6424a088dacc902b674f402e6a62aa8f5f4a803
Component: engine
2018-08-20 18:55:01 +00:00
Tonis Tiigi 560eea56b4 vendor: update buildkit to 46f9075a
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: bc67a7886273ad8cc270e9c6792c787e0cf7745e
Component: engine
2018-08-20 18:54:10 +00:00
Sebastiaan van Stijn ebd369251b Merge pull request #37593 from AntaresS/add-enable-buildkit
[enhancement] add optional fields in daemon.json to enable buildkit
Upstream-commit: 991682749612d6613d5f49035f62e2a479c0dc59
Component: engine
2018-08-20 19:41:56 +01:00
Andrew Hsu 6eb2284e77 Merge pull request #1302 from andrewhsu/venbk
vndr buildkit, containerd, console
Upstream-commit: 466e1b0741
Component: cli
2018-08-20 11:10:46 -07:00
Andrew Hsu aab5441f89 vndr buildkit, containerd, and console
vndr buildkit to e8c7acc
vndr containerd to v1.2.0-beta.0
vndr console to 4d8a41f

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 7a73d112ff
Component: cli
2018-08-20 17:59:40 +00:00
Michael Crosby 66cdb5a200 Merge pull request #1260 from dhiltgen/ce_q3
Add CLI support for running dockerd in a container on containerd
Upstream-commit: 0c444c521f
Component: cli
2018-08-20 13:39:49 -04:00
Brian Goff f36591e04d Remove now unused multireader.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5da8bc2e5b4f19d2201f8642cbb3663a7cc70c8a
Component: engine
2018-08-20 09:42:19 -07:00
Daniel Hiltgen f4a7b44342 Add engine commands built on containerd
This new collection of commands supports initializing a local
engine using containerd, updating that engine, and activating
the EE product

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: fd2f1b3b66
Component: cli
2018-08-20 09:42:05 -07:00
Daniel Hiltgen 18e4f23013 Vendoring bump for containerd and licensing
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 11a312118f
Component: cli
2018-08-20 09:42:05 -07:00
Eli Uriegas d59e776158 Merge pull request #147 from seemethere/c
Make ENGINE_IMAGE configurable for dockerd.json
Upstream-commit: 411a80222b89308419e138708cc2cfc7442721b7
Component: packaging
2018-08-20 08:08:55 -07:00