Commit graph

25237 commits

Author SHA1 Message Date
Harald Albers
19753ec84d correct sort order in new bash completions
The completion for the new `docker service`, `docker swarm` and
`docker node` command families were partly added in non-alphabetical
order.

Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-18 09:54:44 -07:00
Mike Goelzer
5cf73a47f5 Add bash completion for docker service scale
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com>

Conflicts:
	contrib/completion/bash/docker
2016-06-18 09:27:06 -07:00
Sebastiaan van Stijn
1d45334a1a Merge pull request #23713 from SvenDowideit/fix-more-links
Fix more links
2016-06-18 07:49:18 -07:00
Sven Dowideit
c2495dbe6d bad url
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-06-18 13:00:38 +00:00
Sven Dowideit
ad1819ca1d href links are not converted from file.md by hugo
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-06-18 12:44:38 +00:00
Arnaud Porterie
a3b6ab04f6 Merge pull request #23703 from tiborvass/carry-23694
Carry 23694: Default port for listen addr
2016-06-18 06:25:57 +00:00
Sebastiaan van Stijn
3911644782 Merge pull request #23708 from vieux/lower_mode
accept uppercase endpoint mode
2016-06-17 23:20:17 -07:00
Aaron Lehmann
b014d6a917 Merge pull request #23707 from mrjana/vendor
Vendoring swarmkit @3f135f206179e
2016-06-17 22:47:58 -07:00
Aaron Lehmann
1333ef3ca3 Fix parallel push of the same image to different registries
Layer uploads are deduplicated by a "key" made up of the layer DiffID
and the repository name. The repository name being used to form this key
was a remote version of the name that didn't include the name of the
registry. Consequently, pushes of the same layer in a repository with
the same remote name to different registries would wrongly be
deduplicated.

Correct the key by using the full name of the repository, which includes
the registry hostname as well as the image's name.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-06-17 22:27:03 -07:00
Sebastiaan van Stijn
95074b57c6 Merge pull request #23671 from tombee/task-creation-log-debug
Change log.printf service creation msg to debug
2016-06-17 20:23:33 -07:00
Tõnis Tiigi
5e3d9d38b4 Merge pull request #23701 from icecrime/fix_update
Change `docker service update` semantics
2016-06-17 19:51:15 -07:00
Daniel Nephin
c544649874 Add tests for AutoAcceptOption
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-17 19:43:38 -07:00
Daniel Nephin
595e79b805 Support a listen addr without a port, and add tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-17 19:43:38 -07:00
Victor Vieux
8a0c5f1578 accept uppercase endpoint mode
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-06-17 19:06:12 -07:00
Jana Radhakrishnan
64a567d24c Vendoring swarmkit @3f135f206179e
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-17 19:01:18 -07:00
Sebastiaan van Stijn
2989e7b2a0 Merge pull request #23665 from albers/fix-completion-service
fix bash completion for `docker service` subcommands
2016-06-17 17:54:49 -07:00
Sebastiaan van Stijn
81478df9b2 Merge pull request #23702 from thaJeztah/docker-service-cli-docs
Add initial "service" docs
2016-06-17 17:53:46 -07:00
Sebastiaan van Stijn
f565bc7ec9
Add initial "service" docs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-17 17:28:24 -07:00
Arnaud Porterie (icecrime)
1f8ab93b44
Change docker service update semantics
Change `docker service update` to replace attributes of the target
service rather than augment them. One particular occurrence where the
previous behavior proved problematic is when trying to update a port
mapping: the merge semantics provided no way of removing published
ports, but strictly of adding more.

The utility merge* functions where renamed accordingly to update*.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-06-17 17:09:40 -07:00
Charles Smith
78ebfaff1a update docker swarm cli
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-06-17 15:40:43 -07:00
Sven Dowideit
2b865dbc3a Merge pull request #23658 from londoncalling/mac-win-install-updates
install mac and win pared down, link to d4mac, d4win, getting started…
2016-06-18 07:49:04 +10:00
Victoria Bialas
5bc730eda7 install mac and win pared down, link to d4mac, d4win, getting started improved, added menu.md's
fixing links to d4mac and d4win

updates per @Sven and @theJeztah, fixing links, typos, menu definitions, etc.

updates per Sven's comments in the PR

