Commit Graph
5338 Commits
Author SHA1 Message Date
Tianon Gravi 4aa138c60d Resync bash completion to include all flags defined in the code, and to autocomplete properly on all parameters that are reasonably possible to do so on today
This also includes several new minor features that are interesting, so do explore a little. :)

Finally, this also fixes a few bugs where commands would complete parameters that they won't necessarily accept.  We still have a few of these cases, but they're reduced to a minimum now.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 3ca9415d56
Component: cli
2017-06-02 00:06:20 +00:00
Victor Vieux 8f168e41f5 update commands.go
update docker.go

move to pkg

update docs

update name and copyright

change --sinceId to --since-id, update completion and docs

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com> (github: vieux)
Upstream-commit: 33415ebe36
Component: cli
2017-06-02 00:06:19 +00:00
James Turnbull 30d36fff92 Added Reference Manual
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 98b39c91de
Component: cli
2017-06-02 00:06:19 +00:00
Paul 21a737b698 Mac OSX command for pip was incorrect
Upstream-commit: fb17f9fcab
Component: cli
2017-06-02 00:06:19 +00:00
Thomas LEVEIL 3cd5549ecd support for container names in bash completion
Upstream-commit: bc7722ea0f
Component: cli
2017-06-02 00:06:19 +00:00
Sven Dowideit 1c211d0906 make docs is more consistent
Upstream-commit: 2d576ea3b6
Component: cli
2017-06-02 00:06:19 +00:00
Sven Dowideit ab0c9a7cea change the policy wrt $ sudo docker to simplify auto-testing
Upstream-commit: 3091ba88fa
Component: cli
2017-06-02 00:06:19 +00:00
John Feminella 768974c22a Corrects misspellings of 'Sphinx'
Upstream-commit: 01d4e98cc8
Component: cli
2017-06-02 00:06:19 +00:00
John Feminella ff73503948 Suggest users install dependencies by using requirements.txt, not manually
Upstream-commit: b52c999103
Component: cli
2017-06-02 00:06:19 +00:00
Victor Vieux f022c32444 rebase and add some filters
Upstream-commit: e074bc6db1
Component: cli
2017-06-02 00:06:19 +00:00
Sven Dowideit e5bc16370d add links to the Dockerfiles as canonical external requirements, add example of building and exposing the docs and simplify the Dockerfile for cacheability
Upstream-commit: 23e91a6d7f
Component: cli
2017-06-02 00:06:19 +00:00
Andy Rothfusz 199feb6224 Clean up level 3 headers.
Upstream-commit: bed37d2204
Component: cli
2017-06-02 00:06:19 +00:00
Tianon Gravi 78b8a0f99b Add zsh completion from @felixr with permission
See https://github.com/felixr/docker-zsh-completion for the original.
See also https://github.com/dotcloud/docker/issues/2202#issuecomment-26313287

