521d1c4f0b
Merge component 'cli' from git@github.com:docker/cli master
2017-12-07 01:55:54 +00:00
d7a82cda3b
Merge pull request #736 from tiborvass/platform-version
...
Add platform and its components to docker version output
Upstream-commit: ace5417954
2017-12-06 17:31:05 -08:00
b8234e6bfc
Sort component details in template
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7138d6e301
2017-12-07 02:04:10 +01:00
aa9a4c4bff
Add platform and its components to docker version output
...
The Server section of version output is now composed of an Engine
component and potentially more, based on what the /version endpoint
returns.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 5f4c5f8bb6
2017-12-07 02:04:10 +01:00
29d0c2b494
vendor moby api to get new version types
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: fe3941af7d
2017-12-07 02:04:10 +01:00
c3ea8d4b44
Merge pull request #726 from albers/completion-log-opt-line-only
...
Add bash completion for `--log-opt line-only`
Upstream-commit: 8053cf67e0
2017-12-06 16:04:26 -08:00
499d1359a4
Merge pull request #730 from BretFisher/729-fix-zsh-node-and-stack-names
...
Fixing zsh column finding in nodes and stacks.
Upstream-commit: 143f9f0336
2017-12-06 16:03:20 -08:00
9d2c3018e2
Merge pull request #733 from thaJeztah/sync-runc
...
Bump runc to b2567b37d7b75eb4cf325b77297b140ea686ce8f
Upstream-commit: ddec67c34e
2017-12-06 16:46:33 -05:00
dced91d6f0
Merge pull request #734 from shin-/schema_35_build_shm_size
...
Add shm_size property to build configuration in Compose schema
Upstream-commit: 4a4db7f20c
2017-12-06 13:35:14 -08:00
f0f2c2b953
Add missing additionalProperties marker on mount definitions
...
Signed-off-by: Joffrey F <joffrey@docker.com >
Upstream-commit: 88bbaca294
2017-12-06 12:37:38 -08:00
31d8edcd80
Add shm_size property to build configuration in Compose schema
...
Signed-off-by: Joffrey F <joffrey@docker.com >
Upstream-commit: e49f14cf36
2017-12-06 12:34:12 -08:00
c9781de504
Bump runc to b2567b37d7b75eb4cf325b77297b140ea686ce8f
...
To match what's used in Moby
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 669b8507be
2017-12-06 11:09:36 -08:00
0aafcdcf36
Merge pull request #732 from ndeloof/8917
...
closes #8917 introduce `—workdir` option for docker exec
Upstream-commit: 86653f4d57
2017-12-06 10:51:33 -08:00
8f42e63aa7
Merge pull request #711 from dnephin/compose-add-name-to-network
...
Support network.name in the compose schema
Upstream-commit: 30755cf340
2017-12-06 10:44:03 -08:00
7b947af7df
update docker/docker for ExecConfig WorkingDir support
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 798ec76223
2017-12-06 19:04:42 +01:00
378c0c6887
Merge component 'engine' from git@github.com:moby/moby master
2017-12-06 17:04:14 +00:00
4a137d3ed6
Annotate worker option for 1.35 API
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 8dc88ea7b5
2017-12-06 17:24:01 +01:00
d02e9392a1
Because the option takes an argument, a special treatment is required in the preceding case
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: da6b8cb5de
2017-12-06 17:24:01 +01:00
5deca4bbe1
introduce —workdir option for docker exec
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 591a1273fd
2017-12-06 17:24:01 +01:00
c898dfbd95
Support network.name in the compose schema.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d0b8aa7701
2017-12-06 10:05:24 -05:00
928454da48
Merge pull request #35714 from jhhwang4195/master
...
fixed typo (reliablity -> reliability)
Upstream-commit: 040033b89a201c8bb28fb847db994481d4a7f401
Component: engine
2017-12-06 06:00:54 -06:00
41a5926818
Merge pull request #35661 from ndeloof/8917
...
introduce `workingdir` option for docker exec
Upstream-commit: 5e5fadb3c0201553929d4a6ea8dc8f9d8a1e56fe
Component: engine
2017-12-06 12:40:25 +01:00
1ffad27f0c
Merge pull request #35376 from KingEmet/master
...
Permit a broader range of errors from mirror endpoints when determining whether to fall back
Upstream-commit: 4055bfb3d3031de7077406ddf0f7e529c47852a9
Component: engine
2017-12-06 01:23:00 -08:00
2990f42efe
test case to check « exec » works as expected
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 39d5ace6e1c8f3f7a008fcdf328592bfa799a243
Component: engine
2017-12-06 07:42:57 +01:00
8d97955cea
Merge pull request #35603 from ericsoderstrom/master
...
Update docs to reflect working directory name change.
Upstream-commit: a235469f456d6eb869b98c6ede19f2a0763d5580
Component: engine
2017-12-06 10:15:16 +09:00
0ec86524ed
fixed typo (reliablity -> reliability)
...
Signed-off-by: Jihyun Hwang <jhhwang@telcoware.com >
Upstream-commit: 518c50c9b21225ee991d5147cccb687ea8640afc
Component: engine
2017-12-06 09:51:53 +09:00
52db2af288
Merge component 'engine' from git@github.com:moby/moby master
2017-12-05 22:20:02 +00:00
8024cf3175
Merge pull request #35695 from boucher/upgrade-criu
...
Update CRIU version in the shell Dockerfile
Upstream-commit: c7dd58ffbf268680653b2905f6cd08a1eaf4d9c8
Component: engine
2017-12-05 15:49:02 -06:00
dfe161a946
Merge pull request #35707 from crosbymichael/ctd-1.0
...
Update to containerd v1.0.0
Upstream-commit: 7a14e267d6496b4843aca6170876e7cf53d71f58
Component: engine
2017-12-05 14:02:23 -06:00
cf5224adb2
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-12-05 19:13:46 +00:00
8ca0b6eb11
Merge component 'engine' from git@github.com:moby/moby master
2017-12-05 19:13:41 +00:00
9ece0a8dbe
Merge pull request #35700 from cpuguy83/plugin_store_rm_test
...
Add test to check for plugin mounts on remove
Upstream-commit: 27506b353002a2263e753f267e130f133b12c0fc
Component: engine
2017-12-05 10:54:04 -08:00
a394769cf9
Merge component 'cli' from git@github.com:docker/cli master
2017-12-05 18:48:42 +00:00
a369ceccde
Merge pull request #724 from dungeonmaster18/723-auto-complete-command
...
Added auto complete command for fluentd-sub-second-precision.
Upstream-commit: ea854237aa
2017-12-05 10:29:39 -08:00
4d1f5d1e42
Merge pull request #35529 from dungeonmaster18/subsecond-precision-config
...
Added SubSecondPrecision to config option.
Upstream-commit: 3461289bf0e9147afc88cd829acc0bb8b64e1053
Component: engine
2017-12-05 10:14:14 -08:00
d27e345310
Fix event filters
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: a27abc619cc18ead61fa89f652871fac1b318658
Component: engine
2017-12-05 09:55:33 -05:00
e1f6e66d66
Update containerd to v1.0.0
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 18a53d03740220aa72e454929ad1d1d6b695888e
Component: engine
2017-12-05 09:44:42 -05:00
12e67ce519
Added SubSecondPrecision flag in fluentd logger
...
Signed-off-by: dungeonmaster18 <umesh4257@gmail.com >
Upstream-commit: a1ebda09bab5bf22d96a15e71618c4a0ac08bb55
Component: engine
2017-12-05 17:21:57 +05:30
a5a325a05f
Fixing zsh column finding in nodes and stacks.
...
Signed-off-by: Bret Fisher <bret@bretfisher.com >
Upstream-commit: 8b6d6fa974
2017-12-05 01:03:25 -05:00
dfd519caff
Add test to check for plugin mounts on remove
...
Ensures that when a plugin is removed that it doesn't interfere with
other plugins mounts and also ensures its own mounts are cleaned up.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5017b5bef55c31db4c04c8058ef7db8597b11341
Component: engine
2017-12-04 22:01:14 -05:00
327b80ad82
Merge pull request #35537 from sargun/vfs-use-copy_file_range
...
Have VFS graphdriver use accelerated in-kernel copy
Upstream-commit: 4047cede65862aa0ea5616297d7c0f3b12526ad4
Component: engine
2017-12-04 19:34:56 -06:00
8a469be8e0
fix golint errors
...
Signed-off-by: Jake Sanders <jsand@google.com >
Upstream-commit: e04375fb8c2f08da158cce21c1591d39d2e68242
Component: engine
2017-12-04 16:44:03 -08:00
cf1d97228e
Merge pull request #65 from seemethere/fix_debian_jessie_aarch64
...
Adds libudev-dev to jessie aarch64 build
Upstream-commit: 6e901d8febcb7c308035952baa760779ab097806
Component: packaging
2017-12-04 16:33:41 -08:00
6ada520445
Update CRIU github repository
...
Signed-off-by: Ross Boucher <rboucher@gmail.com >
Upstream-commit: f01d2029bbee7327b324ee501a97100ad5506fbf
Component: engine
2017-12-04 18:51:08 -05:00
57c8d64422
Adds libudev-dev to jessie aarch64 build
...
Failed out otherwise:
```
---> Making bundle: dynbinary (in bundles/dynbinary)
Building: bundles/dynbinary-daemon/dockerd-17.09.0-dev
Package libudev was not found in the pkg-config search path.
```
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 4d8e8855d1008f4705ea6db17e5cd5bc90bd2d81
Component: packaging
2017-12-04 23:36:16 +00:00
2ee063b98e
CRIU needs a newer version to work with the updates pulled in by containerd 1.0
...
Signed-off-by: Ross Boucher <rboucher@gmail.com >
Upstream-commit: 7ffae3d51a452a63c49f8544953a8b0f9781a5e0
Component: engine
2017-12-04 17:45:04 -05:00
7287b1b196
Merge pull request #64 from seemethere/jenkinsfile_label
...
Change label to one that actually exists
Upstream-commit: 1991b032cb64827c595ad652e6b94b2e49402527
Component: packaging
2017-12-04 13:49:36 -08:00
f28070bdef
Merge pull request #35693 from crosbymichael/ctd-rc0
...
Update containerd to rc0 +
Upstream-commit: 20a42b1f5616b07df524965383528711d24cf6ea
Component: engine
2017-12-04 16:49:29 -05:00
a9ea77004e
Change label to one that actually exists
...
Seems `docker-edge` was removed as label on jenkins.dockerproject.org.
This removes that label and just puts the x86_64 label
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 6765382587e31a93b1e65d2d169b00a42d183ee2
Component: packaging
2017-12-04 21:48:42 +00:00
8d18b0cfab
Merge pull request #704 from albers/completion--platform
...
Add bash completion for `--platform`
Upstream-commit: 83cdc0f1bd
2017-12-04 13:19:37 -08:00
