toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,043 Commits 3 Branches 295 Tags
f1f010b701c4fe87063aa2bb679438ad4d618a08
Commit Graph
32043 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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 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
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
Sebastiaan van Stijn 59a197605b Minor fixups for history CLI reference 
This does some minor fix-ups in the CLI reference
for "history", and copies the formattting section to
the man-pages.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2e63c759a264cac09a37ff7f154014038289ca98
Component: engine
 2017-04-16 12:51:29 -05:00
Sebastiaan van Stijn 4489cc6ffc Merge pull request #30962 from TheHipbot/30431-implement-format-for-history-with-docs 
30431 implement format for history with docs
Upstream-commit: a3ab46361ee91dc99790e84369b4865572bd9f8c
Component: engine
 2017-04-16 10:34:41 -07:00
Vincent Demeester da6ca5cfc4 Merge pull request #32636 from aaronlehmann/example-dot-com 
Avoid using "example.com" in integration test
Upstream-commit: a35a65b78a4e71ac014150c9f70dc488139235b7
Component: engine
 2017-04-15 17:19:27 +02:00
Vincent Demeester b10ab8515f Merge pull request #30699 from allencloud/update-status-code-for-network-api 
update status code for network api
Upstream-commit: 72f4fc78ff44dcec140e7b820c04ece219a6ed23
Component: engine
 2017-04-15 17:18:12 +02:00
Vincent Demeester e27499c21b Merge pull request #32546 from vdemeester/integration-clean-utils-take1 
[test-integration] more clean on `docker_utils_test.go`, wait* functions
Upstream-commit: 6e577ea1c0d7ee1661da63e11e7a41e43459d8f0
Component: engine
 2017-04-15 17:17:56 +02:00
Vincent Demeester ebab847ec8 Merge pull request #32628 from aaronlehmann/zero-timestamps 
Hide zero-valued timestamps from service JSON
Upstream-commit: 3977d2c440b3b4c02e548321e77299b8741e9ca9
Component: engine
 2017-04-15 11:46:58 +02:00
Colin Hebert 8e695a49da Regenerate schema with the correct libraries 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Upstream-commit: bddd9cce40d58d27551e796b9fae515b24eab40e
Component: engine
 2017-04-15 13:00:23 +10:00
Colin Hebert b9691f7292 Run go generate github.com/docker/docker/cli/compose/schema 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Upstream-commit: 0ee58cb3b94ad569f3642009343beac8eda0bacf
Component: engine
 2017-04-15 10:57:43 +10:00
Aaron Lehmann e65e307753 Avoid using "example.com" in integration test 
This test appears to trigger HTTP requests to "example.com", which may
explain why it is not behaving consistently. This changes it to use an
internal HTTP server to avoid unexpected behavior caused by firewalls or
proxies.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: b483e4f09c128c2fabf82f787c0cf737c17c9c10
Component: engine
 2017-04-14 16:01:56 -07:00
Colin Hebert 8df9b5486d Add support for labels during build with compose 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Upstream-commit: 1d1defa399157f1fc246bb5a8772bb1fc4305348
Component: engine
 2017-04-15 05:31:28 +10:00
Aaron Lehmann 142883d5b3 Remove pkg/testutil/assert in favor of testify 
I noticed that we're using a homegrown package for assertions. The
functions are extremely similar to testify, but with enough slight
differences to be confusing (for example, Equal takes its arguments in a
different order). We already vendor testify, and it's used in a few
places by tests.

I also found some problems with pkg/testutil/assert. For example, the
NotNil function seems to be broken. It checks the argument against
"nil", which only works for an interface. If you pass in a nil map or
slice, the equality check will fail.

In the interest of avoiding NIH, I'm proposing replacing
pkg/testutil/assert with testify. The test code looks almost the same,
but we avoid the confusion of having two similar but slightly different
assertion packages, and having to maintain our own package instead of
using a commonly-used one.

In the process, I found a few places where the tests should halt if an
assertion fails, so I've made those cases (that I noticed) use "require"
instead of "assert", and I've vendored the "require" package from
testify alongside the already-present "assert" package.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 6052f2b3969feadb01662d8e2f30337d9c7f61af
Component: engine
 2017-04-14 12:03:21 -07:00
