1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Dong Chen
a769e22b70 Fix service inspect --pretty.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
(cherry picked from commit 08ae4e544d5744e975da0f89c4f04baa2b8474f2)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:58 -07:00
Sebastiaan van Stijn
a89bd71433 Remove dead code for "inspect --pretty"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4d87f9083bfb3147566997b3f48c4805229f7c94)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:58 -07:00
Harald Albers
3bd6c0b8dd bash completion for docker daemon --oom-score-adjust
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e1e310ea1fc47488a7404e3fa52fa606fe270ed0)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:58 -07:00
Daniel Nephin
9f86a9712d Merge service command and args as a string.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 674d227445887ea2f9a0fde6ebb7838bcce58578)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:58 -07:00
Daniel Nephin
d8e9dbf628 Vendor go-shlex.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 3464589c2aceb60972cdee14f57e0f41bcc8e327)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:58 -07:00
Sebastiaan van Stijn
7491ebe00a Remove shorthand flags for "mount", "pretty", and "no-resolve"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7bf0faf42377a91a8535b443201d9ad62326889b)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:58 -07:00
Michael Crosby
89986cbff4 Add --oom-score-adjust to daemon
This adds an `--oom-score-adjust` flag to the daemon so that the value
provided can be set for the docker daemon's process.  The default value
for the flag is -500.  This will allow the docker daemon to have a
less chance of being killed before containers do.  The default value for
processes is 0 with a min/max of -1000/1000.

-500 is a good middle ground because it is less than the default for
most processes and still not -1000 which basically means never kill this
process in an OOM condition on the host machine.  The only processes on
my machine that have a score less than -500 are dbus at -900 and sshd
and xfce( my window manager ) at -1000.  I don't think docker should be
set lower, by default, than dbus or sshd so that is why I chose -500.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit a894aec8d81de5484152a76d76b80809df9edd71)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:57 -07:00
Sebastiaan van Stijn
0ce4630533 docs: fix output of node inspect
The output uses tabs, but those don't
translate well to the rendered output in
the docs, so replacing the tabs with spaces.

Also updates the output, because REPLICATED,
and SPREAD are no longer all-caps in the
actual output.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 477a5f8fb0be1244858614cdda2d2528208fc88a)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:57 -07:00
Vincent Demeester
cda05164ba Remove --command flag for service update
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit e4a024d5902df1d3db8b9fff8865304afa2305e6)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:57 -07:00
Alessandro Boch
dc5f28f4b5 Handle ingress sbox creation gracefully
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit ed6641ad61d6d4f6475062ab2a2669a379caf574)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:57 -07:00
Alessandro Boch
8d7223d991 Vendoring libnetwork 905d374
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit cabc5b27c0d93a7665a24d205572a9462bb85da6)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:57 -07:00
Sebastiaan van Stijn
ca9805f78d Make labels human readable
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ea365e4cb37d037046364773d01a744b1258ce4e)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:55 -07:00
Akihiro Suda
eb8bbea3d1 Remove "Yes"/"No" and use "true"/"false" consistently in docker info
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit c6b7bd1aa6b94ab242d6310419f1c3a7964ffa02)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:21 -07:00
Harald Albers
8a810acb1e Change bash completion for docker run --net* to --network*
Ref: https://github.com/docker/docker/pull/23324

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit c4846f697271d2990cca8481338f4827b2558112)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:13:49 -07:00
Lei Jitang
96247f4277 Add IPVLAN and DUMMY to check-config.sh
This commit add DUMMY and IPVLAN to check-config.sh
because they are need for ipvlan and macvlan network
driver.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit f5940ef7255a0a387baa6e20e09f86473ddf6d08)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:13:48 -07:00
Harald Albers
9b0ebd26e8 Update bash completion for docker service {create,update} {--mode,--endpoint-mode}
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit a394490d3895fe0122b44a3f89acc04946b83bda)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:13:48 -07:00
Harald Albers
fc4c8d927a bash completion for docker service {create,update} --registry-auth
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit a44e71c4274cd311e99722277cb674b2bc84d86e)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:13:48 -07:00
Sebastiaan van Stijn
ccffaddb55 docs: remove executiondriver from API 1.24 docs
the executiondriver property was removed in
880484992c360881dc57a3317b84d75300c358af, but docs
were only updated for the 1.25 API, not for 1.24

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3c6ef4c29d28e92ea29816d6117412162d829c60)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:13:48 -07:00
Mei ChunTao
b2334cc79d fix the docker run --readonly example. rename '/icanwrite here' to '/icanwrite/here'
Signed-off-by: Mei ChunTao <mei.chuntao@zte.com.cn>
(cherry picked from commit acbe38a3ccb85be012d88f3109b688f8b815daaf)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:13:48 -07:00
Alexander Morozov
926d66b50f all: fix usage of some variables
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
(cherry picked from commit 57e14714ee85e67f59d8c22aed23dc875cf2e58c)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:13:48 -07:00
Neil Peterson
de6b73a1a8 Added daemon.json Windows example
Signed-off-by: Neil Peterson <neilpeterson@outlook.com>
(cherry picked from commit 8352089e8c78cdf71ac9eec0c125a35f9bf36ebc)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:13:47 -07:00
Dongluo Chen
8d2748ff6b Merge pull request #2429 from nishanttotla/add-case-docker-112
Adding case for updating client version, for Docker 1.12
2016-07-23 15:53:26 -07:00
Slaven Bacic
5a18d0e1c3 Removed comments and collapsed overrides.
Signed-off-by: Slaven Bacic <bacic.slaven@gmail.com>
2016-07-23 07:50:55 +02:00
Slaven Bacic
2870ce8b15 Add fixes and lintian overrides to electron-installer-debian, with comments.
Signed-off-by: Slaven Bacic <bacic.slaven@gmail.com>
2016-07-23 07:49:29 +02:00
Nishant Totla
b88763773b Adding case for updating client version, for Docker 1.12
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-07-22 16:34:20 -07:00
Nishant Totla
0f188a3787 Creating http client in swarm
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-07-22 16:29:20 -07:00
Thomas Darimont
c05d16f050 Honor MACHINE_STORAGE_PATH environment for virtualBoxLogs
Previously vbox log files were only stored beneath the .docker folder
relative to the user's home-directory which potentially resulted in
filenotfound errors.