Fixes #2202
Upstream-commit: 9914c18a11
Component: cli
2017-06-02 00:06:19 +00:00
Tianon Gravi af8f58b268 Move contrib/docker.bash to contrib/completion/bash/docker for better organization
Upstream-commit: 24c9b31edf
Component: cli
2017-06-02 00:06:19 +00:00
Andy Rothfusz 9463d1159a Fix #1919 document how to edit and release docs.
Upstream-commit: ce220ef43b
Component: cli
2017-06-02 00:06:19 +00:00
Pascal Borreli 43d8f667fd Fixed typos
Upstream-commit: 147b04ce2b
Component: cli
2017-06-02 00:06:19 +00:00
Thatcher Peskens d7f43325f2 Fixed some typo's and formatting issues in remote api documentation.
Upstream-commit: 22ab3ddc8a
Component: cli
2017-06-02 00:06:19 +00:00
Thatcher 67f5bb8bb9 Some more improvements on the docs readme. Removed references to website.
Upstream-commit: 2216afb617
Component: cli
2017-06-02 00:06:19 +00:00
Thatcher Peskens 34f087441b Updated docs README with instructions to preview the generated manfile, and where to get the one generated by sphinx.
Upstream-commit: 9c5f4391e1
Component: cli
2017-06-02 00:06:19 +00:00
Thatcher Peskens cdc3377009 Enabled the docs to generate manpages.
* changed conf.py to reference toctree.rst instead of index
* Added note to README to upgrade your sphinx to the latest version to prevent a bug with .. note:: blocks.
Upstream-commit: 77926c6033
Component: cli
2017-06-02 00:06:19 +00:00
Daniel Gasienica 99a1852177 Make style consistent
Upstream-commit: 74428120af
Component: cli
2017-06-02 00:06:19 +00:00
Daniel Gasienica 95534b5821 Add Mac OS X instructions for doc tools
Upstream-commit: 3c035fa508
Component: cli
2017-06-02 00:06:19 +00:00
Daniel Gasienica d08724ab40 Add make server command to preview docs
Upstream-commit: 99dfa4e7e8
Component: cli
2017-06-02 00:06:18 +00:00
Thatcher Peskens aec84e0e64 Updated index to reflect new (short) 'engine' message (merged with solomon's new text), also moved around the layout a bit and fixed some small text errors.
Upstream-commit: 6d79cab514
Component: cli
2017-06-02 00:06:18 +00:00
Thatcher Peskens c6d0d33e87 Added code and color for 'note' and updated the hello world note.
Upstream-commit: f4399fe403
Component: cli
2017-06-02 00:06:18 +00:00
Thatcher Peskens 9d6a9f36e8 Improved README
Upstream-commit: 8a39a45f05
Component: cli
2017-06-02 00:06:18 +00:00
Thatcher Peskens b07dff2c8e Merge of docker-website into the docker documentation.
Upstream-commit: 244477e27f
Component: cli
2017-06-02 00:06:18 +00:00
dhrp 73808e2330 create README.md at this place for preview.
Upstream-commit: f35a9d8098
Component: cli
2017-06-02 00:06:18 +00:00
Daniel Nephin cd8431c122 Use a map instad of a switch/case for Compose transform.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 97ebc19438
Component: cli
2017-06-01 15:22:09 -04:00
Daniel Nephin 25b6069bb2 Compose: Improve error messages when resource creation/updates fail.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 729d07a371
Component: cli
2017-06-01 15:03:04 -04:00
Daniel Nephin 5f4e132587 Merge pull request #144 from thaJeztah/allow-some-flags-during-rollback
Allow --detach and --quiet flags when using --rollback
Upstream-commit: 30af87981d
Component: cli
2017-06-01 14:47:08 -04:00
Daniel Nephin 67be6e9ac8 Fix complexity of service/ps.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b5baffde44
Component: cli
2017-06-01 11:49:16 -04:00
Brian Goff 830b3113ae Merge pull request #136 from johnstep/fix_stack_service_volumes
Fix stack compose bind-mount volumes for Windows
Upstream-commit: bf22fc6781
Component: cli
2017-06-01 11:06:06 -04:00
Sebastiaan van Stijn e1f6bc3e4f Allow --detach and --quiet flags when using --rollback
Commit 78c204ef79 added
(f9bd8ec8b268581f93095c5a80679f0a8ff498bf in the moby repo)
a validation to prevent `--rollback` from being used
in combination with other flags that update the
service spec.

This validation was not taking into account that
some flags only affect the CLI behavior, and
are okay to be used when rolling back.

This patch updates the validation, and adds
`--quiet` and `--detach` to the list of allowed
flags.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f10f29df8d
Component: cli
2017-06-01 16:31:07 +02:00
Sebastiaan van Stijn d0a95fbfec Remove deprecated -e/--email flag from docker login
The `docker login -e` / `docker login --email` option was deprecated in
Docker 1.11 (https://github.com/moby/moby/releases/tag/v1.11.0) through
aee260d4eb3aa0fc86ee5038010b7bbc24512ae5 (April 2016), and when used has
been outputing a deprecation warning since;

    Flag --email has been deprecated, will be removed in 17.06.

Originally this option was scheduled to be removed in docker 1.13, but
extended to docker 17.06 due to a change in our deprecation policy.

Given that only docker 1.10 and older use this flag (which is EOL, including
for CS versions, as of February 2017), will now be removed.

With this patch, `docker login` will now produce an Error if the flag
is used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8b383d2351
Component: cli
2017-06-01 12:55:04 +02:00
John Stephens 144f2f5310 Fix stack compose bind-mount volumes for Windows
For stack compose files, use filepath.IsAbs instead of path.IsAbs, for
bind-mounted service volumes, because filepath.IsAbs handles Windows
paths, while path.IsAbs does not.

Signed-off-by: John Stephens <johnstep@docker.com>
Upstream-commit: 9043d39dea
Component: cli
2017-05-31 21:13:58 -07:00
Vincent Demeester 472b98cb50 Merge pull request #132 from mavenugo/stack-host
Host and Bridge network support in docker stack deploy
Upstream-commit: efaadcf465
Component: cli
2017-05-31 15:07:56 -07:00
Sebastiaan van Stijn beeb275932 Fix prefix-matching for service ps
The docker CLI matches objects either by ID _prefix_
or a full name match, but not partial name matches.

The correct order of resolution is;

- Full ID match (a name should not be able to mask an ID)
- Full name
- ID-prefix

This patch changes the way services are matched.

Also change to use the first matching service, if there's a
full match (by ID or Name) instead of continue looking for
other possible matches.

Error handling changed;

- Do not error early if multiple services were requested
  and one or more services were not found. Print the
  services that were not found after printing those that
  _were_ found instead
- Print an error if ID-prefix matching is ambiguous

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6279612443
Component: cli
2017-05-31 21:43:56 +02:00
Kenfe-Mickaël Laventure 5c0019b6e8 Merge pull request #129 from dnephin/remove-gox
Remove gox, add support for s390x
Upstream-commit: 6c59636498
Component: cli
2017-05-30 14:05:58 -07:00
Daniel Nephin ee28c840c7 Remove gox, add support for s390x
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b7b7d784d8
Component: cli
2017-05-30 16:01:21 -04:00
Kenfe-Mickaël Laventure 5146944e21 Merge pull request #118 from cpuguy83/no_prune_volume
Don't prune volumes on `docker system prune`
Upstream-commit: f3cb13c550
Component: cli
2017-05-30 10:21:15 -07:00
Brian Goff f001f628d8 Merge pull request #135 from johnstep/fix_stack_service_configs
Include stack service configs in service specs
Upstream-commit: ebd5191c0e
Component: cli
2017-05-30 13:17:49 -04:00
Brian Goff a89e29d68b Don't prune volumes on docker system prune
Volumes tend to carry important data and pruning them on `docker system
prune` can easily cause unwanted data loss.

Let's play it safe and not prune volumes on `system prune` by default,
and instead provide an option.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 37fd6128dc
Component: cli
2017-05-30 12:50:30 -04:00
Evan Hazlett 7caa2a586e Merge pull request #134 from johnstep/remove_stack_configs
Remove stack configs on stack removal
Upstream-commit: f573976486
Component: cli
2017-05-30 11:53:54 -04:00
John Stephens 94d3fb628e Include stack service configs in service specs
Signed-off-by: John Stephens <johnstep@docker.com>
Upstream-commit: b7cac96f69
Component: cli
2017-05-26 21:41:04 -07:00
John Stephens 8870137e27 Remove stack configs on stack removal
Signed-off-by: John Stephens <johnstep@docker.com>
Upstream-commit: f05cd11ee2
Component: cli
2017-05-26 18:17:43 -07:00
Aaron Lehmann a582df93a3 Merge pull request #126 from marcusmartins/handle_empty_registry_info
Handle a Docker daemon without registry info
Upstream-commit: 1b8b63be5c
Component: cli
2017-05-26 15:32:09 -07:00
Marcus Martins a9dda5c374 Handle a Docker daemon without registry info
The current implementation of the ElectAuthServer doesn't handle well when the
default Registry server is not included in the response from the daemon Info
endpoint.

That leads to the storage and usage of the credentials for the default registry
(`https://index.docker.io/v1/`) under an empty string on the client config file.

Sample config file after a login via a Docker Daemon without Registry
information:
```json
{
	"auths": {
		"": {
			"auth": "***"
		}
	}
}
```

That can lead to duplication of the password for the default registry and
authentication failures against the default registry if a pull/push is performed
without first authenticating via the misbehaving daemon.

Also, changes the output of the warning message from stdout to sdterr as
per dnephin suggestion.

Signed-off-by: Marcus Martins <marcus@docker.com>
Upstream-commit: 862649707e
Component: cli
2017-05-26 14:46:39 -07:00
Daniel Nephin 74196507d2 Only set default aliases when the network is user defined.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d5b505ee8c
Component: cli
2017-05-26 14:25:20 -04:00
Daniel Nephin f257d783a4 Add tests for verifyExternalNetwork
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 341703d21e
Component: cli
2017-05-26 12:21:04 -04:00