Commit graph

31655 commits

Author SHA1 Message Date
cooltoast
234b2203e5 Add Johannes Kepler and Mary Jackson to name generator
Signed-off-by: cooltoast <mpatel678@gmail.com>
2017-03-17 20:36:12 -07:00
Sebastiaan van Stijn
04da404175 Merge pull request #31891 from ngaro/master
Fix zsh-completion for containers in status 'created'
2017-03-18 03:09:29 +01:00
Nikolas Garofil
e5a327ff2f Fix zsh-completion for containers in status 'created'
This patch makes sure that containers in the created-stated are
counted as stopped containers. Otherwise if you create a container,
don't run it and type: "docker rm ", followed by pressing tab in zsh, it won't show up.

Signed-off-by: Nikolas Garofil <nikolas.garofil@uantwerpen.be>
Signed-off-by: Nikolas Garofil <nikolas@garofil.be>
2017-03-18 02:09:34 +01:00
Brian Goff
a99c3bcd7f Merge pull request #31914 from albers/completion-rm-created
Improve bash completion for `docker rm`
2017-03-17 15:08:02 -04:00
Brian Goff
108dccaf51 Merge pull request #31905 from anusha-ragunathan/unmount-disable
Wait to unmount propagatedmount before marking plugin as disabled.
2017-03-17 14:37:40 -04:00
Vincent Demeester
8bc703804d Merge pull request #30781 from AkihiroSuda/fix-stack-env
compose: fix environment interpolation from the client
2017-03-17 15:56:50 +01:00
Vincent Demeester
0fe41cc4db Merge pull request #31820 from ehazlett/secrets-restrict
Restrict secret view to node level in controller
2017-03-17 14:25:32 +01:00
Harald Albers
aea95471c4 Bash completion for docker node update completes only one node
`docker node update` accepts only one node.
Before this change, bash completion would complete additional nodes.

Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-17 09:33:55 +01:00
Harald Albers
cac3775de8 Improve bash completion for docker rm
`docker rm` can delete containers in state=created, too.

Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-17 09:21:37 +01:00
Akihiro Suda
2cdc9c42eb compose: update the comment about MappingWithEquals
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-03-17 06:21:55 +00:00
Daniel J Walsh
881e20ee0b If caller specifies label overrides, don't override security options
If a caller specifies an SELinux type or MCS Label and still wants to
share an IPC Namespace or the host namespace, we should allow them.
Currently we are ignoring the label specification if ipcmod=container
or pidmode=host.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2017-03-16 20:33:37 -04:00
Victor Vieux
f148ad38e5 Merge pull request #31902 from thaJeztah/master-cherry-pick-31875
cherry-pick 31875 - update service-create.md
2017-03-16 15:36:34 -07:00
Anusha Ragunathan
70b76266b5 Wait to unmount propagatedmount before marking plugin as disabled.
TestPluginTrustedInstall revealed a race in the plugin shutdown logic,
where the exit channel signal was sent even before the propagated mounts
were unmounted. If the same plugin was enabled, it would try to setup
propagated mounts *before* it was unmounted resulting in errors.

This change fixes the behavior by waiting until the unmount completes on
disable before marking the plugin as disabled.

Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
2017-03-16 15:25:41 -07:00
Misty Stanley-Jones
2b939bdd67
Merge pull request #31875 from toolchainX/patch-2
update service-create.md
(cherry picked from commit 0f1ee84014)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-16 22:25:50 +01:00
David Xia
cd48633329
[docs] Fix incorrect docker inspect example
Fixed incorrect `docker inspect` example in docs.
Verify by running the old and new commands.

fixes #31900

