Commit Graph

515 Commits

Author SHA1 Message Date
2b9dc0f4a1 Merge pull request #28477 from vdemeester/update-reference-filter-cli-reference
Update `images` cli reference with reference filter
Upstream-commit: c6d69ea9e9a913e6036c5e3832083183ce92da23
Component: engine
2016-11-18 01:34:48 +01:00
781fc7e6b4 api/server/httputils: service unavailable for disable swarm
When swarm-mode is disabled, we need to return an error indicating this.
406 was chosen for the "Not Acceptable" verbiage, but this code has
specific semantics in relation to the `Accept` header, which aren't
applicable here.

We now use a 503 for this case. While it is not a perfect match, it does
make it clear that the particular "service" (read: API endpoint) is not
available. The body of the message provides the user with enough
information to take action on it by enabling swarm-mode and ensuring the
service is available.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 1d90d7604881e29b71819af9c092d565513aeeec
Component: engine
2016-11-17 11:43:45 -08:00
49f71532e6 Update images cli reference with reference filter
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a0d7b34d9cb0876f8583a6e15d1b1aaab8d2b9ab
Component: engine
2016-11-17 15:34:17 +01:00
9fe7b62295 Merge pull request #28322 from Microsoft/jjh/api1.26
Bump API to v1.26
Upstream-commit: 3f9dc0213583c7e903bebb02733df1e9ec9263b6
Component: engine
2016-11-17 00:01:46 +01:00
7acf8456de Merge pull request #27631 from allencloud/get-node-brefore-update
allow node update API to receive node name and id prefix
Upstream-commit: 673c5ee559b05adb9ef6e0e1d6135ff83522e38d
Component: engine
2016-11-16 17:47:31 +01:00
6e80fcc7bb Merge pull request #28346 from yongtang/11122016-docs-api-version
Fix missing versions in example requests of api docs
Upstream-commit: 297f2fd445a751813780a82a254b9aafc6ab6498
Component: engine
2016-11-16 12:15:05 +01:00
a76e66dfce Merge pull request #28316 from yongtang/28018-docker-info-swarm-managers-docs
Update docs for `docker info` for most recent changes.
Upstream-commit: cd2d52b5f6746ab83b835390fc6eb1f13dabde48
Component: engine
2016-11-16 12:08:35 +01:00
0d115ba911 allow node update api receive node name and id prefix
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: d075b83dd6e5bbd4470400d44889ca71cf9dbd59
Component: engine
2016-11-16 10:18:19 +08:00
900e9ed78b Bump API to v1.26
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9182cf1a8dc592c40d25b628a0a3cfa475c8dcea
Component: engine
2016-11-14 14:24:02 -08:00
a107ce5f56 Merge pull request #28350 from allencloud/add-swarm-judging-in-secret-API
judge manager before getting secret
Upstream-commit: 0f20d6f5ab24e5b05bd49165ecc11e9bafaf6833
Component: engine
2016-11-13 22:19:07 +01:00
a1ee221aad fix typo in node update docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 7bbbc8c7f16869dbb43e4e218ac280d5d1c0944a
Component: engine
2016-11-14 00:07:52 +08:00
ac2f27add0 judge manager before getting secret
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 1addb4817bca8daeb3a3bca207705ad72f5c7a16
Component: engine
2016-11-13 12:52:09 +08:00
983c12d757 Update docs for docker info for most recent changes.
This fix updates docs for `docker info` for most recent changes.
It also made several chagnes:
1. Replace 0.12.0-dev to 0.13.0 for api docs v1.24.
2. Replace 0.13.0-dev to 0.13.0 for api docs v1.25

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d7257640835abe5e7c08235b3fd974e319dbd7b6
Component: engine
2016-11-12 17:30:53 -08:00
da285acf1e Fix missing versions in example requests of api docs
It is not required to have version prefix for all the remote
APIs. Though there are still quite a few example requests
in api docs that does not have the version prefix.

This fix update the remote api docs to address this issue.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9dabde5b01c50cbac3da20943ba3c4498a7516c4
Component: engine
2016-11-12 13:12:02 -08:00
6ad57bc63a Extra v1.25 in API docs
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: beccd3663f3e377249fa5c07f62cbdbe5f3be14a
Component: engine
2016-11-11 12:50:05 -08:00
e75f2fc3c8 Add reference filter and deprecated filter param…
… for `docker images`.