Aaron Lehmann 62078c31fe Hide zero-valued timestamps from service JSON 
It was possible to see output like this:

        "UpdateStatus": {
            "State": "updating",
            "StartedAt": "2017-04-14T17:10:03.226607162Z",
            "CompletedAt": "1970-01-01T00:00:00Z",
            "Message": "update in progress"
        }

The timestamp fields were already changed to pointers, and left nil if
the timestamp value was zero. However the zero-value of a timestamp from
gRPC is different from the value Go considers to be zero. gRPC uses the
Unix epoch instead of Go's epoch. Therefore, check that the timestamp
does not match the Unix epoch.

Also, add " ago" to the timestamps as shown in "docker service inspect
--pretty", as they are shown as relative times.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 8a27758364a151d9497cbb507463e81898579c37
Component: engine
 2017-04-14 10:44:24 -07:00
Vincent Demeester cb7f296afd Introduce cli.Wait* fuctions 
These replace `wait*` functions from `docker_utils_test.go` and work
more or less like other `cli` functions.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: db35c2a5a8d93cfeac9e75a3add60ae7c64a5856
Component: engine
 2017-04-14 19:27:33 +02:00
Aaron Lehmann b369e3e6a2 Vendor swarmkit 61a92e8 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: f2146cb74bec8741c8577db692b23ab77cc2d9b8
Component: engine
 2017-04-14 10:20:58 -07:00
allencloud 7994679b80 update status code for network api 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 56dca8b676cee2781021cb1138f48d42ace415a4
Component: engine
 2017-04-14 10:11:17 +08:00
Vincent Demeester 834babfd94 Merge pull request #32601 from dnephin/builder-shell-words-buffer 
Use a bytes.Buffer for shell_words string concat
Upstream-commit: 41f4c3cf7e270086bb2f6a6bd4622d9aeb8f741f
Component: engine
 2017-04-13 23:22:18 +02:00
Vincent Demeester 80987246bf Merge pull request #32580 from dnephin/refactor-builder-parser-directive 
Refactor Dockerfile.parser and directive
Upstream-commit: 700b4807c3a120181973c675a8f69192d961e13f
Component: engine
 2017-04-13 20:47:42 +02:00
Daniel Nephin 964c3672d4 Use a bytes.Buffer for shell_words string concat 
It's much faster

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0055a48277b4dcec644ddfbf94d8b96c58d5e03e
Component: engine
 2017-04-13 14:39:34 -04:00
Sebastiaan van Stijn c49f4f8173 Merge pull request #31461 from jpetazzo/announce-all-the-rcs 
Make rc announcement mandatory
Upstream-commit: 77da738832cabfab158da529866d594014c0e0e6
Component: engine
 2017-04-13 10:11:57 -07:00
Sebastiaan van Stijn e9836650c4 Merge pull request #31482 from ripcurld0/add_format_to_system_df 
Add format to the docker system df command
Upstream-commit: 0b35ab196546a4de068060f10418cc5416d5b62c
Component: engine
 2017-04-13 10:08:11 -07:00
Daniel Nephin 0b7785856b Merge pull request #32328 from duglin/fixEnvVars 
Minor tweaks to quotes in env vars
Upstream-commit: df3c4254072d110ecfcefeda94279c25e6a9f334
Component: engine
 2017-04-13 10:41:28 -04:00
Brian Goff 97f903c29a Merge pull request #32597 from albers/completion-service-logs 
Bash completion treats `docker service logs` as stable
Upstream-commit: b7794ac46f26c8a492f1926ba9b3bcbfbaf431d6
Component: engine
 2017-04-13 09:29:16 -04:00
Vincent Demeester a36f892b75 Merge pull request #32576 from cyli/re-vendor-swarmkit 
Re-vendor swarmkit
Upstream-commit: 0083d557df0633b749285cee18ef06e67705c84f
Component: engine
 2017-04-13 10:41:19 +02:00
Vincent Demeester 83733587c4 Merge pull request #32589 from coreyfarrell/build-network-bash-completion 
Fix bash-completion script.
Upstream-commit: aa22bcb652795d2b26381bba60dafb3fa17aa87e
Component: engine
 2017-04-13 10:37:17 +02:00
Vincent Demeester 2f2bd517f5 Merge pull request #32464 from allencloud/add-status-code-400-for-update-endpoint 
add status code 400 for update endpoints in swagger.yml
Upstream-commit: 05930120a0dadd6bca293464b511623d39231f95
Component: engine
 2017-04-13 10:33:04 +02:00