Signed-off-by: David Xia <dxia@spotify.com>
2017-03-16 16:49:15 -04:00
Sebastiaan van Stijn
d376b18caf Merge pull request #31896 from aaronlehmann/move-secretrequestoption
api: Remove SecretRequestOption type
2017-03-16 21:31:15 +01:00
Sebastiaan van Stijn
f5c57d88a4 Merge pull request #31886 from daniel48/master
fix a typo
2017-03-16 21:30:22 +01:00
Sebastiaan van Stijn
3eaeee07c3 Merge pull request #31894 from dnephin/fix-schema-id
Fix compose schema id for v3.2
2017-03-16 21:19:59 +01:00
Aaron Lehmann
e7c39f4d5d api: Remove SecretRequestOption type
This type is only used by CLI code. It duplicates SecretReference in the
types/swarm package. Change the CLI code to use that type instead.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-16 11:20:31 -07:00
Daniel Nephin
576d2181e4 Fix compose schema id for v3.2
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-16 13:53:58 -04:00
Sebastiaan van Stijn
96ec447f3b Merge pull request #31890 from albers/completion-service-ls--filter-mode
Add bash completion for `service ls --filter mode`
2017-03-16 16:47:37 +01:00
Vincent Demeester
c1b04a8d6e Merge pull request #31513 from thaJeztah/better-handling-of-older-api-versions
Improve error handling of commands run against unsupported daemon
2017-03-16 16:46:06 +01:00
Harald Albers
8eac1daa81 Add bash completion for service ls --filter mode
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-16 16:31:57 +01:00
Pure White
1d61f11e34 fix a typo
when i was using:
docker search --automated -s 3 nginx
told me:
Flag --automated has been deprecated, use --filter=automated=true instead
Flag --stars has been deprecated, use --filter=stars=3 instead
and when i use:
docker search --filter=automated=true --filter=stars=3 nginx
told me:
Error response from daemon: Invalid filter 'automated'
and i found out that the correct command should be:
docker search --filter=is-automated=true --filter=stars=3 nginx

Signed-off-by: Pure White <daniel48@126.com>
2017-03-16 23:11:57 +08:00
Vincent Demeester
b6abfbafcd Merge pull request #31864 from Microsoft/jjh/failfsopshyperv
Windows: Fail fs ops on running Hyper-V containers gracefully
2017-03-16 16:00:34 +01:00
Vincent Demeester
c8d109842a Merge pull request #31881 from albers/completion-ps--format
Add bash completion for `node|service|stack ps --format`
2017-03-16 14:56:26 +01:00
Vincent Demeester
ad7cc722d7 Merge pull request #30777 from Microsoft/jjh/testexecwindowsopenhandles
Avoid TestExecWindowsOpenHandles timing out
2017-03-16 14:55:24 +01:00
Sebastiaan van Stijn
1b2edb1ff6 Merge pull request #31832 from albers/completion-network-inspect--verbose
Add bash completion for `network inspect --verbose`
2017-03-16 14:52:21 +01:00
Vincent Demeester
4261687d78 Merge pull request #31720 from jonjohnsonjr/always-head
Always HEAD blobs at least once during pushes
2017-03-16 14:39:02 +01:00
Vincent Demeester
11eb4fe70c Merge pull request #31850 from yummypeng/ignore-layer-does-not-exist
Ignore `layer does not exist` error from `docker images`
2017-03-16 14:38:39 +01:00
Sebastiaan van Stijn
aa534d3bb2 Merge pull request #31619 from rcjsuen/patch-1
Fix typo in sample output
2017-03-16 14:22:17 +01:00
Sebastiaan van Stijn
15d63f1c5b Improve error handling of commands run against unsupported daemon
The current error-handling only checked for version annotations
on the subcommand itself, but did not check the top-level command.

This patch always traverses the command path (parents), and
prints an error if the command is not supported.

Before this change:

    $ docker service
    Usage:	docker service COMMAND

    Manage services

    Options:
          --help   Print usage

    Commands:
      create      Create a new service
      inspect     Display detailed information on one or more services
      ls          List services
      ps          List the tasks of one or more services
      rm          Remove one or more services
      scale       Scale one or multiple replicated services
      update      Update a service

    Run 'docker service COMMAND --help' for more information on a command.

    $ docker service ls
    ID                  NAME                MODE                REPLICAS            IMAGE

