beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
32253 commits 14 branches 412 tags 338 MiB
Commit graph

32253 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jim Minter
68e71aa3e6 Close logger only after StartLogger call 
Signed-off-by: Jim Minter <jminter@redhat.com>
 2017-04-20 12:27:50 +01:00
Jim Minter
32ca1214fa Fix race on ContainerAttachRaw 
Signed-off-by: Jim Minter <jminter@redhat.com>
 2017-04-20 12:27:50 +01:00
Sebastiaan van Stijn
7936a962dc Merge pull request #32713 from vdemeester/integration-cli-move-fakegit 
[integration] Move fakegit to its own package in cli
 2017-04-19 20:30:47 -05:00
Alvin Deng
c79bf50ba6 Add examples of storage-opts and log-opts for the daemon 
Signed-off-by: Alvin Deng <alvin.q.deng@utexas.edu>
 2017-04-19 16:35:47 -05:00
Vincent Demeester
a582d9dc42
[integration] Move fakegit to its own package in cli 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-19 15:52:03 +02:00
Vincent Demeester
b0ba39d431
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>
 2017-04-19 14:04:39 +02:00
Victor Vieux
4bcb02b785 Merge pull request #32692 from tiborvass/add-readme-header 
Add note about the transition to Moby in the README
 2017-04-18 10:06:24 -05:00
Tibor Vass
fe3797d986 Add note about the transition to Moby in the README 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-04-18 10:04:08 -05:00
Harald Albers
ee785b1b98 Remove bogus statement from bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-04-18 10:50:02 +02:00
Boaz Shuster
8f51746997 Use a test table in the daemon delete unit tests 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-04-18 10:30:40 +03:00
Vincent Demeester
3482b45e60 Merge pull request #32647 from vdemeester/integration-runSleepingContainer-using-cli 
[integration] make runSleepingContainer use cli package
 2017-04-18 08:35:55 +02:00
Tõnis Tiigi
cd4c089b9e Merge pull request #32626 from aaronlehmann/vendor-swarmkit-61a92e8 
Vendor swarmkit 61a92e8
 2017-04-17 23:24:43 -05:00
Tõnis Tiigi
64932563c9 Merge pull request #32669 from darrenstahlmsft/FixTmpDelete 
Fix tmp deletion
 2017-04-17 23:13:54 -05:00
Darren Stahl
5e4e357f6e Windows: Do not attempt to clean empty windowsfilter folder 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-04-17 13:10:15 -07:00
Darren Stahl
5cea9a0aa5 Fix tmp folder deletion 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-04-17 13:09:40 -07:00
Daniel Nephin
cad32e0111 Set Composefile WorkingDir to dirname of the composefile. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-17 15:14:58 -04:00
Daniel Nephin
f33f257888 Merge pull request #32666 from vdemeester/fix-test-unit 
Fix formatter unit test (moving to testify)
 2017-04-17 15:14:08 -04:00
Vincent Demeester
3f676c1918
Fix formatter unit test (moving to testify) 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-17 17:32:52 +02:00
Daniel Nephin
1eec7b5583 Merge pull request #32614 from aaronlehmann/testify 
Remove pkg/testutil/assert in favor of testify
 2017-04-17 11:07:08 -04:00
allencloud
1c7b03a455 add empty string for restart policy in swagger.yml 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-04-17 14:37:37 +08:00
Vincent Demeester
a9ff628a3c Merge pull request #32645 from thaJeztah/minor-fixes-for-history-format 
Minor fixups for history CLI reference
 2017-04-16 23:59:49 +02:00
Vincent Demeester
a899aa6796
[integration] make runSleepingContainer use cli package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-16 23:39:30 +02:00
Vincent Demeester
4850bc4df8 Merge pull request #32646 from thaJeztah/fix-markdown-indentation-level 
Fix markdown indentation level
 2017-04-16 22:01:29 +02:00
Aaron Lehmann
2b5ef9bfef 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>
 2017-04-16 12:42:21 -07:00
