toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,082 Commits 3 Branches 295 Tags
2e0ee810bb2c806576d73651784d028aa3d572ce
Commit Graph
33082 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenfe-Mickael Laventure 50fe474af4 Honor context cancellation when pruning 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 0dee69799eb467543dc2ae4cc3bb7b46bc7e21d4
Component: engine
 2017-04-24 09:11:29 -07:00
Kenfe-Mickael Laventure b344c38939 Prevent multiple parallel SystemDiskUsage call 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 5a9f2a3ce66d8b0954af965b0b8bf384df02c41a
Component: engine
 2017-04-24 09:11:29 -07:00
Kenfe-Mickael Laventure 31ab70fb42 Honor context within SystemDiskUsage 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: cf7d246ab0d848cbc673f7c2d57031aecacacdfe
Component: engine
 2017-04-24 09:11:29 -07:00
Kenfe-Mickaël Laventure 4c686214d7 Merge pull request #32685 from albers/completion-cleanup-1 
Remove bogus statement from bash completion
Upstream-commit: 8cb9d7ec2e56ca360da55d66bc77e799faca1dd0
Component: engine
 2017-04-24 11:02:39 -05:00
John Howard fa19ecf48f Merge pull request #32608 from darrenstahlmsft/WindowsNanoCPUs 
Windows: Fix scaling of NanoCPUs (--cpus) on Hyper-V containers
Upstream-commit: d0ce488d9d420ebc7a448a51a58e4aa14041da7e
Component: engine
 2017-04-24 10:54:14 -05:00
Vincent Demeester be541248e1 Merge pull request #31912 from AkihiroSuda/ovl-on-non-swarm 
improve error of `docker network create -d overlay` on non-Swarm node
Upstream-commit: f9311c52cee8ddc13e69862b2f060013eeb82aba
Component: engine
 2017-04-24 17:20:48 +02:00
Vincent Demeester 0f75777a54 Merge pull request #32248 from icapurro/cli-image-tests 
Unit tests for cli/command/image package
Upstream-commit: 663f0ba1b2a90dc56e4e03777754dccd3092c7f1
Component: engine
 2017-04-24 17:01:26 +02:00
John Howard ae1cfbfd19 Merge pull request #32731 from hairyhenderson/one-line-swarm-join-output-32725 
Output `docker swarm join` command on a single line when running `docker swarm init`
Upstream-commit: c22b21fede388f0072a5a01b9177bfafefe269cb
Component: engine
 2017-04-24 09:53:16 -05:00
Ignacio Capurro 0b4ffdab67 Unit tests for cli/commands/image (except build and tag) 
Signed-off-by: Ignacio Capurro <icapurrofagian@gmail.com>
Upstream-commit: b2551c619d30f163c3ab8c9ee53cdb09bfbeaa55
Component: engine
 2017-04-23 12:27:39 -05:00
Vincent Demeester 60d521eac2 Merge pull request #32768 from dnephin/try-enable-test-matches-on-windows 
Enable TestMatches on windows
Upstream-commit: c264aefdac2d0698df62d203455fcee83e9fd7ee
Component: engine
 2017-04-23 15:54:45 +02:00
Sebastiaan van Stijn 87a3307749 Merge pull request #32740 from vdemeester/integration-trusted-cmd-cli 
Use `cli` for trusted related command
Upstream-commit: 83ee902ecc3790c33c1e2d87334074436056bb49
Component: engine
 2017-04-22 14:51:12 -07:00
Brian Goff 8cc7c79d45 Merge pull request #32654 from allencloud/use-make-slice-to-store-swarmkit-objects 
use make slice to store cluster objects to improve efficiency
Upstream-commit: a709f79c1a98c3661f12397fe61f0e6a46f1dbb3
Component: engine
 2017-04-22 12:02:34 -04:00
Misty Stanley-Jones 66bc4368bf Merge pull request #32723 from alvin319/master 
Add examples of storage-opts and log-opts for the daemon
Upstream-commit: 80013fd59a19fa1ddccc7c3d879a4571806024c7
Component: engine
 2017-04-21 20:41:45 -05:00
Daniel Nephin f1f010b701 Enable a unit test on windows. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9484c3bd81fa8aab46b7268c5c3bfeb8e14aa369
Component: engine
 2017-04-21 12:31:16 -04:00
Tibor Vass 6d41c81006 Merge pull request #32761 from lukemarsden/clarify-moby-docker 
Clarify relationship between Moby and Docker.
Upstream-commit: 0e9148b1e92dc6cf79dc57c71423297d5c11d0ca
Component: engine
 2017-04-21 07:58:57 -05:00