This deprecates the `filter` param for the `/images` endpoint and make a
new filter called `reference` to replace it. It does change the CLI
side (still possible to do `docker images busybox:musl`) but changes the
cli code to use the filter instead (so that `docker images --filter
busybox:musl` and `docker images busybox:musl` act the same).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 820b809e70df8b9c7af00256182c48d935972a5c
Component: engine
2016-11-11 15:34:01 +01:00
b0b2a12b08 update media_type
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 970b23db2e97e1671c6bf4b57bfe5d1a30e98819
Component: engine
2016-11-10 15:51:32 -08:00
fadae43674 move plugins out of experimental
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: c410222e42fb9195909390337bc129c6481e2453
Component: engine
2016-11-10 15:51:32 -08:00
0d1faa11e0 Merge pull request #28089 from aluzzardi/service-logs
service logs
Upstream-commit: 5f9fe54b35cf64181c62a8faec8651c6a25fcc95
Component: engine
2016-11-10 15:13:41 -08:00
9de0bed2e4 service logs reference documentation
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 97e4bff6b2035f24306f41ef83eb4d79e53d354b
Component: engine
2016-11-10 13:46:03 -08:00
e312e280e3 change node ls and service ls api and docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 48c3fcedfa95f7c12868b218bd831dac8e04864f
Component: engine
2016-11-11 02:51:19 +08:00
62ec0be101 Merge pull request #28164 from anusha-ragunathan/plugin-build
Add plugin create functionality.
Upstream-commit: 28a1ea342d1f227664ad30ffd05eaaab8c9ef93e
Component: engine
2016-11-09 17:49:51 -08:00
c4b7cbe0fb Document autolock/unlock/unlock-key
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 824db2c4543f912c1fdf392ebbaefa5540bc88a4
Component: engine
2016-11-09 16:12:11 -08:00
3e9922773f Merge pull request #28078 from sanimej/inspect
Show peer nodes in network inspect for swarm overlay networks
Upstream-commit: 5ef5a4216a83421122461c90b7aa1ca1d709c4c8
Component: engine
2016-11-09 15:33:13 -08:00
948055475e Add plugin create functionality.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 5b6e1bc9e551ba56b44c3f409fd5d48f8a54ce1d
Component: engine
2016-11-09 15:23:03 -08:00
6c7506b25f Show peer nodes in network inspect for swarm overlay networks
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: dd9944aa644c717009a85ab85e00894ef3d3b20f
Component: engine
2016-11-09 13:58:04 -08:00
f16e4b6295 add api docs for secrets
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 0bcb65ccbae17bf9370191bb295548d232569b93
Component: engine
2016-11-09 14:27:45 -05:00
d8b013433e Deprecate API calls without a version
See #21157 for more details.

In a future version of Docker, providing a version to API calls
will be mandatory. An implementation of this is in #27801.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: a5fe15072dc32b7a613c7776936014e4b1857ee1
Component: engine
2016-11-09 17:04:16 +01:00
0fd78d838a Merge pull request #27745 from vieux/cli_backward_compose_api
allow client to talk to an older server
Upstream-commit: d3c780bb90cb5a087fdbffbb8be14fa5eaacca10
Component: engine
2016-11-08 18:27:23 -08:00
cc2d08fb86 Merge pull request #27567 from yongtang/24391-dns-setting
Add custom DNS settings to service definition
Upstream-commit: 462e57f05eba94cacad2c5e1383d94baf8fe090b
Component: engine
2016-11-08 17:43:00 -08:00
df125f380f Merge pull request #27992 from Microsoft/jjh/minapitoinfo
Adds `MinAPIVersion` to docker version
Upstream-commit: 2d4203222574623b10d94817b9959a08698f516b
Component: engine
2016-11-08 15:49:33 -08:00
647428d26f Add custom DNS settings to service update
This fix adds `--dns-add`, `--dns-rm`, `--dns-opt-add`, `--dns-opt-rm`,
`--dns-search-add` and `--dns-search-rm` to `service update`.

An integration test and a unit test have been added to cover the changes in this fix.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a39c0cf00780c021e98f638ab7edf151a8adb789
Component: engine
2016-11-08 15:41:32 -08:00
d0ebaa81e8 always add but hide experimental cmds and flags
Signed-off-by: Victor Vieux <vieux@docker.com>

update cobra and use Tags

Signed-off-by: Victor Vieux <vieux@docker.com>

allow client to talk to an older server

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: e98e4a71110fd33852bb755a9b8b4ebc9df904db
Component: engine
2016-11-08 04:55:27 -08:00
e349632310 Adds minimum API version to version
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d29995bb8481a18fd00b10fe49f2960ee8136619
Component: engine
2016-11-07 21:20:00 -08:00
95849eb6df Merge pull request #28076 from yongtang/25644-docker-service-tty
Add `--tty` to `docker service create/update`
Upstream-commit: 69efb4652c1f619f64148fd21971ff18ac575899
Component: engine
2016-11-07 22:15:27 -05:00
9254ca1e2c Merge pull request #27923 from vieux/plugin_set_gogogo
support env for docker plugin set
Upstream-commit: 03da822ee9afa1713fe28c3996b0872a0e228c28
Component: engine
2016-11-07 17:07:14 -08:00
a773a75547 support env for docker plugin set
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: efbed4500e30ff1a0eef4ff71fd46a58363d041b
Component: engine
2016-11-07 16:59:29 -08:00
2a49113fdc Add --tty to docker service create/update
This fix tries to add `--tty` to `docker service create/update`. As was
specified in 25644, `TTY` flag has been added to SwarmKit and is
already vendored.