We now store the vbox log files relative to the MACHINE_STORAGE_PATH
for docker machines, e.g. on windows
with `MACHINE_STORAGE_PATH` set to `C:\dev\docker\machine`
the logs for the `default` vm would be written to
`C:\dev\docker\machine\machines\default\default\Logs\VBox.log`

Signed-off-by: Thomas Darimont <thomas.darimont@gmail.com>
2016-07-22 23:41:13 +02:00
Dongluo Chen
2fdb517952 Merge pull request #2251 from doronp/Fix-#2247
Ignoring gone Engine removing the network from the rest
2016-07-21 21:01:46 -07:00
French Ben
21f605a4ee Merge pull request #1839 from docker/fix-windows
Fix windows connection setup and port publish
2016-07-21 14:13:50 -07:00
French Ben
98fef969e5 Merge pull request #1831 from thomasdarimont/feature/honor-docker-cert-path-env-variable
Honor DOCKER_CERT_PATH environment in nonNativeSetup
2016-07-21 14:13:35 -07:00
Doron Podoleanu
bd74d1dc46 Ignoring gone Engine removing the network from the rest
Signed-off-by: Doron Podoleanu <doronp@il.ibm.com>

Use exported var

Signed-off-by: Doron Podoleanu <doronp@il.ibm.com>

Verify global scope before iteration on all engines

Signed-off-by: Doron Podoleanu <doronp@il.ibm.com>
2016-07-21 16:07:42 +03:00
Thomas Darimont
dc6aded2b0 Honor DOCKER_CERT_PATH environment in nonNativeSetup
Previously only certificates relative to the home folder
were honored, which made using custom storage locations
via MACHINE_STORAGE_PATH for docker machines quite
cumbersome to use.

This helps with the issue #1640.

Signed-off-by: Thomas Darimont <thomas.darimont@gmail.com>
2016-07-21 10:24:12 +02:00
French Ben
3c8e9c8b9e Moved all to named pipe
Signed-off-by: French Ben <frenchben@docker.com>
2016-07-20 20:43:47 -07:00
French Ben
806eb3b00c Fixed port publishing
Signed-off-by: French Ben <frenchben@docker.com>
2016-07-20 20:21:58 -07:00
Nishant Totla
9d8b938222 Merge pull request #2427 from abronan/update_libkv
libkv: update godeps, fix wrong error check on zookeeper List
2016-07-20 19:00:39 -07:00
Joao Fernandes
d762c50cbe Removes quickstart docs, some cleanups
Nukes the quickstart docs, since they were difficult to follow, and
didn't add any value.
Also cleans up the docs, so that we stop having index.md pages that can be
accessed by users, but don't have content.
2016-07-20 17:43:01 -07:00
French Ben
6e4aa098fb Updated kitematic endpoint
Signed-off-by: French Ben <frenchben@docker.com>
2016-07-20 16:49:04 -07:00
Alexandre Beslic
318666579a libkv: fix wrong error check on zookeeper List
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
2016-07-20 16:40:29 -07:00
Joao Fernandes
16c219213d Merge pull request #2502 from joaofnfernandes/push-pull-images
Revamps docs for pushing and pulling images
2016-07-20 14:49:57 -07:00
Nishant Totla
76b6754cc6 Merge pull request #2426 from nishanttotla/bump-v1.2.4-rc2
Bump version to v1.2.4-rc2
2016-07-20 13:09:26 -07:00
Nishant Totla
5356356ae4 Bump version to v1.2.4-rc2
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-07-20 12:39:50 -07:00
Alexandre Beslic
b71933665c Merge pull request #2418 from dongluochen/cli_healthcheck
Add healthcheck info to CLI
2016-07-19 23:07:23 -07:00
Dongluo Chen
562da10f2d Merge pull request #2424 from dongluochen/reschedulingtest
Fix rescheduling test
2016-07-19 21:25:54 -07:00
Dong Chen
d283e00512 Fix rescheduling test.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-07-19 19:05:07 -07:00
Dong Chen
3982f039a2 Add healthcheck info to CLI.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-07-19 18:33:43 -07:00
Dongluo Chen
ef0aa2aeb2 Merge pull request #2423 from nishanttotla/engine-api-update-interface
Updating engine-api to latest, with a new client interface
2016-07-19 18:31:07 -07:00
Nishant Totla
62b0b29aa6 Adding new client interface in Swarm
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-07-19 16:56:09 -07:00
Joao Fernandes
edf6c3ba6a Fixes instructions to install offline docs 2016-07-19 16:12:38 -07:00
Joao Fernandes
8281bfa5f1 Updates docs for offline install 2016-07-19 13:49:11 -07:00
Joao Fernandes
ca03459fb4 Revamps docs for pushing and pulling images 2016-07-19 13:38:34 -07:00