Commit graph

31630 commits

Author SHA1 Message Date
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
Yong Tang
43a1bd564b Support --filter mode=global|replicated for docker service ls
This fix tries to address the request in 31325 by adding
`--filter mode=global|replicated` to `docker service ls`.

As `docker service ls` has a `MODE` column by default, it is natural
to support `--filter mode=global|replicated` for `docker service ls`.

There are multiple ways to address the issue. One way is to pass
the filter of mode to SwarmKit, another way is to process the filter
of mode in the daemon.

This fix process the filter in the daemon.

Related docs has been updated.

An integration test has been added.

This fix fixes 31325.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-03-15 11:06:57 -07:00
Victor Vieux
4bce232139 Revert "Planned 1.13 deprecation: email from login"
This reverts commit a66efbddb8.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-15 10:43:18 -07:00
unclejack
5957dc4899 pkg/archive/diff.go: avoid redundant options init
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2017-03-15 18:03:33 +02:00
Kenfe-Mickael Laventure
440b2cc7ab Update containerd to version 422e31ce907fd9c3833a38d7b8fdd023e5a76e73
This fixes an issue preventing containerd from starting if the state
directory didn't exist already.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-03-15 08:08:39 -07:00
Vincent Demeester
297786f30c Merge pull request #31687 from AkihiroSuda/fix-test-duplicate-mountpoints
TestDuplicateMountpointsForVolumesFromAndMounts: remove unintentional dependency for /tmp/data
2017-03-15 14:15:39 +01:00
Sebastiaan van Stijn
5126862d43 Merge pull request #31846 from thaJeztah/remove-outdated-etc-hosts-reference
docs: remove outdated reference to updating /etc/hosts
2017-03-15 14:07:01 +01:00
Manjunath A Kumatagi
f4ea1081f4 Rename project/CONTRIBUTORS.md -> project/CONTRIBUTING.md
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com>
2017-03-15 08:48:27 -04:00
Justin Cormack
2d95c3ca61 Merge pull request #31844 from vdemeester/image-filter-reference-remove-version-if
Don't compare API version in the future for `image ls` endpoint
2017-03-15 12:06:46 +00:00
Sebastiaan van Stijn
b0d1936d30 Merge pull request #31302 from dnephin/purge-orphaned-services
Add --prune to stack deploy
2017-03-15 12:57:06 +01:00
Sebastiaan van Stijn
171f5d84f9
docs: remove outdated reference to updating /etc/hosts
Starting with docker 1.10, docker no longer uses
/etc/hosts for service discovery, but uses an
embedded DNS server. This patch removes a reference
to the old (pre 1.10) behavior.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-15 12:27:23 +01:00
Vincent Demeester
0f9d22cd66
Replace API version comparison by a if
… as we don't know for sure what API version it will be at that time.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-03-15 10:46:06 +01:00
Jim Minter
dc0ee98805 Resolve connection reset by peer regression
Signed-off-by: Jim Minter <jminter@redhat.com>
2017-03-15 09:36:44 +00:00
erxian
3e6ff87f69 misleading default for --update-monitor duration
Signed-off-by: erxian <evelynhsu21@gmail.com>
2017-03-15 14:20:02 +08:00
Victor Vieux
817106aaa1 prepare master for the next release
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-14 20:43:33 -07:00
Victor Vieux
0b9b7906af Merge pull request #31833 from tonistiigi/docker-group
Fix default socket group regression
2017-03-14 20:34:42 -07:00
Anusha Ragunathan
95b46ff68f Merge pull request #31147 from adshmh/30629-print-escaping-hint-on-invalid-interpolation-format
docker stack deploy interpolation format error due to not escaping $ now includes a hint
2017-03-14 17:14:09 -07:00
Victor Vieux
cec9594947 Merge pull request #31790 from mlaventure/devicecgrouprules-api-swagger
Update swagger.yaml and api/version-history.md for DeviceCgrouprules
2017-03-14 16:51:09 -07:00
Tonis Tiigi
c7c2cd4e8e Fix default socket group regression
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-03-14 16:09:08 -07:00
French Ben
5443f0152f docs: added support for CLI yaml file generation
Signed-off-by: French Ben <frenchben@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-03-14 16:04:08 -07:00
Harald Albers
693a418612 Add bash completion for network inspect --verbose
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-14 15:37:59 -07:00
Victor Vieux
f7cfacbfe9 Merge pull request #31824 from albers/completion-update--service-logs
Update bash completion for `docker service logs`
2017-03-14 14:44:36 -07:00
Victor Vieux
f72404e48d Merge pull request #31686 from AkihiroSuda/fix-defer-it-on-swarm
integration-cli-on-swarm: make sure deferred function gets executed before os.Exit()
2017-03-14 14:41:41 -07:00
Daniel Nephin
644fd804fc Add --prune to stack deploy.
Add to command line reference.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-14 16:09:28 -04:00
Daniel Nephin
a9c86b63c0 Fix environment resolving.
Load from env should only happen if the value is unset.
Extract a buildEnvironment function and revert some changes to tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-14 16:00:43 -04:00
Akihiro Suda
ea43c33330 compose: fix environment interpolation from the client
For an environment variable defined in the yaml without value,
the value needs to be propagated from the client, as in Docker Compose.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-03-14 15:59:40 -04:00