Kenfe-Mickaël Laventure
28eb46de56
Merge pull request #119 from andrewhsu/ver
...
allow version number to be set in builds
2017-05-22 18:16:41 -07:00
Andrew Hsu
3dfe334a7a
allow version number to be set in builds
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-22 13:22:42 -07:00
Daniel Nephin
883d28cfce
Merge pull request #106 from dnephin/improve-makefile
...
Remove @ from Makefiles
2017-05-19 16:03:04 -04:00
Kenfe-Mickaël Laventure
1fc7eb5d64
Merge pull request #104 from dnephin/add-ppc64le-to-cross
...
Add ppc64le to cross
2017-05-19 08:02:01 -07:00
Daniel Nephin
46049dd0b6
Enabled linux/ppc64le cross build.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-18 13:07:26 -04:00
Sebastiaan van Stijn
eea4a38cd6
Merge pull request #77 from vdemeester/move-duration-opts
...
Move duration opts into an opts package
2017-05-18 11:15:30 +02:00
Madhu Venugopal
3dfb8343b1
Merge pull request #62 from abhinandanpb/master
...
Adding network specific option in csv format for service create/update
2017-05-17 21:17:23 -07:00
Abhinandan Prativadi
0893ab8560
moving opts to cli repo
...
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-05-17 21:08:58 -07:00
Abhinandan Prativadi
2e07636e5e
moby vendoring
...
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-05-17 21:08:57 -07:00
Abhinandan Prativadi
40341ae089
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>
2017-05-17 21:07:48 -07:00
Madhu Venugopal
d156151ba1
Merge pull request #49 from aboch/nlo2
...
Add network create flags --scope, --config-only, --config-from
2017-05-17 20:08:23 -07:00
Alessandro Boch
f7415aa953
Vendor moby/moby @4874e0
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-05-17 19:55:09 -07:00
Sebastiaan van Stijn
74cc280521
Merge pull request #30 from nishanttotla/rename-trust-function
...
Moving docker service digest pinning to client side
2017-05-18 03:05:48 +02:00
Nishant Totla
39d03bb2bd
Adding a flag to allow disabling registry lookup
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-05-17 17:55:11 -07:00
Nishant Totla
c61ea6f789
Service create/update set QueryRegistry appropriately
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-05-17 17:39:35 -07:00
Alessandro Boch
b5e43fb5ec
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>
2017-05-17 17:17:50 -07:00
Sebastiaan van Stijn
85c2330dfa
Merge pull request #80 from AkihiroSuda/adjust-docker-stats
...
[Carry moby/moby#32777 ] Adjusted docker stats memory output
2017-05-18 01:55:52 +02:00
Sebastiaan van Stijn
b3e7e1ff74
Merge pull request #101 from jlhawn/update_container_wait
...
Update `run` and `start` to use container wait API
2017-05-18 01:31:40 +02:00
Tibor Vass
63ecaf1d4f
Merge pull request #21 from aduermael/prune-security
...
prune commands : make sure label filters are considered
2017-05-17 16:23:27 -07:00
Josh Hawn
6eca53c7ae
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)
2017-05-17 15:18:01 -07:00
Kenfe-Mickaël Laventure
8372ae744e
Merge pull request #92 from vdemeester/add-codecov
...
Add codecov configuration
2017-05-17 13:50:03 -07:00
Daniel Nephin
73ebb07df5
Remove @ from Makefiles.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-17 15:56:19 -04:00
Gaetan de Villele
1cc1f54d90
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>
2017-05-17 12:36:09 -07:00
John Stephens
b28c4822cc
Merge pull request #90 from dnephin/add-windows-autogen
...
Add windows resources to binary
2017-05-17 11:59:54 -07:00
Josh Hawn
38591f20d0
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)
2017-05-17 11:44:54 -07:00
Josh Hawn
4f9ac4899f
Update Vendor
...
Includes updates from docker/docker and imagespec
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2017-05-17 11:44:54 -07:00
Daniel Nephin
3d655c090a
Merge pull request #87 from dnephin/add-watcher
...
Support running unit tests when files are saved
2017-05-17 10:19:10 -04:00
Brian Goff
ae1124abad
Merge pull request #42 from dperny/service-logs-support-details
...
Add support for details on service logs
2017-05-17 10:15:55 -04:00
Sebastiaan van Stijn
b3be2a0316
Merge pull request #96 from nishanttotla/vendor-swarmkit
...
Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2
2017-05-17 14:05:19 +02:00
Vincent Demeester
dee8e6ab2d
Merge pull request #95 from dnephin/use-check-redirect
...
Use CheckRedirect so that client behaves the same way with GO 1.8
2017-05-17 10:13:42 +02:00
Drew Erny
ebc0eff478
Add support for details on service logs
...
Adds CLI and client support for details on service logs. CLI component
of moby/moby#32996 .
Signed-off-by: Drew Erny <drew.erny@docker.com>
2017-05-16 16:53:58 -07:00
Sebastiaan van Stijn
5b19f39017
Merge pull request #89 from aaronlehmann/pretty
...
Add --pretty option to "secret inspect" and "config inspect"
2017-05-17 01:38:10 +02:00
Aaron Lehmann
62567078ff
Add --pretty option to "secret inspect" and "config inspect"
...
This adds a pretty template for both inspect subcommands. For configs,
it's particularly useful because it's a way to expose the config payload
in the CLI in a non-base64-encoded way.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-16 15:12:20 -07:00
Nishant Totla
4ac30da2a9
Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-05-16 15:06:07 -07:00
Aaron Lehmann
c17acee8cf
Merge pull request #48 from cyli/root-rotation-cli
...
Synchronous CLI command for root CA rotation
2017-05-16 14:58:05 -07:00
Sebastiaan van Stijn
ebbab14224
Merge pull request #98 from aaronlehmann/logs-padding-underflow
...
service: Avoid underflow in logs padding calculation
2017-05-16 23:36:25 +02:00
Aaron Lehmann
51f698337d
Avoid loop when discarding contents of progress pipe
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-16 14:34:59 -07:00
Ying Li
103bfb2739
Re-vendor docker/docker.
...
Signed-off-by: Ying Li <ying.li@docker.com>
2017-05-16 14:31:19 -07:00
Ying Li
3fe8321d0c
Provide command line tool to view and rotate swarm's currently CA root certificate.
...
Signed-off-by: Ying Li <ying.li@docker.com>
2017-05-16 14:31:15 -07:00
Aaron Lehmann
37bf8ffc5a
Merge pull request #83 from cpuguy83/add_configs_to_compose
...
Add support for configs to compose format
2017-05-16 14:26:04 -07:00
Brian Goff
e574286ba2
Add support for configs to compose format
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-05-16 17:10:14 -04:00
Daniel Nephin
90809f8fd9
Merge pull request #71 from thaJeztah/add-credspec-to-compose
...
add credential-spec to compose
2017-05-16 16:45:06 -04:00
Aaron Lehmann
ab6bc5dce6
service: Avoid underflow in logs padding calculation
...
This command inserts a variable amount of padding in the log line:
padding := strings.Repeat(" ", f.padding-getMaxLength(task.Slot))
If the service is scaled up, or the slot numbers are noncontiguous, the
subtraction can underflow, causing a crash.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-16 12:27:31 -07:00
Vincent Demeester
b5182ba17f
Move duration opts into an opts package
...
They have nothing to do with service and could be used on their own.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-05-16 17:49:40 +02:00
Daniel Nephin
f9ab6a77b0
Use CheckRedirect so that client behaves the same way with GO 1.8
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-16 11:48:00 -04:00
Vincent Demeester
f4b8aec86e
Add codecov configuration
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-05-16 16:53:35 +02:00
Daniel Nephin
329f4e29c5
Remove unused windows resourcefiles.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-15 22:50:33 -04:00
Akihiro Suda
3c78bc775c
Fix float64 comparison in stats_helpers_test.go
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-05-16 02:13:00 +00:00
Sergey Tryuber
82600b7021
Adjusted docker stats memory output
...
Signed-off-by: Sergey Tryuber <Sergeant007@users.noreply.github.com>
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-05-16 02:00:47 +00:00
Daniel Nephin
8a6ad48d2b
Add windows resources to binary.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-15 18:03:03 -04:00