414f8b2aa4
Merge component 'engine' from git@github.com:moby/moby master
2018-01-06 17:06:58 +00:00
ecf8d36483
Merge component 'cli' from git@github.com:docker/cli master
2018-01-06 16:41:31 +00:00
5fe06b3e89
Merge pull request #35033 from chchliang/viservice
...
Add `namespace method` conver in `TestV1IDService`
Upstream-commit: c6378920e14638cc281c5513a989fdff82562426
Component: engine
2018-01-06 14:37:48 +01:00
d0f281be92
docker load supports tar and tar.gz files
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: ac7a5650f0
Component: cli
2018-01-05 20:33:31 -08:00
e6a8744081
Merge pull request #785 from friism/make-config-wording-more-consistent
...
use 'config' over 'configuration file'
Upstream-commit: a60bdf3bc8
Component: cli
2018-01-05 22:26:48 +01:00
1bed718e52
use 'config' over 'configuration file'
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: 99e3b4cd93
Component: cli
2018-01-05 13:19:53 -08:00
9c4ef1072a
Merge pull request #35509 from cpuguy83/splunk_dont_readall
...
Splunk: limit the reader size on error responses
Upstream-commit: 39faf2a3a83c4abad8ed8030a9b942bbb2978359
Component: engine
2018-01-05 12:34:35 -08:00
233f49e086
Merge pull request #35570 from zemanlx/feature/journald-with-SYSLOG_IDENTIFIER
...
Add journald tag as SYSLOG_IDENTIFIER
Upstream-commit: d80c13a54114de602c8b75030e3ec9c2cde9575b
Component: engine
2018-01-05 20:56:55 +01:00
656c1163c8
add namespace method conver
...
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn >
Upstream-commit: 0446b6a04edaae1bddeb1dfdb82fd0d931fe1198
Component: engine
2018-01-05 16:24:18 +08:00
3887b15050
Merge pull request #35925 from Microsoft/jjh/builder-default-rw-size-bump
...
Windows: Bump RW layer size
Upstream-commit: fff423289965260c0ca83024059aa30999792c4a
Component: engine
2018-01-04 22:54:38 -08:00
e76ddf0d7b
Merge pull request #35737 from tonistiigi/fix-git-submodules
...
gitutils: fix checking out submodules
Upstream-commit: 50ce54645094a5d337e5d841c037663e9f4e3170
Component: engine
2018-01-05 10:41:04 +08:00
ad4db68af2
Merge pull request #35753 from kolyshkin/netgo
...
install-containerd-static: use netgo buildtag
Upstream-commit: 51ccedda52413eef2cd4ba8e3948c84501210f3d
Component: engine
2018-01-05 09:05:46 +08:00
40052b6ec6
Document EXPOSE UDP syntax
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: db572ec4ab
Component: cli
2018-01-04 16:16:06 -08:00
0c06f43df3
Merge component 'engine' from git@github.com:moby/moby master
2018-01-04 17:06:40 +00:00
1fbbb4c59b
Merge pull request #35924 from Microsoft/32838-partial-fix
...
Vendor Microsoft/hcsshim @ v0.6.8
Upstream-commit: 4459775eeaa0a3239866fe091014eb1e707bdc2c
Component: engine
2018-01-04 17:49:17 +01:00
c30ceea721
Merge component 'cli' from git@github.com:docker/cli master
2018-01-04 16:41:22 +00:00
8322194c96
Merge pull request #781 from thaJeztah/fix-autogenerated-formatting
...
Fix gofmt for auto-generated k8s code
Upstream-commit: 220c50abc1
Component: cli
2018-01-04 11:23:32 -05:00
e4754a59e3
Correct table html with close tag for </thead>
...
Signed-off-by: Kat Samperi <kat.samperi@gmail.com >
Upstream-commit: 57372d18ca
Component: cli
2018-01-04 15:01:28 +00:00
fb52c2003b
Windows: Bump RW layer size
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: deb335d04fd47e96fdb7b342dece513174b574bd
Component: engine
2018-01-03 15:59:06 -08:00
39c64668e4
Fix gofmt for auto-generated k8s code
...
This code kept being modified by my IDE, so fixing
the formatting.
This is auto-generated code, but the code to generate
is not in this repository, so this is a temporary fix
until the code-generation upstream is fixed :)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bb01064691
Component: cli
2018-01-03 23:57:23 +01:00
fa87c342b2
Vendor Microsoft/hcsshim @ v0.6.8
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 172a442c27ed35778662980809824fdf15a722a6
Component: engine
2018-01-03 10:19:05 -08:00
6f3ae5f1f6
Merge pull request #35772 from arm64b/multi-arch-manifest-support
...
Download support of images with multi-arch manifest
Upstream-commit: fda904911d87a2b36e6fdcc048726bb6b593d944
Component: engine
2018-01-03 19:03:33 +01:00
da47568e0d
Merge component 'engine' from git@github.com:moby/moby master
2018-01-03 17:04:20 +00:00
e2368ae63b
Merge component 'cli' from git@github.com:docker/cli master
2018-01-03 16:41:08 +00:00
707c5a8bd6
Merge pull request #35694 from boucher/checkpoint-dir-fix
...
Don't append the container id to custom directory checkpoints.
Upstream-commit: f72b180ae1f638b878edfbae1b7030f454bb5624
Component: engine
2018-01-03 11:22:21 -05:00
9f589817fd
Merge pull request #721 from silvin-lubecki/kube
...
Add kubernetes support to docker/cli
Upstream-commit: e708c900f8
Component: cli
2018-01-03 17:20:43 +01:00
17341a3ddc
Check and return error while creating kubernetes secret and config maps.
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 18c44e0829
Component: cli
2018-01-03 15:46:19 +01:00
01e7ddaec8
Merge pull request #35822 from keyolk/35709-fix-docker-build-overlayfs-whiteout
...
skip container ID remapping, if the file is overlayfs whiteout.
Upstream-commit: 99c22b0034605d283d9ddcfc72b1f450d130c976
Component: engine
2018-01-03 22:21:00 +08:00
3e3e540e8d
Fix PR comments
...
- More strict on orchestrator flag
- Make orchestrator flag more explicit as experimental
- Add experimentalCLI annotation on kubernetes flags
- Better kubeconfig error message
- Prefix service name with stackname in ps and services stack subcommands
- Fix yaml documentation
- Fix code coverage ignoring generated code
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: f1b116179f
Component: cli
2018-01-03 10:23:32 +01:00
2bb414da6f
skip container ID remapping, if the file is overlayfs whiteout.
...
Signed-off-by: Chanhun Jeong <chanhun.jeong@navercorp.com >
Upstream-commit: b013c1541d3b58f736bc79269aa88d3bfacda6ea
Component: engine
2018-01-03 17:06:59 +09:00
257633843b
Fix description of filter flag in prune commands
...
The "-f" flag is an alias for --force, not --filter (as correctly stated at the top of each documents). The system_prune.md didn't have this error.
Signed-off-by: Mateusz Major <apkd@users.noreply.github.com >
Upstream-commit: 8b07518458
Component: cli
2018-01-02 19:40:23 +01:00
bcb9583e82
Merge pull request #773 from thaJeztah/add-authors
...
Add AUTHORS file and script
Upstream-commit: ae4af7ec32
Component: cli
2018-01-02 18:07:06 +01:00
ce67d6e9b7
Merge component 'engine' from git@github.com:moby/moby master
2018-01-02 17:03:59 +00:00
4360eb4024
Merge component 'cli' from git@github.com:docker/cli master
2018-01-02 16:41:04 +00:00
f8a7c9aa17
Add AUTHORS file and script
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 02e7b18fde
Component: cli
2018-01-02 17:00:22 +01:00
7cbef79c0e
Merge pull request #772 from muicoder/patch-1
...
Fix bash completion for "docker swarm"
Upstream-commit: b0efaaeb8b
Component: cli
2018-01-02 15:14:58 +01:00
49ff2398e6
Merge pull request #35840 from kolyshkin/misc-test
...
Misc test improvements
Upstream-commit: c345c53859a7197deb4722ad4ca5c4a45fab7074
Component: engine
2018-01-02 09:14:20 -05:00
3b99478053
Merge pull request #35895 from javabrett/docs-contributing-moby-docker-paths
...
Fixed in-container paths in dev doc: moby/moby -> docker/docker.
Upstream-commit: 30c9cb1ead17e861ad666a25116da64e89dc8594
Component: engine
2018-01-02 13:30:19 +01:00
8e9edf70c7
Cleanup and sort .mailmap
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 63c86ad2eade7d0d5128100a6eb1d5cac245adbc
Component: engine
2018-01-02 12:48:14 +01:00
5b7cd70f03
Update mailmap and authors
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2df19b7c11349b961455b1c75b655a5f017dd7a4
Component: engine
2018-01-02 12:47:47 +01:00
6635d18f37
Merge pull request #35896 from thaJeztah/fix-namespace-filtering
...
Fix event filter filtering on "or"
Upstream-commit: 431d3d6756f69a84d23ef45186082be1ed93c151
Component: engine
2018-01-02 12:04:32 +08:00
fa250e5c10
Merge pull request #35833 from thaJeztah/fix-mount-creation-on-start
...
Re-validate Mounts on container start
Upstream-commit: 9d9992b314933b9d93d3ac117b3f8146b9295277
Component: engine
2018-01-02 12:01:58 +08:00
ae19592ca8
Fix bash completion for "docker swarm"
...
Signed-off-by: muicoder <muicoder@gmail.com >
Upstream-commit: e2f73bb4b7
Component: cli
2018-01-01 12:58:16 +08:00
6aa9598694
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-12-29 17:17:28 +00:00
25c9e80a84
Merge component 'engine' from git@github.com:moby/moby master
2017-12-29 17:17:22 +00:00
cfc9623c01
Fixed typo DEREPCATED -> DEPRECATED.
...
Signed-off-by: Brett Randall <javabrett@gmail.com >
Upstream-commit: 3b80d5789959b790e8f45c984414cc4d2552417b
Component: engine
2017-12-29 06:39:09 -05:00
4b57d7f1d3
Fix event filter filtering on "or"
...
The event filter used two separate filter-conditions for
"namespace" and "topic". As a result, both events matching
"topic" and events matching "namespace" were subscribed to,
causing events to be handled both by the "plugin" client, and
"container" client.
This patch rewrites the filter to match only if both namespace
and topic match.
Thanks to Stephen Day for providing the correct filter :)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 295bb09184fe473933498bb0efb59b8acb124f55
Component: engine
2017-12-29 02:47:56 +01:00
31e8b1c077
Fixed in-container paths in dev doc: moby/moby -> docker/docker.
...
Further to 355cf9483c1b8ede5ae3ed50add4de2a69d62645 which caught some
of these. This should fix the remainder in the contributing docs.
Signed-off-by: Brett Randall <javabrett@gmail.com >
Upstream-commit: e96b33665e58f73a16923b89a9bcc6fe6fcdb6c6
Component: engine
2017-12-28 20:22:02 -05:00
f1638ade2e
Merge pull request #35674 from kolyshkin/zfs-rmdir
...
zfs: fix ebusy on umount etc
Upstream-commit: daded8da9178ec097e59a6b0b2bf12754b5472d8
Component: engine
2017-12-28 15:35:19 -08:00
8befd2d809
TestImportExtremelyLargeImageWorks: optimize DevZero
...
According to https://github.com/golang/go/issues/5373 , go recognizes
(and optimizes for) the following syntax:
```go
for i := range b {
b[i] = 0
}
```
so let's use it. Limited testing shows ~7.5x speed increase,
compared to the previously used syntax.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: f0cab0e28512de5eecc0412212425cc74d62af71
Component: engine
2017-12-28 13:08:41 -08:00