Luke Marsden ac7cbfcff6 Clarify relationship between Moby and Docker. 
Signed-off-by: Luke Marsden <me@lukemarsden.net>
Upstream-commit: 8fff9bd0816f3f86c2f84c26c5b102f3de3cca81
Component: engine
 2017-04-21 06:20:46 -05:00
Vincent Demeester 178e6f9ebd Merge pull request #32632 from ColinHebert/compose_add_labels_during_build 
Add support for labels during build with compose
Upstream-commit: bb5dfdb8c5acd48f17498b111db360820a50baec
Component: engine
 2017-04-21 10:16:48 +02:00
Alvin Deng a4980cfd50 Update dockerd.md 
Signed-off-by: Alvin Deng <alvin.q.deng@utexas.edu>
Upstream-commit: 427a521b025afaa967c701e234f5366cc633cf77
Component: engine
 2017-04-20 21:56:21 -05:00
Solomon Hykes 14f3956c8e Merge pull request #32691 from moby/moby 
Updated README: a new upstream project to break up Docker into independent components
Upstream-commit: 7f927516eae370aff1e7993ff43e4d99c409e126
Component: engine
 2017-04-20 17:32:32 -05:00
Solomon Hykes c2513f1e56 project: setting a new scope starting the Moby Project 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 252f7246a740b7a1d502638b4026ec81f359e0e1
Component: engine
 2017-04-20 17:25:19 -05:00
Solomon Hykes 63ddf44cbf Add Moby Project logo 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: d8413b86c09f643d970206ccd16fee35900da7bd
Component: engine
 2017-04-20 17:03:21 -05:00
Vincent Demeester 9019dbd01c Merge pull request #32668 from darrenstahlmsft/CleanupEmpty 
Windows: Do not clean empty windowsfilter folder
Upstream-commit: b8e9250b59de8619b94f7532c0fc182913028f1e
Component: engine
 2017-04-20 14:55:45 +02:00
