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
Joffrey F
f3628c7a5e Bump 1.8.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-27 11:57:23 -07:00
Aanand Prasad
e115eaf6fc Fix error message for unrecognised TLS version
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 11:57:23 -07:00
Joffrey F
1bf0cd07de Merge pull request #3772 from docker/bump-1.8.0-rc3
Bump 1.8.0-rc3
2016-07-27 11:50:24 -07:00
Stephen J Day
2f736927a0 cli: docker service|node|stack ps instead of tasks
Rather than conflict with the unexposed task model, change the names of
the object-oriented task display to `docker <object> ps`. The command
works identically to `docker service tasks`. This change is superficial.

This provides a more sensical docker experience while not trampling on
the task model that may be introduced as a top-level command at a later
date.

The following is an example of the display using `docker service ps`
with a service named `condescending_cori`:

```
$ docker service ps condescending_cori
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 13 minutes ago  Running        6c6d232a5d0e
```

The following shows the output for the node on which the command is
running:

```console
$ docker node ps self
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
b1tpbi43k1ibevg2e94bmqo0s  mad_kalam.1           mad_kalam           apline  Accepted 2 seconds ago  Accepted       6c6d232a5d0e
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 12 minutes ago  Running        6c6d232a5d0e
4x609m5o0qyn0kgpzvf0ad8x5  furious_davinci.1     furious_davinci     redis   Running 32 minutes ago  Running        6c6d232a5d0e
```

Signed-off-by: Stephen J Day <stephen.day@docker.com>
(cherry picked from commit 0aa4e1e68973ede0c73f8a4356e2a17fc903f549)
2016-07-27 11:20:25 -07:00
Tibor Vass
69080f423d Merge pull request #25114 from SvenDowideit/bump_v1.12.0-docs
Bump v1.12.0 docs
2016-07-27 11:14:01 -07:00
Dylan Page
6c39ec9e3f Update digitalocean driver image defaults
- Changed default image from 15.10 to 16.04.1
 - Use slug instead of ID to prevent breakage with ubuntu point releases

Signed-off-by: Dylan Page <genpage@digitalocean.com>
2016-07-27 14:08:06 -04:00
Sebastiaan van Stijn
c62b19f1e3 Merge pull request #25126 from mlaventure/fix-weird-rpc-lock
Attach stdin after attach stdout/err to avoid an rpc lock
2016-07-27 18:53:07 +02:00
Aanand Prasad
cefa239c2e Bump 1.8.0-rc3
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 17:46:13 +01:00
Aanand Prasad
6f3e4bbc6c Remove note about .dsb
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
Aanand Prasad
87b6b3c139 Add note about missing volume mount support
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
Aanand Prasad
1fb5c4b15a Fix example image hash
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
Aanand Prasad
35ed189981 Copy experimental bundle docs into Compose docs so URL is stable
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
Aanand Prasad
c392acc56b Show a warning when engine is in swarm mode
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
Ben Firshman
cd267d5121 Add user agent to API calls
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-07-27 16:27:05 +01:00
Ben Firshman
cb076a57b9 Suggest to run Docker for Mac if it isn't running
Instead of suggesting docker-machine.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-07-27 16:27:05 +01:00
Daniel Nephin
6246a2592e Add reference docs for push and bundle.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-27 16:27:05 +01:00
Joffrey F
606358cfb7 Update docker-py requirement to the latest release
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-27 16:27:05 +01:00
Aanand Prasad
0488dd3709 Rename --fetch-digests to --push-images and remove auto-pull
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
Aanand Prasad
b72f911ccf Fix timeout value in error message
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
Aanand Prasad
f9c5816ab8 Stop checking the deprecated DOCKER_CLIENT_TIMEOUT variable
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
Aanand Prasad
2ecbf25445 Fix bugs with entrypoint/command in docker-compose run
- When no command is passed but `--entrypoint` is, set Cmd to `[]`
- When command is a single empty string, set Cmd to `[""]`

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
Aanand Prasad
8f842d55d7 Reorder/clarify args docs
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
Jarrod Pooler
ad19ff6c67 Updating arg docs in the proper place
Signed-off-by: Jarrod Pooler <jarrod.pooler@homesite.com>
2016-07-27 16:27:05 +01:00
Aanand Prasad
4fb7033d9c Clarify environment and env_file docs
Add note to say that environment variables will not be automatically
made available at build time, and point to the `args` documentation.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
Tomas Tomecek
e1b7510e4a service: detailed error messages for create and start
Fixes: #3355

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-07-27 16:27:05 +01:00
Harald Albers
f7853a30bd bash completion for docker-compose bundle --fetch-digests
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-27 16:27:05 +01:00
Aanand Prasad
3b4a53c959 Merge remote-tracking branch 'release/release' into bump-1.8.0-rc3 2016-07-27 15:53:08 +01:00
Sebastiaan van Stijn
441b660dd1 Add back links to 1.12 release in deprecated.md
These links were temporarily changed, because the
docs were published before the 1.12.0 tag was
available.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit cd69b94241b94d16ac6dfad6e6bc7fc981dc2cca)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-07-27 21:49:08 +10:00
Sebastiaan van Stijn
2e8165d503 Remove release-candidate advisories
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 053ac127ab0f784bebeda38f29f2d7615d2ffcb8)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md
	docs/reference/commandline/service_create.md
