Silvin Lubecki
2ff7c2ca43
Add an orchestrator column in the docker stack ls command
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 13d0c9c695
Component: cli
2018-04-30 12:04:02 +02:00
Sebastiaan van Stijn
28528acdcb
Merge pull request #903 from silvin-lubecki/add-warnings-client-side
...
Add warnings client side before deployment on Kubernetes
Upstream-commit: 8963ab993e
Component: cli
2018-04-30 12:01:55 +02:00
Sebastiaan van Stijn
a0405be5c0
Merge pull request #36918 from Sh4d1/master
...
add verification to check if escapeKeys have elements (pkg/term/proxy.go)
Upstream-commit: d4e48af48d1a2d7427ccd9f950cf6bc6ff5682b6
Component: engine
2018-04-30 11:57:21 +02:00
Silvin Lubecki
d432dda560
Print warnings on stderr for each unsupported features while parsing a compose file for deployment on Kubernetes.
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 36591a2282
Component: cli
2018-04-30 11:56:14 +02:00
Sebastiaan van Stijn
1af050dad4
Merge pull request #899 from silvin-lubecki/handle-multiple-stack-api-versions
...
Handle multiple stack api versions
Upstream-commit: 7ad30360c8
Component: cli
2018-04-30 11:33:04 +02:00
Silvin Lubecki
de5526bad9
Add a common interface between different Kubernetes Stack API versions and use it in kubernetes stack commands
...
* Add kubernetes Stack API v1beta2 client
* Upgrade v1beta1 client to remove generated code
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: f958c66a6d
Component: cli
2018-04-30 11:27:22 +02:00
Patrik Cyvoct
48f4272c53
Add verification and test to check if escapeKeys is not empty
...
In pkg/term/proxy.go and pkg/term/proxy_test.go, check if escapeKeys is empty and if it is, return the one key read
Signed-off-by: Patrik Cyvoct <patrik@ptrk.io >
Upstream-commit: d339130f307634a0edd6aef29b6934c3934e9ba2
Component: engine
2018-04-30 00:32:43 +02:00
Nico Stapelbroek
340f40eb39
Add exec_die to the list of known container events
...
Signed-off-by: Nico Stapelbroek <nstapelbroek@gmail.com >
Upstream-commit: 4d91812b88
Component: cli
2018-04-29 14:52:08 +02:00
GordonTheTurtle
a774d0458e
Merge component 'engine' from git@github.com:moby/moby master
2018-04-28 17:06:52 +00:00
Daniel Hiltgen
240bba4fdb
Export pull as a public function
...
It will be helpful to expose the pull implementation which supports
pulling private images for other CLI commands that rely on helper images.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 812f113685
Component: cli
2018-04-27 12:21:19 -07:00
Cody Roseborough
257c410f05
Allow awslogs to use non-blocking mode
...
When then non-blocking mode is specified, awslogs will:
- No longer potentially block calls to logstream.Log(), instead will
return an error if the awslogs buffer is full. This has the effect of
dropping log messages sent to awslogs.Log() that are made while the
buffer is full.
- Wait to initialize the log stream until the first Log() call instead of in
New(). This has the effect of allowing the container to start in
the case where Cloudwatch Logs is unreachable.
Both of these changes require the --log-opt mode=non-blocking to be
explicitly set and do not modify the default behavior.
Signed-off-by: Cody Roseborough <crrosebo@amazon.com >
Upstream-commit: c7e379988c9cd6ec0af528e6f59eea3c51b36738
Component: engine
2018-04-27 17:59:03 +00:00
Tibor Vass
904bb15bee
Merge pull request #36944 from vdemeester/fix-e2e-run
...
Skip some test on remote daemon for e2e run(s)
Upstream-commit: 765a9f31adb5f9eef197aa7863717a4d8a743122
Component: engine
2018-04-27 05:03:12 -10:00
Sebastiaan van Stijn
0163dbc12b
Merge pull request #36816 from arm64b/using-parent-img-arch4dockerbuilder
...
Dockerbuilder: use the arch info from base image
Upstream-commit: fef1a5ea809976d0d3d2160f3e0a4459e6482763
Component: engine
2018-04-26 20:06:40 +02:00
GordonTheTurtle
fd1a47eb04
Merge component 'engine' from git@github.com:moby/moby master
2018-04-26 17:07:28 +00:00
GordonTheTurtle
5bc18aa45a
Merge component 'cli' from git@github.com:docker/cli master
2018-04-26 16:43:04 +00:00
Vincent Demeester
7dc2c5606a
Skip some test on remote daemon for e2e run(s)
...
We really need to run those on the CI too at some point.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: ef2c2040c22eba8ab6ea1033ad64ba9b0095db9b
Component: engine
2018-04-26 16:25:52 +00:00
Yong Tang
5c73eabe12
Merge pull request #36946 from thaJeztah/bump-tini-0.18.0
...
Bump tini to v0.18.0
Upstream-commit: b87bda893b48edcda2de38547216bcb480dba7fe
Component: engine
2018-04-25 19:47:08 -07:00
Brian Goff
c783effbb0
Merge pull request #1017 from thaJeztah/warn-when-using-host-ip
...
Warn when using host-ip for published ports
Upstream-commit: 99bd7ed693
Component: cli
2018-04-25 17:09:42 -04:00
GordonTheTurtle
368f147a3d
Bump version to 18.06.0-ce-dev
...
Signed-off-by: GordonTheTurtle <engine-team@docker.com >
2018-04-25 20:10:32 +00:00
Sebastiaan van Stijn
256deb9131
Merge pull request #36924 from runcom/fix-created-rp
...
restartmanager: do not apply restart policy on created containers
Upstream-commit: 18bfe3c12838ccec3d6a749f6d71355c1daed164
Component: engine
2018-04-25 21:48:01 +02:00
Brian Goff
babda0d318
Merge pull request #36905 from thaJeztah/bump-swarmkit
...
Bump SwarmKit to remove deprecated grpc metadata wrappers
Upstream-commit: 28f373603cd998d885deb2384de75a3c8e7a3a72
Component: engine
2018-04-25 14:34:17 -04:00
GordonTheTurtle
2771210b85
Merge component 'engine' from git@github.com:moby/moby master
2018-04-25 17:06:30 +00:00
Sebastiaan van Stijn
b18061da61
Bump tini to v0.18.0
...
This bumps the version of tini used to fec3683b971d9c3ef73f284f176672c44b448662 (v0.18.0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b711dd94fdad0ef8e2c9b2ebbe6d903d270752de
Component: engine
2018-04-25 17:50:56 +02:00
Essam A. Hassan
08243ac4d3
testing config/secrets are showing in pretty print
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com >
Upstream-commit: 8238644796
Component: cli
2018-04-25 17:22:18 +02:00
Essam A. Hassan
9193280536
add config and secret to service in inspect test
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com >
Upstream-commit: 2b1f27ea5e
Component: cli
2018-04-25 17:22:18 +02:00
Essam A. Hassan
8531403103
adding configs/secrets to service inspect pretty
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com >
Upstream-commit: 3ae2d4b24c
Component: cli
2018-04-25 17:21:31 +02:00
Sebastiaan van Stijn
c1ef5d203f
Merge pull request #36935 from cpuguy83/volume_tests_no_root
...
Fix issues with running volume tests as non-root.
Upstream-commit: 1a57535aa277e0f2a3c1922c736551148c5b4351
Component: engine
2018-04-25 00:45:14 +02:00
Christy Norman
89facafb80
specify specific permissions
...
When creating manifest lists, don't use "*" as the permission when
creating the token handler. This causes problems with gitlab's repos.
Fixes https://github.com/docker/cli/issues/1010
Signed-off-by: Christy Norman <christy@linux.vnet.ibm.com >
Upstream-commit: c26e2264fb
Component: cli
2018-04-24 17:01:57 -05:00
cyli
d865a73a75
Filter engine labels to exclude com.docker.*, io.docker.*, and org.dockerproject.*
...
labels as per https://docs.docker.com/config/labels-custom-metadata/ .
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: d1d7bcd6d73516af5ae70c01bf08a0f73ad87743
Component: engine
2018-04-24 11:42:09 -07:00
Anusha Ragunathan
153889840e
Merge pull request #36599 from Microsoft/jjh/dockersave
...
LCOW: Implement `docker save`
Upstream-commit: 65c575f592a247b3dd0d10dd707f1bbf3d459ae1
Component: engine
2018-04-24 11:14:32 -07:00
GordonTheTurtle
605ac64b66
Merge component 'engine' from git@github.com:moby/moby master
2018-04-24 17:05:23 +00:00
GordonTheTurtle
137f840bfb
Merge component 'cli' from git@github.com:docker/cli master
2018-04-24 16:41:18 +00:00
Sebastiaan van Stijn
b6d97e109a
Merge pull request #1022 from silvin-lubecki/clean-manifest-documentation
...
Cleaning some manifest documentation typos
Upstream-commit: 4970824bea
Component: cli
2018-04-24 17:07:14 +02:00
Brian Goff
9edbbd0436
Fix issues with running volume tests as non-root.
...
- Volume store created dir with wrong permissions
- Local volume driver hardcoded uid/gid 0
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d15734ec3c10eda667b716f67e18d5d86e708e3e
Component: engine
2018-04-24 10:26:10 -04:00
Silvin Lubecki
e92b784d10
Cleaning some manifest documentation typos
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 55c5e7aa88
Component: cli
2018-04-24 15:00:39 +02:00
Antonio Murdaca
e77630ac6d
restartmanager: do not apply restart policy on created containers
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 75d3214934b397692a2765ef6fd8ce086044831b
Component: engine
2018-04-24 11:41:09 +02:00
Sebastiaan van Stijn
ca53f02db1
Merge pull request #36904 from kolyshkin/context
...
Switch from x/net/context -> context
Upstream-commit: 53683bd8326b988977650337ee43b281d2830076
Component: engine
2018-04-24 08:49:12 +02:00
Kir Kolyshkin
e3af8e0774
Switch from x/net/context -> context
...
Since Go 1.7, context is a standard package. Since Go 1.9, everything
that is provided by "x/net/context" is a couple of type aliases to
types in "context".
Many vendored packages still use x/net/context, so vendor entry remains
for now.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 7d62e40f7e4f3c17d229a7687d6fcca5448de813
Component: engine
2018-04-23 13:52:44 -07:00
Yong Tang
5a3297f67b
Merge pull request #36913 from vdemeester/test-skip-non-root
...
Skip some tests requires root uid when run as user…
Upstream-commit: 5c233cf4315747785b27d4b0f0631d220556205f
Component: engine
2018-04-23 11:42:42 -07:00
Sebastiaan van Stijn
4521f88522
Merge pull request #36920 from kolyshkin/cancel-func
...
context.WithTimeout: do call the cancel func
Upstream-commit: 20b524bf2e91466e00cd5fadd87e9d49f8cb8cb3
Component: engine
2018-04-23 20:14:25 +02:00
Sebastiaan van Stijn
fa72c71f39
Merge pull request #36927 from wdhif/patch-1
...
Fix version mismatch in API the documentation
Upstream-commit: 3dd4be9d8975557f84d0afe5edd90183fc092717
Component: engine
2018-04-23 19:40:57 +02:00
Wassim Dhif
3e4ba6ca0d
Fix version mismatch in API documentation
...
Fix a version mismatch in the API documentation.
Signed-off-by: Wassim DHIF <wassimdhif@gmail.com >
Upstream-commit: 2058928edc284653b1fb8e719d713ac7edecd091
Component: engine
2018-04-23 18:57:35 +02:00
GordonTheTurtle
8b92797789
Merge component 'cli' from git@github.com:docker/cli master
2018-04-23 16:41:30 +00:00
Brian Goff
ecd0192857
Merge pull request #1020 from vdemeester/todo-tada
...
Handle some TODOs in tests
Upstream-commit: c889ea1bca
Component: cli
2018-04-23 09:33:41 -04:00
Vincent Demeester
637cb9eba9
Remove more TODOs
...
- Some of them don't make sense anymore
- Some are deprecated and removed from the engine since a few versions
already.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 740d260cd2
Component: cli
2018-04-23 14:57:29 +02:00
Vincent Demeester
4485bdeb14
Remote FIXME(s) in vendor.conf
...
It's coming from dependencies, doesn't make sense here
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 58173b3c69
Component: cli
2018-04-23 14:14:45 +02:00
Vincent Demeester
afba3f7a60
Handle some TODOs in tests
...
Use more gotestyourself for `env.Patch`, and `icmd.RunCommand`
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: ae03dd7f46
Component: cli
2018-04-23 14:13:52 +02:00
Silvin
32854cab39
Merge pull request #1011 from vdemeester/mark-test-helpers
...
Make testing helpers as such…
Upstream-commit: c790f387e1
Component: cli
2018-04-23 11:20:12 +02:00
Vincent Demeester
7f23cb8c8b
Skip some tests requires root uid when run as user
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a7999aaa536818085ec8a23901ef64637587b7e4
Component: engine
2018-04-23 10:14:39 +02:00
Vincent Demeester
4a3d7068f3
Fix typo in idtools tests
...
It should check `os.Geteuid` with `uid` instead of `os.Getegid`.
On the container (where the tests run), the uid and gid seems to be
the same, thus this doesn't fail.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5d8b88b114da7c40f04a95909a35287ae1dac37f
Component: engine
2018-04-23 10:14:07 +02:00