Commit Graph

143 Commits

Author SHA1 Message Date
8a7da51391 Check minimum kernel memory limit to be 4M
Fixes: #18405

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 2347f98003af34dd1cfd290bf0f2cc7e6ae07b03
Component: engine
2015-12-09 14:26:41 +08:00
4769eb1560 added albatros library
Signed-off-by: dcylabs <dcylabs@gmail.com>
Upstream-commit: a94bede2aa04bbb4f05fcda70f8edfa7917a3238
Component: engine
2015-12-06 20:40:42 +01:00
26496961f2 Merge pull request #17741 from dhiltgen/pull_token
Add token pass-thru for AuthConfig
Upstream-commit: 715f6a135c6787fdb6834a6d167b3adc06943afe
Component: engine
2015-12-06 16:40:06 +01:00
7be0f9667b Add support for blkio read/write bps device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 3f15a055e5c50d0f08d4c3e7cd9618d537b84f29
Component: engine
2015-12-04 09:26:03 +08:00
a263d7120f Add token pass-thru for AuthConfig
This change allows API clients to retrieve an authentication token from
a registry, and then pass that token directly to the API.

Example usage:

    REPO_USER=dhiltgen
    read -s PASSWORD
    REPO=privateorg/repo
    AUTH_URL=https://auth.docker.io/token
    TOKEN=$(curl -s -u "${REPO_USER}:${PASSWORD}" "${AUTH_URL}?scope=repository:${REPO}:pull&service=registry.docker.io" |
        jq -r ".token")

    HEADER=$(echo "{\"registrytoken\":\"${TOKEN}\"}"|base64 -w 0 )
    curl -s -D - -H "X-Registry-Auth: ${HEADER}" -X POST "http://localhost:2376/images/create?fromImage=${REPO}"

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 8dce8e9901501863a80caf47d71713d4d36925a3
Component: engine
2015-12-03 11:40:27 -08:00
15181abee7 Merge pull request #18309 from WeiZhang555/time
Consolidate time format for API
Upstream-commit: 6deec021e5bbfd1942cfacb34c6593379e8b8c30
Component: engine
2015-12-02 22:28:28 +01:00
a7b1157339 Merge pull request #16277 from runcom/add-oom-score-adj
Add OomScoreAdj
Upstream-commit: 8f1f53f735e278bb23bb41d9387a75786d7ec1dc
Component: engine
2015-12-02 11:49:51 -08:00
c529eb3ce9 Consolidate time format for API
Consolidate all the API to same time format: RFC3339, and it will be
client's responsibility to present it in more user friendly way.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 9daca1222adabf3aeae97a2c4e5f4ed1bb8c15e1
Component: engine
2015-12-02 22:40:18 +08:00
efeb394283 docs: fix broken link to 1.7 Hub API
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 09742bcd692b2594800631e5c5c16d76dcf0e9f2
Component: engine
2015-12-01 17:57:12 +01:00
2ba0212c1d docs: add API v1.22 to the list again
The 1.22 API was temporarily removed in e4d86c2c38f4c99660da8ed65a8103e283e07e23
to prevent it showing up in the 1.9 documentation.

This reverts that change and tweaks the aligning
of the table headers in Markdown source.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3ddd21b8b66be248ea04eb74c7a81349bffddac1
Component: engine
2015-12-01 11:59:45 +01:00
ddf1fb3149 Add OomScoreAdj to configure container oom killer preferences
libcontainer v0.0.4 introduces setting `/proc/self/oom_score_adj` to
better tune oom killing preferences for container process. This patch
simply integrates OomScoreAdj libcontainer's config option and adjust
the cli with this new option.

Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: d3af7f283d8dc0be67be48e14cd740fbeb690f7a
Component: engine
2015-11-30 11:19:04 +01:00
eb58bc2fc0 Merge pull request #18227 from thaJeztah/fix-api-changes
docs: move API changes to the correct API version
Upstream-commit: 9cbfa7b00bd3b542632b40c5726316923d90cd18
Component: engine
2015-11-25 08:20:13 -05:00
7da657059d docs: move API changes to the correct API version
These changes were made as part of https://github.com/docker/docker/pull/17478
but inadvertently added to the v1.21 API version.

Also added a short description to the API changelog.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a06d5273b3cb72f68fc32da26955842287314970
Component: engine
2015-11-25 14:10:18 +01:00
26c51ea4a2 docs: fixups for plugin drivers in docker info
Plugin drivers were added to docker info in
https://github.com/docker/docker/pull/17300

but not added to the example output in the online
docs.

