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

32012 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Vincent Demeester
0083d557df Merge pull request #32576 from cyli/re-vendor-swarmkit 
Re-vendor swarmkit
 2017-04-13 10:41:19 +02:00
Vincent Demeester
aa22bcb652 Merge pull request #32589 from coreyfarrell/build-network-bash-completion 
Fix bash-completion script.
 2017-04-13 10:37:17 +02:00
Vincent Demeester
05930120a0 Merge pull request #32464 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
Tõnis Tiigi
01c80435c6 Merge pull request #32449 from aaronlehmann/cluster-locking 
cluster: Allow reentrant calls to methods during shutdown
 2017-04-12 18:58:12 -07:00
Corey Farrell
eede2056fe 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>
 2017-04-12 21:36:29 -04:00
Ying Li
9b96b2d276 Add tests to ensure we can add an external CA to the cluster without 
error.

Signed-off-by: Ying Li <ying.li@docker.com>
 2017-04-12 16:55:48 -07:00
Ying Li
e34bee387e 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>
 2017-04-12 16:55:47 -07:00
Victor Vieux
bc4560e512 Merge pull request #32463 from FengtuWang/fix_TestExecWithUserAfterLiveRestore2 
fix TestExecWithUserAfterLiveRestore
 2017-04-12 16:52:35 -07:00
Daniel Nephin
4cbc953a5d Refactor dockerfile parser 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-12 18:31:52 -04:00
Daniel Nephin
9c53fa2d0c Cleanup processing of directives. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-12 15:42:35 -04:00
Doug Davis
2fb7c3c4f0 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>
 2017-04-12 12:20:14 -07:00
Daniel Nephin
64c4c1c3d5 Keep parser.Directive internal to parser 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-12 14:48:09 -04:00
Daniel Nephin
bb429da9a9 Hide builder.parser.Directive internals 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-12 14:48:09 -04:00
Tõnis Tiigi
d2ab40e5b9 Merge pull request #32532 from dnephin/refactor-some-builder-parts 
[builder] cleanup env dispatcher and Builder.build()
 2017-04-12 11:11:06 -07:00
Daniel Nephin
480d1b841f Merge pull request #32506 from cpuguy83/cancellable_route 
Use function arguments for route setup.
 2017-04-12 14:10:50 -04:00
Vincent Demeester
aa92df71b2 Merge pull request #32525 from cpuguy83/ensure_unmount_plugin 
Make sure plugin rootfs is unmounted on upgrade
 2017-04-12 18:08:06 +02:00
Anusha Ragunathan
d40a17ffc2 Merge pull request #28923 from erikh/fix-copy 
Fix copy API (`docker cp`, etc) uid/gid handling
 2017-04-12 08:21:17 -07:00
Vincent Demeester
3c07259882 Merge pull request #32370 from AkihiroSuda/improve-build-error 
builder/dockerfile: improve error message about build stage name
 2017-04-12 16:33:23 +02:00
Vincent Demeester
330ddf8eb8 Merge pull request #29807 from thaJeztah/update-frozen-images 
Update frozen images in Dockerfiles
 2017-04-12 15:37:40 +02:00
Vincent Demeester
d0bd5aa2a7 Merge pull request #32481 from yongtang/30740-docs-prune-label 
Update docs of `label` filter for `docker system prune`
 2017-04-12 15:37:04 +02:00
Brian Goff
08a39d7f02 Use function arguments for route setup. 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-04-12 08:43:51 -04:00
Evan Hazlett
2aec48f448 Merge pull request #32529 from runcom/relabel-secrets 
daemon: relabel secrets path
 2017-04-12 08:30:30 -04:00
Erik Hollensbe
8a7ff5ff74 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>
 2017-04-12 10:33:19 +00:00
Vincent Demeester
10e171cd94 Clean some function in docker_utils_test.go 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-12 11:22:32 +02:00
Vincent Demeester
2a17d048de Merge pull request #32473 from vdemeester/integration-cli-package-take3 
[test-integration] Move FakeContext to `integration-cli/cli/build/fakecontext` package…
 2017-04-12 10:24:49 +02:00
Vincent Demeester
6672ffa566 Merge pull request #32539 from aaronlehmann/tag-hex-string 
client: Allow hex strings as source references for ImageTag
 2017-04-12 09:52:56 +02:00
Vincent Demeester
18f90133ac Merge pull request #32544 from yuexiao-wang/fix-service-logs 
Fix inconsistency for service logs
 2017-04-12 09:51:15 +02:00
yuexiao-wang
78b2c1a84a Fix inconsisticy for service logs 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2017-04-12 22:43:14 +08:00
Vincent Demeester
a0a977864f Merge pull request #32180 from joaofnfernandes/run-docs 
Clean `docker run -e` reference docs
 2017-04-12 09:34:30 +02:00
Akihiro Suda
50a9be4bf5 builder/dockerfile: improve error message about build stage name 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-04-12 05:27:39 +00:00
Brian Goff
83f44d232d Make sure plugin rootfs is unmounted on upgraded 
In some cases, if a user specifies `-f` when disabling a plugin mounts
can still exist on the plugin rootfs.
This can cause problems during upgrade where the rootfs is removed and
may cause data loss.

To resolve this, ensure the rootfs is unmounted
before performing an upgrade.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-04-11 21:09:15 -04:00
Anusha Ragunathan
3343653edb Merge pull request #32030 from ehazlett/any-runtime 
Support Swarmkit Generic Task Runtime
 2017-04-11 17:53:20 -07:00
Daniel Nephin
068f344e03 Remove unused Builder.Cancel() 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-11 20:33:13 -04:00