ee263ca445
Merge component 'engine' from git@github.com:moby/moby master
2017-12-09 17:04:56 +00:00
1305053a0b
Merge pull request #35738 from thaJeztah/bump-api-version
...
Bump API version to 1.36
Upstream-commit: 3b14e5980ef681c47faf128b5c23cb972fd8851d
Component: engine
2017-12-08 22:18:24 -08:00
443795270f
Merge pull request #35745 from cpuguy83/fix_test_sleep
...
Remove uneeded sleep in test bash loop
Upstream-commit: 967224c254884d6659ad7ec66bdd9da1b4c7d49f
Component: engine
2017-12-08 14:24:05 -06:00
6f58b7f1de
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-12-08 17:04:13 +00:00
16d5b20e33
Merge component 'engine' from git@github.com:moby/moby master
2017-12-08 17:04:08 +00:00
6fdef05177
Merge component 'cli' from git@github.com:docker/cli master
2017-12-08 16:41:35 +00:00
27e78af99a
Merge pull request #35567 from huangyanhong/hyhdocker
...
modify log in order to be same below
Upstream-commit: c7256dc38ed8fe5a428c85002a674c19754d8dd3
Component: engine
2017-12-08 16:30:51 +01:00
141bc0558d
Remove uneeded sleep in test bash loop
...
This sleep probably doesn't work because sleep typically takes only
whole numbers, to do < 1s you need to use usleep. It also is not really
needed as the loop has a very low bound that will not eat up too much
CPU.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: ee594dcb7d42f95048c9047d86c61447243db3cd
Component: engine
2017-12-08 09:25:55 -05:00
04040622fb
Merge pull request #741 from thaJeztah/bump-version
...
Bump version to 18.01-dev
Upstream-commit: 29d3510d50
2017-12-08 09:04:04 +01:00
7b0f6565c5
Merge pull request #35720 from ripcurld0/weboscket_debug
...
Add a debug message when client closes websocket attach connection
Upstream-commit: 9f5540f672e618667a8a3f185193232cc4d52617
Component: engine
2017-12-07 16:53:56 -08:00
376d2e9872
Do not terminate on missing build-ids ( #68 )
...
Do not terminate on missing build-ids
Upstream-commit: 8457a25900698f1bdef844c22fb19900de1a5bc7
Component: packaging
2017-12-07 16:11:20 -08:00
6edf75f3d5
Do not terminate on missing build-ids
...
Relates to an upgrade in `rpm` to `14.4.0`, where missing build-ids now
cause builds to self-terminate. May be needed in other distros if/when
the `rpm` package is updated in those repos.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: dcd681da54f2c2b2286cc09d053dd6cb865d3f98
Component: packaging
2017-12-07 23:56:30 +00:00
782ef5e9db
Merge pull request #35680 from javabrett/docs-contributing
...
Changed go vendor from moby/moby to docker/docker in dev docs.
Upstream-commit: 8fe0a759f72442d7582c4453e6306822c53224bf
Component: engine
2017-12-07 15:04:28 -08:00
fd25684fc8
Defaults Makefile VERSION variable to 0.0.0-dev ( #67 )
...
When building we should default to a dummy version unless otherwise
specified so we don't get ourselves confused over what is official and
what is not.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: ffcd040b5c3bd4f81e1d1f11c32f9bb81e235ed1
Component: packaging
2017-12-07 14:25:41 -08:00
c3b54b0b2b
Bump version to 18.01-dev
...
The 17.12.0-rc1 release was cut-off from commit
ace5417954github@gone.nl >
Upstream-commit: c4875264a3
2017-12-07 13:58:06 -08:00
17ee87b9ed
Bump API version to 1.36
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c1e982f2ee85580687e2d355af3ca444ada14d01
Component: engine
2017-12-07 13:52:49 -08:00
4ef94db1ce
Merge pull request #35724 from thaJeztah/update-api-changelog
...
Update API version-history for 1.35
Upstream-commit: 1056d554c5da5d959b551f32ba34a3e2cffd61b2
Component: engine
2017-12-07 09:35:01 -08:00
90f62259ac
Merge pull request #35733 from mlaventure/update-mlaventure-details
...
Update mlaventure email
Upstream-commit: 268226e5461991ed12a5a02d8c5fdd25b120eab0
Component: engine
2017-12-07 09:33:46 -08:00
4343c7deaa
Merge component 'engine' from git@github.com:moby/moby master
2017-12-07 17:04:36 +00:00
43ace3ab68
Update mlaventure email
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 2ba8ce708727578752d9838d9c4db945cd008792
Component: engine
2017-12-07 08:41:20 -08:00
6a7f05996f
Merge pull request #35728 from tonistiigi/vendor-archive
...
vendor: update archive/tar
Upstream-commit: 72a37709ade3de1091d208d24ddab0e1168aa5d3
Component: engine
2017-12-06 20:50:27 -08:00
090ce73a5d
Changed go vendor from moby/moby to docker/docker in dev docs.
...
If there is a package-rename forthcoming, it isn't currently evident on master, but seems to show in doc.
Changed doc to show actual docker/docker paths as they occur now instead of moby/moby.
Signed-off-by: Brett Randall <javabrett@gmail.com >
Upstream-commit: 355cf9483c1b8ede5ae3ed50add4de2a69d62645
Component: engine
2017-12-07 14:06:24 +11:00
704b884e52
Merge component 'engine' from git@github.com:moby/moby master
2017-12-07 02:18:48 +00:00
74dc65818c
vendor: update archive/tar
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 13954b0a6282d919c91626a23967377c19ee7aa2
Component: engine
2017-12-06 18:02:45 -08:00
521d1c4f0b
Merge component 'cli' from git@github.com:docker/cli master
2017-12-07 01:55:54 +00:00
9b5e4afbf7
Merge pull request #35698 from anshulpundir/vndr
...
Vendor swarmkit to 4429c763
Upstream-commit: a023a599913439f0a08adffc3f242ce187fd8bdd
Component: engine
2017-12-06 17:53:46 -08:00
c6d5cb9ce0
Merge pull request #35589 from keloyang/close-fd
...
Close pipe in chrootarchive.invokeUnpack when cmd.Start()/json.NewEncoder failed
Upstream-commit: cefb33700cf0931a6e3f9ea2cb0a122148d10e49
Component: engine
2017-12-06 17:48:02 -08: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
96784302eb
Merge pull request #35705 from tiborvass/platform-version
...
api: generalize version information to any platform component
Upstream-commit: a1be987ea9e03e5ebdb1b415a7acdd8d6f0aaa08
Component: engine
2017-12-06 16:43:38 -08:00
6046d5cbe8
Merge pull request #35677 from fcrisciani/netdb-debug-tool
...
Netdb debug tool
Upstream-commit: 58dec54d1ffef1ac989399acf3b8e107aa55c2a2
Component: engine
2017-12-06 16:30:11 -08: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
9b7822f4af
Update API version-history for 1.35
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8a9d926b553345be530ddc51374c9817fcbea784
Component: engine
2017-12-06 15:02:10 -08:00
00a55a319d
Fix windows
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: cb8283a6e95f33a93fab0044ca4306cf468faf8c
Component: engine
2017-12-06 23:23:55 +01:00
947ed56f66
Adjust swagger definitions
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 87ebfa11f66d2109054ad3024217a5101b45aa8c
Component: engine
2017-12-06 23:23:55 +01:00
3916dafe17
api: generalize version information to any platform component
...
This change adds a Platform struct with a Name field and a general
Components field to the Version API type. This will allow API
consumers to show version information for the whole platform and
it will allow API providers to set the versions for the various
components of the platform.
All changes here are backwards compatible.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 9152e63290e4a4e586b811cce39082efc649b912
Component: engine
2017-12-06 23:23:55 +01:00
e8e8613267
Merge pull request #35514 from thaJeztah/disable-overlay-without-d_type
...
Remove support for overlay/overlay2 without d_type
Upstream-commit: bd8a9c25ee257384ca24cf32e61b6b0ef71f521d
Component: engine
2017-12-06 14:13:58 -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
7661258841
Merge pull request #35721 from dnephin/fix-swagger-spec-errors
...
Fix codegen problems in swagger spec
Upstream-commit: 7f4cf43637067d27a1035d4ff412710ead82bbab
Component: engine
2017-12-06 13:36:52 -08: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
02ebcae82d
Merge pull request #35146 from masaeedu/27919-removemultitypes
...
Change multi-type parameters to single type
Upstream-commit: 7db57f7fcac33583403d1d4ccf52b1c27f7e0ad1
Component: engine
2017-12-06 16:22:17 -05:00
da56fc4967
Vendoring netlink library
...
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 2e75d329773920713e63049ad1a00dfb64abf3c0
Component: engine
2017-12-06 13:19:57 -08:00
8afbe15ccf
Vendoring of libnetwork
...
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: c1e1fb6fa5204bb7014ca9ebab9fe1804c1eb957
Component: engine
2017-12-06 13:19:56 -08:00
4d38282082
Add option to enable networkDB debug
...
Add a new configuration option to allow the enabling
of the networkDB debug. The option is only parsed using the
reload event. This will protect the daemon on start or restart
if the option is left behind in the config file
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: a97e45794ea8318a08daf763a5b63b04184a886b
Component: engine
2017-12-06 13:19:47 -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
a505f09c7f
Validate/sanitize swarmkit spec name.
...
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com >
Upstream-commit: 739c4cc6b2bab5c3e27656e0a95d858901ecf6b4
Component: engine
2017-12-06 11:55:04 -08:00