After this change:

    $ DOCKER_API_VERSION=1.12 docker service
    docker service requires API version 1.24, but the Docker daemon API version is 1.12

    $ DOCKER_API_VERSION=1.12 docker service ls
    docker service ls requires API version 1.24, but the Docker daemon API version is 1.12

    $ DOCKER_API_VERSION=1.24 docker plugin --help
    docker plugin requires API version 1.25, but the Docker daemon API version is 1.24

    $ DOCKER_API_VERSION=1.25 docker plugin upgrade --help
    docker plugin upgrade requires API version 1.26, but the Docker daemon API version is 1.25

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-16 13:45:50 +01:00
Sebastiaan van Stijn
e638089622 Add missing API version annotations to commands
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-16 13:40:12 +01:00
unclejack
c7c9235946 Dockerfile: move comments to fix build error
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2017-03-16 14:07:31 +02:00
unclejack
23750ce535 Merge pull request #31858 from unclejack/remove_redundant_options_check
pkg/archive/diff.go: avoid redundant options init
2017-03-16 05:05:03 -07:00
Harald Albers
1bf7d2c2b4 Add bash completion for node|service|stack ps --format
Also add `--quiet|-q` where it was missing.

Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-16 12:59:32 +01:00
Vincent Demeester
52143aee95 Merge pull request #31775 from erxian/misleading-default-for-update-monitor-duration-flag
misleading default for --update-monitor duration
2017-03-16 10:13:26 +01:00
Vincent Demeester
8316753f96 Merge pull request #31866 from gdevillele/pr_service_create
improve semantics of utility function in cli/command/service
2017-03-16 10:12:15 +01:00
Vincent Demeester
2631968ea1 Merge pull request #31531 from dnephin/cleanup-image-tests
Use `assert` in `image` package unit tests
2017-03-16 09:28:38 +01:00
Akihiro Suda
87c5f67cfa Merge pull request #31057 from krasi-georgiev/30779-fix-client-login-credentials-save-domain
fix incorect login client credential save when the registry is the default docker registry
2017-03-16 13:19:32 +09:00
Yuanhong Peng
2b9694c29e Ignore layer does not exist error from docker images
Fix #31350

As we can see in `daemon.Images()`, there is a gap between
`allImages = daemon.imageStore.Map()` and `l, err :=
daemon.layerStore.Get(layerID)`, so images which still exist when we hit
`allImages = daemon.imageStore.Map()` may have already been deleted when we hit
`l, err := daemon.layerStore.Get(layerID)`.

```
	if danglingOnly {
        	allImages = daemon.imageStore.Heads()
	} else {
        	allImages = daemon.imageStore.Map()
	}

	...

	for id, img := range allImages {
		...

		layerID := img.RootFS.ChainID()
        	var size int64
	        if layerID != "" {
        	        l, err := daemon.layerStore.Get(layerID)
                	if err != nil {
                        	return nil, err
                	}
```

Signed-off-by: Yuanhong Peng <pengyuanhong@huawei.com>
2017-03-16 09:21:51 +08:00
Sebastiaan van Stijn
b36ce6f2f6 Merge pull request #31538 from yongtang/31325-service-ls-filter-mode
Support `--filter mode=global|replicated` for `docker service ls`
2017-03-16 01:42:55 +01:00
Tibor Vass
b5bd023de6 Merge pull request #30514 from FrenchBen/yaml
Yaml Generation
2017-03-15 16:20:33 -07:00
Victor Vieux
b4432de922 Merge pull request #31862 from vieux/revert_login
Revert "Planned 1.13 deprecation: email from login"
2017-03-15 16:17:13 -07:00
Tõnis Tiigi
fa6e7b39e3 Merge pull request #31847 from mkumatag/fix_contrib
Rename project/CONTRIBUTORS.md -> project/CONTRIBUTING.md
2017-03-15 14:27:15 -07:00
Gaetan de Villele
1526a99672 improve semantics of utility function in cli/command/service
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-03-15 13:49:52 -07:00
John Howard (VM)
481d2633fe Windows: Fail fs ops on running Hyper-V containers gracefully
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
2017-03-15 13:31:41 -07:00
Sebastiaan van Stijn
595ea2f120 Merge pull request #31843 from jim-minter/attachrace_regression
Resolve connection reset by peer regression
2017-03-15 20:55:23 +01:00
Victor Vieux
a8ab5855ea Merge pull request #31837 from vieux/next
prepare master for the next release
2017-03-15 11:53:16 -07:00
Victor Vieux
75b31d2d71 Merge pull request #31851 from mlaventure/update-containerd
Update containerd to version 422e31ce907fd9c3833a38d7b8fdd023e5a76e73
2017-03-15 11:09:53 -07:00