Commit Graph

1419 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
6cac3d13cb With the introduction of node-local network support, docker services can
be attached to special networks such as host and bridge. This fix brings
in the required changes to make sure the stack file accepts these
networks as well.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 123f0bfd98
Component: cli
2017-05-25 19:50:08 -07:00
9cdca5ef2e pass in optional GITCOMMIT override
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 446af3a9b7
Component: cli
2017-05-24 22:45:42 +00:00
d1013c3e75 Merge pull request #102 from keloyang/attach-block
Recheck the container's state to avoid attach block.
Upstream-commit: 61c0b9f78d
Component: cli
2017-05-24 12:09:38 +01:00
79087a0823 Merge pull request #109 from vdemeester/codecov-in-circle
Add test-coverage & codecov target and update circleci
Upstream-commit: e47cc91ac9
Component: cli
2017-05-23 11:59:05 -04:00
1d9c61db3a allow version number to be set in builds
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 3dfe334a7a
Component: cli
2017-05-22 13:22:42 -07:00
1959f587f4 Recheck the container's state to avoid attach block.
If use docker attach command to attach to a stop container, it will return
"You cannot attach to a stopped container" error, it's ok, but when
attach to a running container, it(docker attach) use inspect to check
the container's state, if it pass the state check on the client side,
and then the container is stopped, docker attach command still attach to
the container and not exit.

Signed-off-by: Shukui Yang <yangshukui@huawei.com>
Upstream-commit: f9dc3337f9
Component: cli
2017-05-20 08:02:06 +08:00
f039c950a8 Upload coverage report from outside of test container.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f6d148c632
Component: cli
2017-05-19 17:37:38 -04:00
56d05cc358 Add test-coverage & codecov target and update circleci
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d79d903864
Component: cli
2017-05-19 17:22:37 -04:00
5bbf4871d4 Merge pull request #106 from dnephin/improve-makefile
Remove @ from Makefiles
Upstream-commit: 883d28cfce
Component: cli
2017-05-19 16:03:04 -04:00
4d54b44919 Enabled linux/ppc64le cross build.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 46049dd0b6
Component: cli
2017-05-18 13:07:26 -04:00
bc98a48832 Merge pull request #77 from vdemeester/move-duration-opts
Move duration opts into an opts package
Upstream-commit: eea4a38cd6
Component: cli
2017-05-18 11:15:30 +02:00
6065480cb3 moving opts to cli repo
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Upstream-commit: 0893ab8560
Component: cli
2017-05-17 21:08:58 -07:00
e4194f2c92 moby vendoring
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Upstream-commit: 2e07636e5e
Component: cli
2017-05-17 21:08:57 -07:00
dd32a4ed8f Adding network options to service create/update
Changes added to accept network specific options in
docker service create/update

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Upstream-commit: 40341ae089
Component: cli
2017-05-17 21:07:48 -07:00
6046962f0a Merge pull request #49 from aboch/nlo2
Add network create flags --scope, --config-only, --config-from
Upstream-commit: d156151ba1
Component: cli
2017-05-17 20:08:23 -07:00
e90e12563c Vendor moby/moby @4874e0
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: f7415aa953
Component: cli
2017-05-17 19:55:09 -07:00
9b300a1def Merge pull request #30 from nishanttotla/rename-trust-function
Moving docker service digest pinning to client side
Upstream-commit: 74cc280521
Component: cli
2017-05-18 03:05:48 +02:00
d8354ad717 Adding a flag to allow disabling registry lookup
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 39d03bb2bd
Component: cli
2017-05-17 17:55:11 -07:00
fd1d1e23c8 Service create/update set QueryRegistry appropriately
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: c61ea6f789
Component: cli
2017-05-17 17:39:35 -07:00
17199df157 Add support for config-only, config-from and scope options
- To promote a network to swarm mode

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: b5e43fb5ec
Component: cli
2017-05-17 17:17:50 -07:00
6ff9bdf996 Merge pull request #80 from AkihiroSuda/adjust-docker-stats
[Carry moby/moby#32777] Adjusted docker stats memory output
Upstream-commit: 85c2330dfa
Component: cli
2017-05-18 01:55:52 +02:00
621e243582 Merge pull request #101 from jlhawn/update_container_wait
Update `run` and `start` to use container wait API
Upstream-commit: b3e7e1ff74
Component: cli
2017-05-18 01:31:40 +02:00
705b40c511 Merge pull request #21 from aduermael/prune-security
prune commands : make sure label filters are considered
Upstream-commit: 63ecaf1d4f
Component: cli
2017-05-17 16:23:27 -07:00
6ab9e202e7 Refactor holdHijackedConnection
It has been refactored to a hijackedIOStreamer type which has several
methods which are used to prepare input and handle streaming the input
and output separately.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 6eca53c7ae
Component: cli
2017-05-17 15:18:01 -07:00
484d9f1587 Merge pull request #92 from vdemeester/add-codecov
Add codecov configuration
Upstream-commit: 8372ae744e
Component: cli
2017-05-17 13:50:03 -07:00
235c74487c Remove @ from Makefiles.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 73ebb07df5
Component: cli
2017-05-17 15:56:19 -04:00
8068ecfd18 make system prune “--filter” flag available only for docker 17.04 (api v1.28) and newer
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 1cc1f54d90
Component: cli
2017-05-17 12:36:09 -07:00
dd8e5ae38a Merge pull request #90 from dnephin/add-windows-autogen
Add windows resources to binary
Upstream-commit: b28c4822cc
Component: cli
2017-05-17 11:59:54 -07:00
96f059a410 Update CLI package with containerWait changes
The docker/client package was updated to support the updated Container
Wait API functionality. The run and start commands have been updated to
use the new wait features.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 38591f20d0
Component: cli
2017-05-17 11:44:54 -07:00
ed481a9078 Update Vendor
Includes updates from docker/docker and imagespec

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 4f9ac4899f
Component: cli
2017-05-17 11:44:54 -07:00
6e96eb3d23 Merge pull request #87 from dnephin/add-watcher
Support running unit tests when files are saved
Upstream-commit: 3d655c090a
Component: cli
2017-05-17 10:19:10 -04:00
64cad477fc Merge pull request #42 from dperny/service-logs-support-details
Add support for details on service logs
Upstream-commit: ae1124abad
Component: cli
2017-05-17 10:15:55 -04:00
6ae5b03502 Merge pull request #96 from nishanttotla/vendor-swarmkit
Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2
Upstream-commit: b3be2a0316
Component: cli
2017-05-17 14:05:19 +02:00
8339d63cee Merge pull request #95 from dnephin/use-check-redirect
Use CheckRedirect so that client behaves the same way with GO 1.8
Upstream-commit: dee8e6ab2d
Component: cli
2017-05-17 10:13:42 +02:00