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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
8bc9513322
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 >
Upstream-commit: 47615c9b9bfc947a2b244317188db54aa29c716e
Component: engine
2017-04-13 09:58:31 +02:00
9b0f3956d8
Merge pull request #32449 from aaronlehmann/cluster-locking
...
cluster: Allow reentrant calls to methods during shutdown
Upstream-commit: 01c80435c6cef5730e51fa848b5771232b40e143
Component: engine
2017-04-12 18:58:12 -07:00
3797bbe864
Fix bash-completion script.
...
bash-completion script for 'docker build --network' calls
__docker_plugins, the correct name for this function is
__docker_plugins_bundled.
Closes #32588
Signed-off-by: Corey Farrell <git@cfware.com >
Upstream-commit: eede2056fedf1b9d18c0dce216d5adde0bd394da
Component: engine
2017-04-12 21:36:29 -04:00
9761c85b2e
Add tests to ensure we can add an external CA to the cluster without
...
error.
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 9b96b2d276cb719e764fb9a63c8c5f58c2f983b4
Component: engine
2017-04-12 16:55:48 -07:00
a8cbf4d0f4
Re-vendor swarmkit to a version which does not require all cluster updates
...
to include an external CA certificate when updating external CAs.
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: e34bee387e0cba0da36b2c4b9113907933c32710
Component: engine
2017-04-12 16:55:47 -07:00
7cbfe4a756
Merge pull request #32463 from FengtuWang/fix_TestExecWithUserAfterLiveRestore2
...
fix TestExecWithUserAfterLiveRestore
Upstream-commit: bc4560e512b7a35340247af04f32bb6f8469f0e3
Component: engine
2017-04-12 16:52:35 -07:00
78d1a8154c
Refactor dockerfile parser
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4cbc953a5d80c850df7107b28e743e933bbeb1d3
Component: engine
2017-04-12 18:31:52 -04:00
96891f1f0d
Cleanup processing of directives.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9c53fa2d0c1796d32aaba2193e7d802cd9b66763
Component: engine
2017-04-12 15:42:35 -04:00
e1a50e229d
Minor tweaks to quotes in env vars
...
Addresses part of #32140 , in particular:
- this will make it so that double backslashes in double-quoted
strings will result in a single backslash. While in single quotes it remains
a double backslash.
- missing closing " and ' will now generate an error
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 2fb7c3c4f0b2fe15e279729a87c465df4fa70879
Component: engine
2017-04-12 12:20:14 -07:00
7e99490a6a
Keep parser.Directive internal to parser
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 64c4c1c3d5e0fe364d83db5a8dc99a24fd121754
Component: engine
2017-04-12 14:48:09 -04:00
bbeb6127dc
Hide builder.parser.Directive internals
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: bb429da9a977a9d89121052fe1143528294b8a0c
Component: engine
2017-04-12 14:48:09 -04:00
203ab34184
Merge pull request #32532 from dnephin/refactor-some-builder-parts
...
[builder] cleanup env dispatcher and Builder.build()
Upstream-commit: d2ab40e5b99bc2ab0abfea146544a20ce6081942
Component: engine
2017-04-12 11:11:06 -07:00
b2a8f5ff5d
Merge pull request #32506 from cpuguy83/cancellable_route
...
Use function arguments for route setup.
Upstream-commit: 480d1b841fd238788b75f31cd8ebe0b3a84f8eec
Component: engine
2017-04-12 14:10:50 -04:00
ad9aa60a5e
Merge pull request #32525 from cpuguy83/ensure_unmount_plugin
...
Make sure plugin rootfs is unmounted on upgrade
Upstream-commit: aa92df71b2d8e64ac9ddb2109b6ff0ddfcd0e556
Component: engine
2017-04-12 18:08:06 +02:00
866adfbbee
Merge pull request #28923 from erikh/fix-copy
...
Fix copy API (`docker cp`, etc) uid/gid handling
Upstream-commit: d40a17ffc2f6592396a3dfc0f5ebe396c2107536
Component: engine
2017-04-12 08:21:17 -07:00
cdb97bb321
Merge pull request #32370 from AkihiroSuda/improve-build-error
...
builder/dockerfile: improve error message about build stage name
Upstream-commit: 3c072598820e8b435151289ee0d8b74cb7e047ba
Component: engine
2017-04-12 16:33:23 +02:00
4de7d79620
Merge pull request #29807 from thaJeztah/update-frozen-images
...
Update frozen images in Dockerfiles
Upstream-commit: 330ddf8eb8f8a551677bdfc757fcefdb0cdaec3f
Component: engine
2017-04-12 15:37:40 +02:00
5f2d4821df
Merge pull request #32481 from yongtang/30740-docs-prune-label
...
Update docs of `label` filter for `docker system prune`
Upstream-commit: d0bd5aa2a7ad2561f067a0b9e470fc51ac2874a3
Component: engine
2017-04-12 15:37:04 +02:00
2c970161a0
Use function arguments for route setup.
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 08a39d7f02c526767072b08587a539f8d8a20bd4
Component: engine
2017-04-12 08:43:51 -04:00
4d6ef8b711
Merge pull request #32529 from runcom/relabel-secrets
...
daemon: relabel secrets path
Upstream-commit: 2aec48f44843016d13dfe4b5f53d29d0226fc769
Component: engine
2017-04-12 08:30:30 -04:00
1386ad9dee
daemon/archive.go: Fix copy routines to preserve UID.
...
This changes the long-standing bug of copy operations not preserving the
UID/GID information after the files arrive to the container.
Signed-off-by: Erik Hollensbe <github@hollensbe.org >
Upstream-commit: 8a7ff5ff746a77e0be601c11540562341b2228c1
Component: engine
2017-04-12 10:33:19 +00:00
c9b5a51747
Clean some function in docker_utils_test.go
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 10e171cd9463ca0bfda4556b3eb04d9f89d1bbbf
Component: engine
2017-04-12 11:22:32 +02:00
7b2c24fd0f
Merge pull request #32473 from vdemeester/integration-cli-package-take3
...
[test-integration] Move FakeContext to `integration-cli/cli/build/fakecontext` package…
Upstream-commit: 2a17d048de7bf5a0152789617c83a318fac508e7
Component: engine
2017-04-12 10:24:49 +02:00
cc87542bde
Merge pull request #32539 from aaronlehmann/tag-hex-string
...
client: Allow hex strings as source references for ImageTag
Upstream-commit: 6672ffa566936dc7dc6e10b494b2a1567c536ddc
Component: engine
2017-04-12 09:52:56 +02:00
33f39daca5
Merge pull request #32544 from yuexiao-wang/fix-service-logs
...
Fix inconsistency for service logs
Upstream-commit: 18f90133ac4fe0b63745228c49eda441f6b91ecd
Component: engine
2017-04-12 09:51:15 +02:00
ac649e5b5e
Fix inconsisticy for service logs
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 78b2c1a84a3be4f0004ebd277d8a88eb0ac9d006
Component: engine
2017-04-12 22:43:14 +08:00
ba4754cea8
Merge pull request #32180 from joaofnfernandes/run-docs
...
Clean `docker run -e` reference docs
Upstream-commit: a0a977864f4160cca882bbe8cc72d944025f6fee
Component: engine
2017-04-12 09:34:30 +02:00