Sebastiaan van Stijn
bda69e6142
Fix markdown indentation level 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-04-16 12:56:00 -05:00
Sebastiaan van Stijn
2e63c759a2
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>
 2017-04-16 12:51:29 -05:00
Sebastiaan van Stijn
a3ab46361e Merge pull request #30962 from TheHipbot/30431-implement-format-for-history-with-docs 
30431 implement format for history with docs
 2017-04-16 10:34:41 -07:00
Vincent Demeester
a35a65b78a Merge pull request #32636 from aaronlehmann/example-dot-com 
Avoid using "example.com" in integration test
 2017-04-15 17:19:27 +02:00
Vincent Demeester
72f4fc78ff Merge pull request #30699 from allencloud/update-status-code-for-network-api 
update status code for network api
 2017-04-15 17:18:12 +02:00
Vincent Demeester
6e577ea1c0 Merge pull request #32546 from vdemeester/integration-clean-utils-take1 
[test-integration] more clean on `docker_utils_test.go`, wait* functions
 2017-04-15 17:17:56 +02:00
Vincent Demeester
3977d2c440 Merge pull request #32628 from aaronlehmann/zero-timestamps 
Hide zero-valued timestamps from service JSON
 2017-04-15 11:46:58 +02:00
Colin Hebert
bddd9cce40 Regenerate schema with the correct libraries 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-04-15 13:00:23 +10:00
Colin Hebert
0ee58cb3b9 Run go generate github.com/docker/docker/cli/compose/schema 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-04-15 10:57:43 +10:00
Aaron Lehmann
b483e4f09c 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>
 2017-04-14 16:01:56 -07:00
Colin Hebert
1d1defa399 Add support for labels during build with compose 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-04-15 05:31:28 +10:00
Aaron Lehmann
6052f2b396 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>
 2017-04-14 12:03:21 -07:00
Aaron Lehmann
8a27758364 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>
 2017-04-14 10:44:24 -07:00
Vincent Demeester
db35c2a5a8 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>
 2017-04-14 19:27:33 +02:00
Aaron Lehmann
f2146cb74b Vendor swarmkit 61a92e8 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-04-14 10:20:58 -07:00
allencloud
ac245e2845 use make slice to store objects to improve efficiency 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-04-14 11:02:28 +08:00
allencloud
56dca8b676 update status code for network api 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-04-14 10:11:17 +08:00
Vincent Demeester
41f4c3cf7e Merge pull request #32601 from dnephin/builder-shell-words-buffer 
Use a bytes.Buffer for shell_words string concat
 2017-04-13 23:22:18 +02:00
Daniel Nephin
aafd7fa969 remove increment flag on imageContexts.new() 
Rename the methods to match my understanding of the behaviour.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-13 14:56:57 -04:00
Daniel Nephin
4d62f67117 Extract two functions from the FROM dispatcher 
This helps clarify the difference cases for parsing ctxName, and for
getting an image.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-13 14:56:57 -04:00
Vincent Demeester
700b4807c3 Merge pull request #32580 from dnephin/refactor-builder-parser-directive 
Refactor Dockerfile.parser and directive
 2017-04-13 20:47:42 +02:00
Daniel Nephin
0055a48277 Use a bytes.Buffer for shell_words string concat 
It's much faster

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-13 14:39:34 -04:00
Sebastiaan van Stijn
77da738832 Merge pull request #31461 from jpetazzo/announce-all-the-rcs 
Make rc announcement mandatory
 2017-04-13 10:11:57 -07:00
Sebastiaan van Stijn
0b35ab1965 Merge pull request #31482 from ripcurld0/add_format_to_system_df 
Add format to the docker system df command
 2017-04-13 10:08:11 -07:00
Daniel Nephin
df3c425407 Merge pull request #32328 from duglin/fixEnvVars 
Minor tweaks to quotes in env vars
 2017-04-13 10:41:28 -04:00
Brian Goff
b7794ac46f Merge pull request #32597 from albers/completion-service-logs 
Bash completion treats `docker service logs` as stable
 2017-04-13 09:29:16 -04:00