Commit graph

5595 commits

Author SHA1 Message Date
Sebastiaan van Stijn
8cbe6541b2 Merge pull request #24572 from yongtang/24534-deprecation-cycle-3-releases
Extend deprecation cycle to 3 releases by default
2016-07-21 21:06:57 +02:00
Sebastiaan van Stijn
2debfe8435 Merge pull request #24892 from thaJeztah/fix-label-formatting-example
docs: improve formatting and highlighting of docker ps reference
2016-07-21 12:38:45 +02:00
Vincent Demeester
22d020276c Merge pull request #24700 from nishanttotla/pass-registry-auth-on-deploy
Send registry auth token for service deploy
2016-07-21 12:33:33 +02:00
Sebastiaan van Stijn
07ef0a37f8
docs: improve formatting and highlighting of docker ps reference
this improves the formatting, and code-highlighting
of the `docker ps` reference page, and wraps sentences
to 80 chars

also adds single quotes around the formatting
example for labels.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-21 12:27:39 +02:00
fonglh
f62e24f697 Clarify API behavior when older versions are called.
Signed-off-by: fonglh <fonglh@gmail.com>
2016-07-21 16:16:46 +08:00
Sebastiaan van Stijn
ccd0d83344 Merge pull request #24866 from thaJeztah/fix-sloppy-copy-pasta
docs: fix copy/pasta error
2016-07-21 02:02:28 +02:00
Nishant Totla
a26bdd8607
Send registry auth token for service deploy
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-07-20 16:07:07 -07:00
Sebastiaan van Stijn
8c6c1aaf07 Merge pull request #24842 from thaJeztah/fix-code-highlight
docs: add code-hints to builder page
2016-07-21 00:06:52 +02:00
Sebastiaan van Stijn
83b12c0c11
docs: fix copy/pasta error
Looks like I copied from the line below, not
from the output :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-20 23:59:38 +02:00
Sebastiaan van Stijn
eefc17bba1 Merge pull request #24838 from thaJeztah/add-log-options-to-docs
Add missing --log-driver and --log-opt docs
2016-07-20 23:50:10 +02:00
Sebastiaan van Stijn
9d532b5e2d
docs: update reference docs for plugins
the output/response slightly changed in
340964db1c,
and `:latest` is no longer required for
various actions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-20 23:37:55 +02:00
Vincent Demeester
81ef36c980 Merge pull request #24820 from sfsmithcha/add_how_swarm_works_guide
add how nodes work to how swarm works guide
2016-07-20 22:08:31 +02:00
Charles Smith
137261f97c add how nodes work to how swarm works guide
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-20 12:37:38 -07:00
Sebastiaan van Stijn
a9ca19feaa Merge pull request #24523 from sfsmithcha/clarify_rolling_update
clarify update-delay and rolling update behavior
2016-07-20 20:24:18 +02:00
Charles Smith
68a9224bd4 clarify update-delay and rolling update behavior
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-20 10:11:04 -07:00
Sebastiaan van Stijn
f49dc528ed
docs: add initial reference for "stack services"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-20 18:56:49 +02:00
Arnaud Porterie
b9c4959882 Merge pull request #24841 from thaJeztah/rename-bundle-flag
[RFC] Rename --bundle to --file
2016-07-20 15:50:54 +00:00
Sebastiaan van Stijn
d6d02f652c Merge pull request #24843 from resouer/fix-nits
Fix nits in deprecated
2016-07-20 16:32:47 +02:00
Sebastiaan van Stijn
b5503ef0a5
docs: add code-hints to builder page
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-20 16:18:44 +02:00
Sebastiaan van Stijn
06f35262c4
Rename --bundle to --file
This renames the '--bundle' flag for docker (stack) deploy
to be consistent with 'docker build'.

Note that there's no shorthand '-f' added for now,
because this may be confusing on 'docker stack config',
which also takes a file, and for which we may want to
have a '--format' flag in future.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-20 16:03:27 +02:00
Sebastiaan van Stijn
effbd2b76d
fix duplicated usage in docs
this removes a copy/pasta whoopsie on my side,
introduced in de64324109

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-20 15:36:02 +02:00
Sebastiaan van Stijn
5ece2a6e0d
Add missing --log-driver and --log-opt docs
Adds documentation for "--log-driver" and "--log-opt"
for services.

Also updated the API docs to include the new
options, and generated a more complete JSON
example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-20 14:55:26 +02:00
Sebastiaan van Stijn
724c69f060 Merge pull request #24507 from sfsmithcha/doc_node_labels
add ref docs for node label
2016-07-20 00:46:51 +02:00
Charles Smith
9594ac97ce add ref docs for node label
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-19 15:41:00 -07:00
Brian Goff
2ee828aac2 Merge pull request #24802 from vdemeester/stack-docs-and-flags
Add documentation for stack commands
2016-07-19 14:30:49 -04:00
Tibor Vass
39327a67e8 Merge pull request #24804 from crosbymichael/rpm-socket
Remove docker.socket from rpm based systems
2016-07-19 11:18:22 -07:00
Vincent Demeester
10919e8909
Add documentation for stack commands
Also removes the `-f` flags of bundle to follow the single-letter flags
evaluation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-19 18:32:44 +02:00
Michael Crosby
04104c3a1e Remove docker.socket from rpm based systems
Fixes #23981

The selinux issue we are seeing in the report is related to the socket
file for docker and nothing else. By removing the socket docker starts
up correctly.

