GordonTheTurtle
14ad0d5267
Merge component 'engine' from git@github.com:moby/moby master
2018-05-11 17:06:01 +00:00
GordonTheTurtle
9bb8e4d94e
Merge component 'cli' from git@github.com:docker/cli master
2018-05-11 16:41:29 +00:00
Sebastiaan van Stijn
790e355196
Merge pull request #1039 from mat007/fix-filepath-usage
...
Use filepath.Base instead of path.Base
Upstream-commit: a6b10c2e85
2018-05-11 18:06:23 +02:00
Sebastiaan van Stijn
0178ff5bea
Merge pull request #37031 from kolyshkin/getmnt
...
Fix daemon.getSourceMount() for /
Upstream-commit: 379845ec20ae651831dcfb0587b95c38a1631a53
Component: engine
2018-05-11 16:39:57 +02:00
Brian Goff
b80e078a6d
Merge pull request #36815 from allencloud/simplify-ode
...
refactor: simplify code to make function getExecConfig more readable
Upstream-commit: 64336838878281549d87b34b19cf2e4b3756e724
Component: engine
2018-05-11 10:06:33 -04:00
Kir Kolyshkin
53eaee8346
daemon.getSourceMount(): fix for / mount point
...
A recent optimization in getSourceMount() made it return an error
in case when the found mount point is "/". This prevented bind-mounted
volumes from working in such cases.
A (rather trivial but adeqate) unit test case is added.
Fixes: 871c957242 ("getSourceMount(): simplify")
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: d8fd6137a1f6d95a2bcdfeb6e1dfa6b816790c5e
Component: engine
2018-05-10 12:53:37 -07:00
GordonTheTurtle
47abb706d5
Merge component 'engine' from git@github.com:moby/moby master
2018-05-10 17:07:42 +00:00
Brian Goff
a5b8cafc29
Merge pull request #37029 from thaJeztah/fix-fluentd-partial
...
Fix fluentd partial detection
Upstream-commit: f4ebcb42ac527b24ab54525d5824478fcd2960c0
Component: engine
2018-05-10 12:51:02 -04:00
GordonTheTurtle
4f70e5df53
Merge component 'cli' from git@github.com:docker/cli master
2018-05-10 16:41:48 +00:00
Sebastiaan van Stijn
5727dc3154
Merge pull request #1047 from eightlimbed/eightlimbed-patch-1
...
fixed typo
Upstream-commit: ab1d49a313
2018-05-10 10:32:07 +02:00
Sebastiaan van Stijn
d10b7a563e
Fix fluentd partial detection
...
The Partial property of the Logger message
was replaced by PLogMetaData, causing the build to fail.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: daaef83cd24f6eb335b77e9d8d692235eff1b201
Component: engine
2018-05-10 01:55:27 +02:00
Sebastiaan van Stijn
0777f5be26
Merge pull request #991 from silvin-lubecki/kubernetes-namespace
...
Better namespace experience with Kubernetes
Upstream-commit: 552ee502f7
2018-05-09 21:18:50 +02:00
Sebastiaan van Stijn
bc1299683c
Merge pull request #36159 from cosmo0920/add-partial-flag-into-record
...
Fluentd Log Driver: Add partial flag into record
Upstream-commit: fff01bc14d96b323ecafb18f8c33c62561677fbb
Component: engine
2018-05-09 21:01:05 +02:00
GordonTheTurtle
32fb3c1d02
Merge component 'engine' from git@github.com:moby/moby master
2018-05-09 17:06:15 +00:00
Mathieu Champlon
ec34094dc5
Fix stack ls behaviour with Kubernetes and variout --namespace flag values
...
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com >
Upstream-commit: 2af66bed41
2018-05-09 17:40:25 +02:00
Silvin Lubecki
818645f8cd
Add --all-namespaces to docker stack ls command on Kubernetes orchestrator, to list all stacks in all namespaces.
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: f097831eb3
2018-05-09 17:33:16 +02:00
Silvin Lubecki
f151bd57f8
Add namespace column for docker stack ls command while targeting Kubernetes orchestrator
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 65526a201f
2018-05-09 17:33:16 +02:00
Silvin Lubecki
3d9a405e51
Move stack client creation from KubeCli to client factory, where it belongs
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 31dccfffb5
2018-05-09 17:30:37 +02:00
Silvin Lubecki
ceea6abb71
Clean useless named imports
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: c23c1482c7
2018-05-09 17:30:36 +02:00
Silvin Lubecki
fd51a4f0df
Fix using the namespace specified in the kubeconfig file.
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: f0aa126b03
2018-05-09 17:30:36 +02:00
Yong Tang
98ae67d006
Merge pull request #37016 from priyawadhwa/buildargs
...
Export BuildArgs type from dockerfile package
Upstream-commit: dfde597fbbb5de4a7559a68980401c8c405aa9af
Component: engine
2018-05-09 05:06:50 -07:00
Priya Wadhwa
d39da73d16
Export BuildArgs
...
Signed-off-by: Priya Wadhwa <priyawadhwa@google.com >
Upstream-commit: 593255ffb07989e416743d4235fef65e75414e6b
Component: engine
2018-05-08 14:57:26 -07:00
Lee Gaines
4785c706cc
fixed typo -- Signed-off-by: Lee Gaines <eightlimbed@gmail.com>
...
Upstream-commit: 9570911807
2018-05-08 14:46:42 -07:00
GordonTheTurtle
ebc7fa7c75
Merge component 'engine' from git@github.com:moby/moby master
2018-05-08 17:07:32 +00:00
GordonTheTurtle
4d422dd853
Merge component 'cli' from git@github.com:docker/cli master
2018-05-08 16:41:46 +00:00
Sebastiaan van Stijn
7f36f33bdc
Merge pull request #818 from selansen/master
...
Allow user to specify default address pools for docker networks
Upstream-commit: c31b61bff4
2018-05-08 14:17:00 +02:00
Yong Tang
82733b4070
Merge pull request #36975 from cpuguy83/bump_go
...
Bump go version to 1.10.2
Upstream-commit: 17b039cb4901fc0a37c409ebfdf4f3b2fcec4409
Component: engine
2018-05-08 03:53:15 +02:00
Yong Tang
64899bb9a0
Merge pull request #36612 from kolyshkin/t-attach
...
TestPostContainersAttach: minor improvements
Upstream-commit: bd5eb6b402524d103b91960cebae38bda7d8da12
Component: engine
2018-05-08 03:26:25 +02:00
Sebastiaan van Stijn
ce7c08e19e
Merge pull request #36803 from adshmh/refactor-network-integration-tests-use-swarm-create-service
...
refactored network integration tests to make use of swarm.CreateService
Upstream-commit: 6d2081481938c6c267f62c6e8b43e5940521cb22
Component: engine
2018-05-08 00:21:32 +02:00
Brian Goff
267d640e44
Bump go version to 1.10.2
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9e5bebb1f58d4085d1b5fc1edb0ece1edd418c15
Component: engine
2018-05-07 14:19:16 -04:00
GordonTheTurtle
e73ed7d7f7
Merge component 'engine' from git@github.com:moby/moby master
2018-05-07 17:06:37 +00:00
Mathieu Champlon
572d6e715f
Use filepath.Base instead of path.Base
...
This ensures Windows paths are handled correctly as explained in the path package documentation.
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com >
Upstream-commit: 698ea75c66
2018-05-07 17:25:23 +02:00
Sebastiaan van Stijn
194bacfc7b
Merge pull request #36921 from cyli/filter-namespaced-labels
...
Warn when reserved-namespace engine labels are configured
Upstream-commit: 57493cd60628ebf6e8b02725f44e1a4ef152a39e
Component: engine
2018-05-07 15:12:52 +02:00
Yong Tang
b38b5ba976
Merge pull request #36977 from cpuguy83/remove_some_contrib
...
Remove some unused contrib items
Upstream-commit: 5f395b35bc600edf38fb17b87a9ac1af612c83a2
Component: engine
2018-05-07 01:15:17 +02:00
Yong Tang
33178b34cb
Merge pull request #36979 from anshulpundir/vndr
...
Bump swarmkit to bd69f6e8e301645afd344913fa1ede53a0a111fb
Upstream-commit: 5848b9eeb02eeb56bf8934faf9e13e73bbdf4ddb
Component: engine
2018-05-06 22:28:46 +02:00
selansen
8f43102f04
Allow user to specify default address pools for docker networks
...
This is separate commit for CLI files to address PR 36054
Signed-off-by: selansen <elango.siva@docker.com >
Upstream-commit: 75c7b95e7a
2018-05-05 19:46:28 -04:00
Brian Goff
ffc8cb8e03
Remove contrib/project-stats.sh
...
This is an old script using tools that are no longer maintained or
recommended (and don't even work anymore).
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: ddb01ee1e05f1b460267eb40070e2a62a1c33692
Component: engine
2018-05-04 16:33:44 -04:00
Brian Goff
8fd57d39c8
Removes custom selinux policies.
...
These are no longer used and instead users should use the
`container-selinux` package on their distribution. Additionally, these
are unmaintained and untested.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: eeea1e37a116c0e3765e2591a2ced936e48b5abb
Component: engine
2018-05-04 16:33:44 -04:00
Brian Goff
57117ab663
Remove unused/unmaintained package builder stuff
...
This is left-over stuff from building Docker pacakges. These aren't
really maintained outside of bumping the golang version, and are never
tested.
These builders can be found at
https://github.com/docker/docker-ce-packaging where they are kept up to
date.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 1b7fe816e86f21a968410fca7a0cb9302c386f84
Component: engine
2018-05-04 16:33:40 -04:00
GordonTheTurtle
0e0adf0eea
Merge component 'engine' from git@github.com:moby/moby master
2018-05-04 17:07:22 +00:00
GordonTheTurtle
ad7b1373ce
Merge component 'cli' from git@github.com:docker/cli master
2018-05-04 16:41:43 +00:00
Sebastiaan van Stijn
f6ee4055fc
Merge pull request #36994 from johnstep/add-windows-recycle-bin-test
...
Add windows recycle bin test and update hcsshim to v0.6.11
Upstream-commit: e2d3bb305258b78beb8e8f97a35d28cc6a75ac3c
Component: engine
2018-05-04 10:49:42 +02:00
John Stephens
9e5bd57003
Add tests related to hcsshim recycle bin skipping
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: 72192f5052667118c2f83282f8f8c3df8cbf514b
Component: engine
2018-05-03 13:37:18 -07:00
John Stephens
e0c153fe7f
Update hcsshim to v0.6.11
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: 1c136d99a0e03b8cf76979652a0edb075ff83889
Component: engine
2018-05-03 13:36:51 -07:00
Sebastiaan van Stijn
5560b1d08e
Merge pull request #36985 from darrenstahlmsft/revendorHcsshim
...
Update hcsshim to v0.6.10
Upstream-commit: e890301e4f84d55c3e045904eb0223c23fd70d19
Component: engine
2018-05-03 22:18:16 +02:00
Tibor Vass
ec16580804
Merge pull request #922 from kolyshkin/man-fixes
...
Man page fixes
Upstream-commit: 0ff5f52051
2018-05-03 07:34:06 -10:00
Kir Kolyshkin
7fc438fe9a
TestPostContainerAttach: minor improvements
...
When this test fails, the error looks like this:
> FAIL: docker_api_attach_test.go:98: DockerSuite.TestPostContainersAttach
> docker_api_attach_test.go:211:
> c.Assert(actualStdout.Bytes(), checker.DeepEquals, []byte("hello\nsuccess"), check.Commentf("Attach didn't return the expected data from stdout"))
> ... obtained []uint8 = []byte{0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73}
> ... expected []uint8 = []byte{0x68, 0x65, 0x6c, 0x6c, 0x6f, 0xa, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73}
> ... Attach didn't return the expected data from stdout
Let's use strings for comparisons to make the output more readable.
While at it,
- get the container's stderr as well, and make sure it's empty;
- check that stdcopy.StdCopy() did not return an error, except for
the timeout which is expected;
- move/remove comments, simplify var names.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: ecc54889c9a233d558b578dfd48eb5d84506a62a
Component: engine
2018-05-03 10:15:48 -07:00
GordonTheTurtle
9bc9d40087
Merge component 'engine' from git@github.com:moby/moby master
2018-05-03 17:07:17 +00:00
GordonTheTurtle
1b30fa4e80
Merge component 'cli' from git@github.com:docker/cli master
2018-05-03 16:41:44 +00:00
Vincent Demeester
61575cffdb
Merge pull request #36906 from novas0x2a/bump-distribution
...
Bump docker/distribution to 83389a148052d74ac602f5f1d62f86ff2f3c4aa5
Upstream-commit: 185ae7eedcb61d7926365e7d64504d6480855e5d
Component: engine
2018-05-03 15:33:18 +02:00
GordonTheTurtle
Sebastiaan van Stijn
Brian Goff
Kir Kolyshkin
Sebastiaan van Stijn
Mathieu Champlon
Silvin Lubecki
Yong Tang
Priya Wadhwa
Lee Gaines
selansen
John Stephens
Tibor Vass
Vincent Demeester