Dave Henderson ac65b0c3b9 Output docker swarm join on a single line 
This avoids issues when copy/pasting between different shells on
different OSes, which may not all support `\` as a continuation
character.

Fixes #32725

Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Upstream-commit: 50368e7a0ebc654689e3932dea588612e3496823
Component: engine
 2017-04-20 07:18:25 -05:00
Jim Minter 740b35daa9 Prevent ContainerLogs from hanging if container doesn't run for long 
Signed-off-by: Jim Minter <jminter@redhat.com>
Upstream-commit: 4fdb17c77765fb44ae263d5012bb79bb8bd15456
Component: engine
 2017-04-20 12:27:51 +01:00
Jim Minter 4c4873bc87 Close logger only after StartLogger call 
Signed-off-by: Jim Minter <jminter@redhat.com>
Upstream-commit: 68e71aa3e686b05987f139a7f64df304461b504a
Component: engine
 2017-04-20 12:27:50 +01:00
Jim Minter 3df8030542 Fix race on ContainerAttachRaw 
Signed-off-by: Jim Minter <jminter@redhat.com>
Upstream-commit: 32ca1214fa55f55c54a54061ecf752b75f2c72c3
Component: engine
 2017-04-20 12:27:50 +01:00
Sebastiaan van Stijn db947691c9 Merge pull request #32713 from vdemeester/integration-cli-move-fakegit 
[integration] Move fakegit to its own package in cli
Upstream-commit: 7936a962dc5f0f97fa2195c9497bc6e21e13fc2e
Component: engine
 2017-04-19 20:30:47 -05:00
Alvin Deng 3ba3666c3a Add examples of storage-opts and log-opts for the daemon 
Signed-off-by: Alvin Deng <alvin.q.deng@utexas.edu>
Upstream-commit: c79bf50ba6cd68267f3d87f40dcd25167b750ea4
Component: engine
 2017-04-19 16:35:47 -05:00
Vincent Demeester f5ac07a8d7 [integration] Move fakegit to its own package in cli 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a582d9dc42abd96bd88197939e082a1ea3c938a7
Component: engine
 2017-04-19 15:52:03 +02:00
Vincent Demeester 987b06e286 Use cli for trusted relate command 
This also removed some skipped test (that are skipped for a long while).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b0ba39d4312ff20b11fc777092cc0c3e5ddeb19f
Component: engine
 2017-04-19 14:04:39 +02:00
Jean-Pierre Huynh e3d2b9b314 MAINTAINER deprecation follow up. Relates to #25466 
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
Upstream-commit: 2c435ab8beba93509b957e4ac5e5801b86b5e8f1
Component: engine
 2017-04-18 16:44:33 -05:00
Victor Vieux 3492680b4d Merge pull request #32692 from tiborvass/add-readme-header 
Add note about the transition to Moby in the README
Upstream-commit: 4bcb02b785bc84ae9f163d936e1f9734ab59c865
Component: engine
 2017-04-18 10:06:24 -05:00
Tibor Vass b20f1e21b6 Add note about the transition to Moby in the README 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: fe3797d9865c808b1d47469d3b4ace03ea4ae206
Component: engine
 2017-04-18 10:04:08 -05:00
Harald Albers d2b501cbdb Remove bogus statement from bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ee785b1b9864e1f77ff04c684949a7f09f1d4934
Component: engine
 2017-04-18 10:50:02 +02:00
Boaz Shuster b70b785207 Use a test table in the daemon delete unit tests 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 8f51746997e4ea26fdc80703d3e9c881b87816f2
Component: engine
 2017-04-18 10:30:40 +03:00
Vincent Demeester 70222af7e7 Merge pull request #32647 from vdemeester/integration-runSleepingContainer-using-cli 
[integration] make runSleepingContainer use cli package
Upstream-commit: 3482b45e60eee8086d0c1bcee8b7298dc90bb6d6
Component: engine
 2017-04-18 08:35:55 +02:00
Tõnis Tiigi 7a295107af Merge pull request #32626 from aaronlehmann/vendor-swarmkit-61a92e8 
Vendor swarmkit 61a92e8
Upstream-commit: cd4c089b9e026317ea85e816b1323cf6465b662b
Component: engine
 2017-04-17 23:24:43 -05:00
Tõnis Tiigi 25a20bf925 Merge pull request #32669 from darrenstahlmsft/FixTmpDelete 
Fix tmp deletion
Upstream-commit: 64932563c91eccec589c02c788a179799fbe5ac6
Component: engine
 2017-04-17 23:13:54 -05:00
Darren Stahl 347c2cd583 Windows: Do not attempt to clean empty windowsfilter folder 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 5e4e357f6e53ed9aeb0d4988d8c780acd5da3ed5
Component: engine
 2017-04-17 13:10:15 -07:00
Darren Stahl 1053121285 Fix tmp folder deletion 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 5cea9a0aa557401447d440ce2286be19f8fe3cc2
Component: engine
 2017-04-17 13:09:40 -07:00
Daniel Nephin f6580aefb9 Set Composefile WorkingDir to dirname of the composefile. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: cad32e0111cec6088cf26cbb122e816fc0a3f6c8
Component: engine
 2017-04-17 15:14:58 -04:00
Daniel Nephin 59735a2883 Merge pull request #32666 from vdemeester/fix-test-unit 
Fix formatter unit test (moving to testify)
Upstream-commit: f33f2578881af36dc403a2063a00b19a4844fcbe
Component: engine
 2017-04-17 15:14:08 -04:00
Vincent Demeester 1720321911 Fix formatter unit test (moving to testify) 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3f676c1918226966db0bd776284f12fe71a2b957
Component: engine
 2017-04-17 17:32:52 +02:00
Daniel Nephin d44cde780d Merge pull request #32614 from aaronlehmann/testify 
Remove pkg/testutil/assert in favor of testify
Upstream-commit: 1eec7b5583662d82c39510e54e050b21ebf11a18
Component: engine
 2017-04-17 11:07:08 -04:00
allencloud 1c74a5638b add empty string for restart policy in swagger.yml 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 1c7b03a45563ae7e8000465feb04f7c299bb0d6d
Component: engine
 2017-04-17 14:37:37 +08:00
Vincent Demeester 95052e2e30 Merge pull request #32645 from thaJeztah/minor-fixes-for-history-format 
Minor fixups for history CLI reference
Upstream-commit: a9ff628a3c7c55cf016af88f37c4fb6a6029e17a
Component: engine
 2017-04-16 23:59:49 +02:00
Vincent Demeester b1bedaaeee [integration] make runSleepingContainer use cli package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a899aa6796cd671d0e49e7f11edeb0553f11b356
Component: engine
 2017-04-16 23:39:30 +02:00
Vincent Demeester b16379f608 Merge pull request #32646 from thaJeztah/fix-markdown-indentation-level 
Fix markdown indentation level
Upstream-commit: 4850bc4df86cbd5afb8c1c15a16834c605dd7756
Component: engine
 2017-04-16 22:01:29 +02:00
Aaron Lehmann 10ab51232c integration-cli: Have TestSwarmJoinPromoteLocked wait for the role to change in the certificate 
Since the certificate may be renewed multiple times, this check is
necessary.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 2b5ef9bfef0eed60356e2af3230b3b5bd782db2b
Component: engine
 2017-04-16 12:42:21 -07:00
Sebastiaan van Stijn b07c419b5f Fix markdown indentation level 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bda69e61427796b9631d61d61daf692177e95d06
Component: engine
 2017-04-16 12:56:00 -05:00