However, there is another motivation for removing socket activation from
docker's systemd files and that is because when you have daemons running
with --restart always whenever you have a host reboot those daemons
will not be started again because the docker daemon is not started by
systemd until a request comes into the docker API.

Leave it for deb based systems because everything is working correctly
for both socket activation and starting normally at boot.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-07-19 09:31:43 -07:00
Harry Zhang
78a5480dfd Fix nits in deprecated
Signed-off-by: Harry Zhang <harryz@hyper.sh>
2016-07-19 22:42:23 +08:00
Vincent Demeester
cf8f2a5037 Merge pull request #24747 from thaJeztah/bump-golang-to-1.6.3
Bump Go to 1.6.3
2016-07-19 09:42:25 +02:00
Sebastiaan van Stijn
5fe3e006e4 Merge pull request #24782 from tonistiigi/load-sec
Update docker load security docs
2016-07-19 09:06:27 +02:00
Tonis Tiigi
f17469e890 Update docker load security docs
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-07-18 19:16:15 -07:00
Dong Chen
e1165cdfd1 Support node label update.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-07-18 18:39:52 -07:00
Sebastiaan van Stijn
589bafddf3
bump Go to 1.6.3
following the announcement;
https://groups.google.com/forum/m/#!topic/golang-announce/7JTsd70ZAT0

> [security] Go 1.6.3 and Go 1.7rc2 pre-announcement
>
> Hello gophers,
> We plan to issue Go 1.6.3 and Go 1.7rc2 on Monday July 18 at approximately 2am UTC.
> These are minor release to fix a security issue.
>
> Following our policy at https://golang.org/security, this is the pre-announcement of those releases.
>
> Because we are so late in the release cycle for Go 1.7, we will not issue a minor release of Go 1.5.
> Additionally, we plan to issue Go 1.7rc3 later next week, which will include any changes between 1.7rc1 and tip.
>
> Cheers,
> Chris on behalf of the Go team

**Note:**
the man/Dockerfile is not yet updated, because
the official image for Go 1.6.2 has not yet
been updated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-18 23:15:03 +02:00
Sebastiaan van Stijn
8ef820b539 Merge pull request #24659 from justyntemme/master
Fix for issue #23884 (Documentation clarification)
2016-07-18 21:58:55 +02:00
Justyn Temme
b74b46b26a suggested improvements for Debian install doc issue #23884
Signed-off-by: Justyn Temme <justyntemme@gmail.com>
2016-07-18 14:38:58 -05:00
Arnaud Porterie
de64324109 Merge pull request #24705 from thaJeztah/update-flag-descriptions
Improve flag help consistency, and update docs
2016-07-18 16:07:23 +00:00
Arnaud Porterie
98a4b3e332 Merge pull request #24714 from allencloud/better-docker-network-create-help-output
better command `docker network create -h` output
2016-07-18 16:05:46 +00:00
Yanqiang Miao
f9ef10f853 Fix link errors in 'docs/reference/api/docker_remote_api_v***.md'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update fix-link-err-in-docs

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update fix-link-err-in-docs

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update fix-link-err-in-docs

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-07-19 02:53:03 +08:00
Yong Tang
0159ee1f5d Fix inconsistent fields for resource settings on service for API docs
In API docs, `CPU` and `Memory` were used for resource settings on
services. The actual settings should be `NanoCPUs` and `MemoryBytes`.

This fix address the inconsistent fields between API docs and actual
settings.

This fix fixes #24058.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-07-17 16:45:09 -07:00
Sebastiaan van Stijn
c15144c4ec
docs: update Oracle support link
The none-https url results in a redirect
to https://support.oracle.com/epmos/faces/MosIndex.jspx?......
which our link-checker didn't like.

The https link looks to be a direct link,
and not resulting in a redirect, so updating the URL.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-16 14:34:07 +02:00
allencloud
d0081a0f47 better command docker network create -h output
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-16 15:32:17 +08:00
Sebastiaan van Stijn
9ad857a788 Merge pull request #24682 from justincormack/oom-score-adj-doc
Document --oom-score-adj flag in docker run
2016-07-16 03:00:51 +02:00
Sebastiaan van Stijn
64a8317a5a Improve flag help consistency, and update docs
This adds the `--live-restore` option to the documentation.

Also synched usage description in the documentation
with the actual description, and re-phrased some
flag descriptions to be a bit more consistent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-16 01:58:01 +02:00
Victoria Bialas
6f9e310831 fixed cut-and-paste error on description of Docker Toolbox
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-07-15 13:54:34 -07:00
Sebastiaan van Stijn
9a9fc01af8 Merge pull request #24610 from sfsmithcha/rc4_tutorial_check
update create swarm and add nodes to use the auto-generated join command
2016-07-15 19:09:36 +02:00
Vincent Demeester
80ec9fa284 Merge pull request #24638 from miaoyq/fix-docs-err
Delete  redundant content of 'docs/extend/plugins.md'
2016-07-15 17:04:11 +02:00
Justin Cormack
6ba6265d1a Document --oom-score-adj flag in docker run
This was only mentioned in docker create documentation.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-15 14:11:54 +01:00
Qiang Huang
92dfbc1e2d Fix aufs docs
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-07-15 13:57:38 +08:00
Yanqiang Miao
cfe9d2ff1e Delete redundant content of 'docs/extend/plugins.md'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

Update plugins.md

Update plugins.md
2016-07-15 11:26:10 +08:00