removed duplicate line in tutorials menu.md

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-06-17 14:46:35 -07:00
Tomasz Kopczynski
ac7a663c0b Migrate info command to cobra
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-06-17 22:11:33 +02:00
Arnaud Porterie
28768a6296 Merge pull request #23692 from icecrime/tweak_pretty_service
Improve `docker service inspect --pretty`
2016-06-17 20:08:08 +00:00
Tibor Vass
061bbaf7a4 Merge pull request #23681 from tiborvass/plugins-fixes
Plugins fixes
2016-06-17 12:58:36 -07:00
Tibor Vass
bd86644995 Merge pull request #23687 from mrjana/vendor
Vendoring libnetwork @13be89d1cf79
2016-06-17 12:05:56 -07:00
Tibor Vass
8ba17b4823 plugins: fix name handling for legacy plugins
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-06-17 12:02:05 -07:00
Arnaud Porterie (icecrime)
3c60b7b984
Improve docker service inspect --pretty
Remove capitalization in placement, and remove spurious `\t`.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-06-17 11:38:19 -07:00
Alexander Morozov
c1dd933c02 Merge pull request #23550 from swernli/execTTYFix
Fixing bug in AttachStreams that would fail to close StdIn
2016-06-17 11:19:28 -07:00
Tibor Vass
82c9410c41 Merge pull request #23688 from tonistiigi/nl
Add newline to promote/demote message
2016-06-17 11:04:25 -07:00
Tonis Tiigi
3386e3570a Add newline to promote/demote message
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-17 10:58:11 -07:00
Tibor Vass
83e31c8765 Merge pull request #23682 from mrjana/bug
Check if DriverState is valid before using in convert
2016-06-17 10:56:40 -07:00
Tibor Vass
2bd34b858d Merge pull request #23676 from avsm/swarm-cli-consistency
`docker swarm`: more consistent CLI help
2016-06-17 10:55:15 -07:00
Antonio Murdaca
e72b7ee425 Merge pull request #23664 from leonhartX/i23017
fix #23017, add zsh completion for dockerd
2016-06-17 19:44:43 +02:00
Jana Radhakrishnan
70e2585d54 Vendoring libnetwork @13be89d1cf79
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-17 10:27:34 -07:00
Vincent Demeester
cb321e82db Update plugin command with defaulttag
This way, you don't have to specify the ":latest" tag for some command
and not for others

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-17 10:18:18 -07:00
Derek McGowan
5cff374b14 Add tests for rmi
Add integration test for removing by image id with tag and digest reference to the same repository.
Add integration test to ensure only tag to other repository remains after deleting tag with accompanying digest reference.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-06-17 10:15:56 -07:00
Derek McGowan
a281be1c11 Update rmi logic for canonical references
Updates the rmi code to treat canonical references as related to tagged references from the same repository during deletion.
Canonical references with a different repository name will be treated as separate references.
Updates the remove by ID logic to still remove an image if there is a single tag reference and only canonical references to the same repository remaining.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-06-17 10:15:56 -07:00
Tibor Vass
65ed9daf70 plugins: fix usage for plugin commands
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-06-17 10:03:30 -07:00
Tibor Vass
15ff9de658 plugins: remove automatic mounting of a state dir
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-06-17 10:03:30 -07:00
Tibor Vass
4b70d4561e plugins: install should not automatically accept all permissions
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-06-17 10:03:30 -07:00
Tibor Vass
906c1dc5a0 Merge pull request #23675 from anusha-ragunathan/add_disable
Add disable flag for plugin Install.
2016-06-17 09:38:26 -07:00
Jana Radhakrishnan
4fea81154b Check if DriverState is valid before using in convert
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-17 09:17:03 -07:00
Vincent Demeester
6d47b06094 Merge pull request #23663 from albers/completion-swarm-update--cert-expiry
bash completion for `docker swarm update --cert-expiry`
2016-06-17 18:15:56 +02:00
Arnaud Porterie
83658c5b64 Merge pull request #23674 from justincormack/accepted
Missing line feed after accepting node
2016-06-17 16:08:37 +00:00
Arnaud Porterie
27e9ae3141 Merge pull request #23673 from justincormack/invalud
fix invalid typo in error message
2016-06-17 16:08:14 +00:00
Anil Madhavapeddy
0ec78739ac docker swarm: more consistent CLI help
This changes `docker swarm help` to be consistent with capitals
and removes full stops.

Before:

```
Commands:
  init        Initialize a Swarm.
  join        Join a Swarm as a node and/or manager.
  update      update the Swarm.
  leave       Leave a Swarm.
  inspect     Inspect the Swarm
```

After:

```
Commands:
  init        Initialize a Swarm
  join        Join a Swarm as a node and/or manager
  update      Update the Swarm
  leave       Leave a Swarm
  inspect     Inspect the Swarm
```

Signed-off-by: Anil Madhavapeddy <anil@docker.com>
2016-06-17 16:34:06 +01:00
Justin Cormack
c34d752419 Missing line feed after accepting node
Avoids
```
root@swarmatorium:~# docker node accept 3dnh6k13o44np9fwl83e7gh80
Node 3dnh6k13o44np9fwl83e7gh80 accepted in the swarm.root@swarmatorium:~#
```

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-17 15:49:35 +01:00
Anusha Ragunathan
22e781e8e3 Add disable flag for plugin Install.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-06-17 07:48:43 -07:00
Justin Cormack
2322ccb8ff fix invalid typo in error message
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-17 15:27:54 +01:00