This fix add `--tty` to `docker service create/update`.

Related document has been updated.

Additional integration tests has been added.

This fix fixes 25644.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 599be5a551bbadf23d76677c7d54c338901781f6
Component: engine
2016-11-07 16:42:32 -08:00
cdf2135b1c Merge pull request #28102 from yongtang/11052016-docs-build-Step
Update docs for the output of `docker build` (Step 1/...)
Upstream-commit: 5b2cedf11edf095b1de17d43752edacd5a2e6669
Component: engine
2016-11-07 09:28:08 +01:00
8c052677e4 Update docs for the output of docker build (Step 1/...)
PR 24978 adds hint of of progress to the output of `docker build`
for 1.13, in the format of
```
Step 1/5 ...
...
Step 2/5 ...
...
```

Though some of the docs hasn't been updated.

This fix did a grep in docs and updated the related places.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7d529492cc8b902bbf2e1f293546e3b19134db1b
Component: engine
2016-11-05 19:05:19 -07:00
0453189408 Follow up docs update for PR 27958
This fix is a follow up for any additional docs update for PR 27958.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f82f8eeaf8bffffbea9a05fb061a3bf528432a78
Component: engine
2016-11-04 20:18:40 -07:00
c8300bf35f Windows: Add cpu count option
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 4e15420b9be50ddd7fa65e5c7f9b732777f9cc35
Component: engine
2016-11-04 13:38:50 -07:00
04676aa104 docs: update for new secopts struct in GET /info
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: e6ec90608ca06431920afa6d4c56130af9c02a28
Component: engine
2016-11-04 19:25:51 +01:00
133eec9cfa Add --cpus flag to control cpu resources
This fix tries to address the proposal raised in 27921 and add
`--cpus` flag for `docker run/create`.

Basically, `--cpus` will allow user to specify a number (possibly partial)
about how many CPUs the container will use. For example, on a 2-CPU system
`--cpus 1.5` means the container will take 75% (1.5/2) of the CPU share.

This fix adds a `NanoCPUs` field to `HostConfig` since swarmkit alreay
have a concept of NanoCPUs for tasks. The `--cpus` flag will translate
the number into reused `NanoCPUs` to be consistent.

This fix adds integration tests to cover the changes.

Related docs (`docker run` and Remote APIs) have been updated.

This fix fixes 27921.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 846baf1fd3efcbfbf9d3eb99e436ca9a59d3e185
Component: engine
2016-11-04 09:43:10 -07:00
062414bb0e fix frontmatter keywords value type (string, instead of []string) in /docs/reference
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 248c699ec88bb249ce9fd03001d13f29ac0b4b99
Component: engine
2016-11-03 15:48:30 -07:00
e11e25579b added node ip autodetection
Manager now auto-detects the address that an agent connects to the cluster
from and stores it. This is useful for many kinds of internal cluster
management tools.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 9bcf623719104fbd196ab0ca14af48f790980499
Component: engine
2016-11-03 08:10:14 -07:00
3e5ee94d25 node rm can be applied on not only active node
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 002262d6f5d9d88b690124b3743db6856fe4f599
Component: engine
2016-11-02 17:22:04 +08:00
c7c95dc226 Adds ability to squash image after build
Allow built images to be squash to scratch.
Squashing does not destroy any images or layers, and preserves the
build cache.

Introduce a new CLI argument --squash to docker build
Introduce a new param to the build API endpoint `squash`

Once the build is complete, docker creates a new image loading the diffs
from each layer into a single new layer and references all the parent's
layers.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 362369b4bbea38881402d281ee2015d16e8b10ce
Component: engine
2016-11-01 13:41:59 -04:00
0be42defbd Merge pull request #24698 from jhorwit2/jah/clist-health-filter-format
Fixes #24022 - Adds container health support to docker ps filter/format
Upstream-commit: 515e5dade7a006dbd2c42880f1af695da22ece60
Component: engine
2016-10-29 06:56:06 +02:00
4e9b278e51 Merge pull request #27840 from estesp/add-userns-status-to-info
Add "userns" to `docker info` security options output
Upstream-commit: 1fb9c4e89188f48c79889f6128fdec865bed467d
Component: engine
2016-10-29 02:58:34 +02:00