Also fixed mixed tabs/spaces in the API documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0a7e45e95c9e554c73581def80881534800a2b28
Component: engine
2015-11-25 13:54:54 +01:00
0ec3e50e8d update 'top' api endpoint documentation
- update example based on '-ef' behavior
 - new example specifying ps args 'aux'
 - resolves #7205

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: e28e4c7840455e97ac277a121a429f99a0c079df
Component: engine
2015-11-23 15:41:34 -08:00
ffce8a5c20 Merge pull request #18132 from WeiZhang555/api-changelog
Add API change to docs
Upstream-commit: 2bc792e3bb0f444ce25f112f604149da26a217b4
Component: engine
2015-11-23 11:57:46 -05:00
a12e446a79 Add API change to docs
Add API change description to docs due to `docker network inspect`
returns different data structure.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: bfe711bed342202ed0918a309b2000bb158c4eb7
Component: engine
2015-11-23 22:42:55 +08:00
6df421c14f Fixes found by docs validation tool
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 043f447e2e9ecb9d6f34bcee6c11f20f263baf66
Component: engine
2015-11-23 11:19:38 +10:00
fbb546d71a Add Dead state to Container Inspect 1.21 API
Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Upstream-commit: 836d0127fdf39d5e5978bc27f54a99aea636061b
Component: engine
2015-11-21 00:06:37 +03:00
4581692a0e Addition of "--shm-size" to which size of /dev/shm is changed.
- Optional "--shm-size=" was added to the sub-command(run, create,and build).
- The size of /dev/shm in the container can be changed
  when container is made.
- Being able to specify is a numerical value that applies number,
  b, k, m, and g.
- The default value is 64MB, when this option is not set.
- It deals with both native and lxc drivers.

Signed-off-by: NIWA Hideyuki <niwa.hiedyuki@jp.fujitsu.com>
Upstream-commit: 5aeaf2a0c4236711e0981515d8627b30e22a1637
Component: engine
2015-11-20 09:24:18 +09:00
3221274c6e Merge pull request #18084 from wenchma/18054_exec_start_fix
Update docs and test of exec create api return codes
Upstream-commit: 8e6e38990cb09eca2575263240d45a2a55db292e
Component: engine
2015-11-19 13:51:46 -08:00
1d7fc30a8e allow filtering containers by any status
Signed-off-by: Kamil Domański <kamil@domanski.co>
(cherry picked from commit 9ada6a06c57ce4ed4bfad50f603962b7b9ce6fb1)
Upstream-commit: f30364c5835452598e58781f360681f2d77fa16c
Component: engine
2015-11-19 14:11:41 -05:00
7d68517eab Update docs and test of exec create api return codes
Fixes issue #18054

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 01b86d612cba22602509b436aad36d41135f14ce
Component: engine
2015-11-19 22:22:27 +08:00
42a56c8bb4 Merge pull request #17986 from bogdangrigg/master
Fix small typos in documentation files
Upstream-commit: c83373112c908f7c5afc85fc6b08640817920a6d
Component: engine
2015-11-17 16:45:38 -08:00
6064eebd4e Merge pull request #17866 from shekhargulati/patch-1
added rx-docker-client library
Upstream-commit: 662b9623c1e47676f40b5dccd150475d54cd88a0
Component: engine
2015-11-17 16:15:15 -08:00
c4d89a3f60 Merge pull request #17478 from vdemeester/pr-13921
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
Upstream-commit: 104dab87ea73fbf7e4e592c2045b4f1ab56c6cfe
Component: engine
2015-11-17 15:44:57 -08:00
3e26fccb77 Supported added for reterving Plugin list for Network and Volume.
Also, plugin information in docker info output.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
Upstream-commit: aa7fd884e609d3d13df628600a1799e0e76444e9
Component: engine
2015-11-16 15:28:09 +09:00
2052e6ad6a Fix small typos in documentation files
Signed-off-by: Luca-Bogdan Grigorescu <bogdan@gmail.com>
Upstream-commit: d1e72baa15fb81a6dcf80e6727b884fc8ff67335
Component: engine
2015-11-15 00:53:27 +02:00
964f8b63bd Add pkg/parsers/architecture and pkg/platform
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 49779b674af09b46c165c8dfe2e76054336b0595
Component: engine
2015-11-14 23:03:02 +01:00
3e0bec1370 /info: Add keys Architecture, OSType
- introduces Swarm-relevant keys, see #13634
  - docs updated

Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
Upstream-commit: 4e8fcd40028ed09b139b6f86954e676a1839be9c
Component: engine
2015-11-14 22:21:45 +01:00
e628862038 Merge pull request #16873 from coolljt0725/expand_docker_info
Add more cgroup config to docker info
Upstream-commit: cccf6749431b5055e01f824f1d479ab517e1f812
Component: engine
2015-11-13 09:37:06 -08:00
e82bb6d8de added rx-docker-client library
Signed-off-by: Shekhar Gulati <shekhargulati84@gmail.com>
Upstream-commit: 4e4a68415cc2a85a77241a0e63d7ea2a5d4e6090
Component: engine
2015-11-13 08:23:57 +05:30
1a0735060a Add support for blkio.weight_device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 0fbfa1449d917ee0778266139d6035fb0782f7c2
Component: engine
2015-11-11 23:06:36 +08:00
37b87b6310 Merge pull request #17613 from Microsoft/10662-isolationexecopt
Windows: Add default isolation exec driver option
Upstream-commit: d4c4557b1af794c4d7e4a9833b20119c0a4c091c
Component: engine
2015-11-10 19:55:46 +00:00
328de5870b Windows: Add default isolation exec driver option
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a429ad1e35691fb01f3f80461964030d2197a0eb
Component: engine
2015-11-10 11:39:05 -08:00
012c3d4b3c Fixed broken links in docker_remote_api
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 93939c3f9fda70930ec2d3af4c6231ccfbc6b8ef
Component: engine
2015-11-06 16:12:51 -06:00
c6ff072fba Merge pull request #17610 from thaJeztah/add-env-example
Add examples for ENV vars in API
Upstream-commit: 7a2669f59683c9d286494fa1360c792cc501e98f
Component: engine
2015-11-06 01:19:58 +01:00
13125ff6b4 Merge pull request #17700 from calavera/remove_lxc
Remove LXC support.
Upstream-commit: 2519f465501657c24ecd13b8e53964b6c2f1a78d
Component: engine
2015-11-05 15:22:37 -08:00
f427a47755 Remove exec-driver global daemon option.
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 157b66ad390902ef6f5b51b3f76d5177eacac81b
Component: engine
2015-11-05 17:09:58 -05:00
ef88e7ace2 Remove LXC support.
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3b5fac462d21ca164b3778647420016315289034
Component: engine
2015-11-05 17:09:57 -05:00
723ed1d8d2 Merge pull request #17534 from Microsoft/10662-filterhyperv
Windows: Add isolation to ps filter
Upstream-commit: 9465d6ee6a669e4978ce746f16280910db7b1359
Component: engine
2015-11-05 15:55:47 -05:00
2ba09b4e09 Windows: Add isolation to ps filter
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9c5814171ce7ab3af48867da36f4d374f804c4a6
Component: engine
2015-11-05 10:18:24 -08:00
b768870c71 Updating networking docs with technical information
- the /etc/hosts read caveat due to dynamic update
- information about docker_gwbridge
- Carries and closes #17654
- Updating with last change by Madhu
- Updating with the IPAM api 1.22

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 39dfc536d444df8745124ffa38504241a0a985f7
Component: engine
2015-11-03 08:42:40 -08:00
6f36892ab1 docs: update remote API responses and minor fixes
Add back the "old" networksettings fields that were removed,
but added back to maintain backward compatibility, in
https://github.com/docker/docker/pull/17538