2016-07-27 21:46:51 +10:00
Sebastiaan van Stijn
1717c76ff2 fix minor docs issues
this brings back the trailing whitespace in "runmetrics",
that were there intentially to force a line-break

also removes a duplicate redirect, that was present
on two pages

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d8434eba462752327d4c7769d3ce2c85013c211e)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-07-27 21:38:06 +10:00
mapk0y
b7e1ea51a0 fix the ipaddress of an explanation.
Signed-off-by: mapk0y <mapk0y@gmail.com>
(cherry picked from commit a94b48923e8ec7a5e9ebe6101f0ccac208fb4f25)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-07-27 20:40:26 +10:00
Charles Smith
b8333bfd5e add how services work to how swarm mode works guide
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit bef36fba4022e1c37f1f21e9e265e7f98e2f7f65)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-07-27 20:40:17 +10:00
Charles Smith
ef19b22b85 add swarm manage nodes guide
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 704facbbab0af520e0429eb75a6f875b6015a77c)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-07-27 20:40:07 +10:00
Charles Smith
0bd4111851 add doc for live-restore setting and daemonless containers, fix admin guide menu
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit cbd07495a3c5b49a47ea288a9e6ee9b24800cace)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-07-27 20:39:57 +10:00
Sebastiaan van Stijn
81d31af68c Make archive links absolute
The archive is only available on docs.docker.com, and not
when doing a "make docs", so relative links will not resolve.

Making these links absolute, so that they always
point to the live "docs.docker.com" domain.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4b090ae5f259dcedb946463a8512b2416a971fcb)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-07-27 20:39:43 +10:00
Mickaël FORTUNATO
9fa212ba59 Update docker_remote_api_v1.22.md
Update docker_remote_api_v1.23.md
Update docker_remote_api_v1.24.md
Update docker_remote_api_v1.25.md

look like ExecDriver is not return anymore

Signed-off-by: Mickaël Fortunato <morsi.morsicus@gmail.com>
(cherry picked from commit 166928a24bf5f3b23103b8ad09f134e277c00d6a)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md
2016-07-27 20:39:02 +10:00
Kenfe-Mickael Laventure
d6b53d91d7 Attach stdin after attach stdout/err to avoid an rpc lock
Reason of the lock is currently unknown

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-07-26 19:17:22 -07:00
Tibor Vass
e97e51d79c Fix bad cherrypick from a91bc28e62
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-26 18:15:37 -07:00
Nathan LeClaire
ff1f645174 Merge pull request #3611 from nathanleclaire/fix_do_slug
Fix missing slug issue
2016-07-26 17:39:40 -07:00
Nathan LeClaire
9ab845ce01 Fix missing slug issue
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-26 17:32:17 -07:00
French Ben
2d67804aa9 Updated description and bump'd version
Signed-off-by: French Ben <frenchben@docker.com>
2016-07-26 12:06:12 -07:00
French Ben
0b335d348f Merge pull request #1847 from sbacic/electron-debian-fix
Electron debian fix
2016-07-26 12:04:36 -07:00
French Ben
ba7fb1fc84 Merge pull request #1844 from thomasdarimont/issue/honor-machine-storage-path-for-vboxlogs
Honor MACHINE_STORAGE_PATH environment for virtualBoxLogs
2016-07-26 11:46:20 -07:00
Tibor Vass
a3f206372f Bump VERSION to v1.12.0-rc5
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-26 06:04:00 -07:00
Tibor Vass
626b152944 Merge pull request #25063 from thaJeztah/man-page-cherry
cherry-pick manpages fix
2016-07-26 05:58:54 -07:00
Daniel Nephin
5b667c7c55 Require manpages for packages.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 1ea9c19ffe53811931ecd3102703c3eacb22d14c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-26 14:43:35 +02:00
Daniel Nephin
c5531b033a Make manpages in a conatiner.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 7004f219f5d0fe99de0dadf319381d224866eb7c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-26 14:43:11 +02:00
Tibor Vass
4ed7f63f0d Merge pull request #25058 from tiborvass/additional-cherrypicks-for-1.12.0-rc5
[bump_v1.12.0] Additional cherrypicks for 1.12.0 rc5
2016-07-26 05:01:51 -07:00
Aaron Lehmann
e16a20d11a service update: Don't assume existing pointers in spec are valid
When updating values in the spec according to CLI flags, don't write
into the existing pointers. They may be nil. Instead, update them to
point to the new value we're writing.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit f9c920a1266197c2b6f0378b58f22246037fda7a)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-26 04:37:31 -07:00
Tibor Vass
0e2d7c996c Address some displaying issues in docker info
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 8ad9438edeab44c8f424113bc96fa12d76e4fdc6)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-26 04:37:31 -07:00