1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

32042 commits

Author SHA1 Message Date
Tibor Vass
0e9148b1e9 Merge pull request from lukemarsden/clarify-moby-docker
Clarify relationship between Moby and Docker.
2017-04-21 07:58:57 -05:00
Luke Marsden
8fff9bd081 Clarify relationship between Moby and Docker.
Signed-off-by: Luke Marsden <me@lukemarsden.net>
2017-04-21 06:20:46 -05:00
Vincent Demeester
bb5dfdb8c5 Merge pull request from ColinHebert/compose_add_labels_during_build
Add support for labels during build with compose
2017-04-21 10:16:48 +02:00
Solomon Hykes
7f927516ea Merge pull request from moby/moby
Updated README: a new upstream project to break up Docker into independent components
2017-04-20 17:32:32 -05:00
Solomon Hykes
252f7246a7 project: setting a new scope starting the Moby Project
Signed-off-by: Solomon Hykes <solomon@docker.com>
2017-04-20 17:25:19 -05:00
Solomon Hykes
d8413b86c0 Add Moby Project logo
Signed-off-by: Solomon Hykes <solomon@docker.com>
2017-04-20 17:03:21 -05:00
Vincent Demeester
b8e9250b59 Merge pull request from darrenstahlmsft/CleanupEmpty
Windows: Do not clean empty windowsfilter folder
2017-04-20 14:55:45 +02:00
Sebastiaan van Stijn
7936a962dc Merge pull request from vdemeester/integration-cli-move-fakegit
[integration] Move fakegit to its own package in cli
2017-04-19 20:30: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
Victor Vieux
4bcb02b785 Merge pull request 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
Vincent Demeester
3482b45e60 Merge pull request 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 from aaronlehmann/vendor-swarmkit-61a92e8
Vendor swarmkit 61a92e8
2017-04-17 23:24:43 -05:00
Tõnis Tiigi
64932563c9 Merge pull request 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
f33f257888 Merge pull request 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 from aaronlehmann/testify
Remove pkg/testutil/assert in favor of testify
2017-04-17 11:07:08 -04:00
Vincent Demeester
a9ff628a3c Merge pull request 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 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 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 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 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 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 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
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 from dnephin/builder-shell-words-buffer
Use a bytes.Buffer for shell_words string concat
2017-04-13 23:22:18 +02:00
Vincent Demeester
700b4807c3 Merge pull request 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 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 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 from duglin/fixEnvVars
Minor tweaks to quotes in env vars
2017-04-13 10:41:28 -04:00
Brian Goff
b7794ac46f Merge pull request from albers/completion-service-logs
Bash completion treats `docker service logs` as stable
2017-04-13 09:29:16 -04:00
Vincent Demeester
0083d557df Merge pull request from cyli/re-vendor-swarmkit
Re-vendor swarmkit
2017-04-13 10:41:19 +02:00
Vincent Demeester
aa22bcb652 Merge pull request from coreyfarrell/build-network-bash-completion
Fix bash-completion script.
2017-04-13 10:37:17 +02:00
Vincent Demeester
05930120a0 Merge pull request from allencloud/add-status-code-400-for-update-endpoint
add status code 400 for update endpoints in swagger.yml
2017-04-13 10:33:04 +02:00
Harald Albers
47615c9b9b Bash completion treats service logs as stable
Implements the following new CLI features:
- service logs is no longer experimental
- service logs also accepts task IDs

Signed-off-by: Harald Albers <github@albersweb.de>
2017-04-13 09:58:31 +02:00