Update network endpoint responses, with updated response
introduced in;
https://github.com/docker/docker/pull/17536

Added changes to v1.22 that were applied to the v1.21 / v1.20 docs
after the API bump(s);

https://github.com/docker/docker/pull/17085
https://github.com/docker/docker/pull/17127
https://github.com/docker/docker/pull/13707

Also fixed some mixed tab/spaces indentation
and Markdown formatting issues (causing code-blocks to
be rendered incorrectly)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 286fe69d5376add77dc31833dc3c2fcc9639dd17
Component: engine
2015-11-03 15:24:31 +01:00
3736c71ac8 Add examples for ENV vars in API
As discussed in https://github.com/docker/docker/issues/16623,
the API calls for setting ENV-vars lacked an actual example.

This PR adds some examples to the API calls.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e41de3e6318ad4cb30eabab9bec60f9fb9d7a76b
Component: engine
2015-11-02 17:44:31 +01:00
1714a2463b Merge pull request #17591 from moxiegirl/remove-old-api
Remove old api docs that are no-longer appearing on docs-docker.com
Upstream-commit: e2e2ea401a6e1095064bd8f5731f012cee45797b
Component: engine
2015-11-01 12:30:58 -08:00
136be8ed66 Remove old api docs that are no-longer appearing on docs-docker.com
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: d2382f7b96a58f141a83928f53930e9d946d6d04
Component: engine
2015-11-01 08:22:10 -08:00
7e41e50c2b Update to hide the 1.10 material
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e4d86c2c38f4c99660da8ed65a8103e283e07e23
Component: engine
2015-11-01 08:03:08 -08:00
f3f473fc03 Fixing broken links
Fixing the weight

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 5ce093e94565a5f32df9adf78dcdb6deeda75f79
Component: engine
2015-10-31 19:45:56 -07:00
28eb09ab06 Update inspect api examples with new network settings.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9a7e632cf097b71aab6e46ef010d038f602e03d3
Component: engine
2015-10-27 19:56:29 -04:00