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
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
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
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
GordonTheTurtle
cc37c2e09b
Merge component 'engine' from git@github.com:moby/moby master
2018-04-22 17:06:07 +00:00
Yong Tang
0be67a18e5
Merge pull request #36922 from yongtang/04212018-restart_test.go
...
Some improvement in restart_test.go
Upstream-commit: 57142e89befe90977da6dce7762f9fcc70f28da1
Component: engine
2018-04-22 09:34:14 -07:00
Sebastiaan van Stijn
13669fec1f
Warn when using host-ip for published ports
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 363335ec9b
Component: cli
2018-04-21 12:49:47 -07:00
Yong Tang
e52c8b0018
Some improvement in restart_test.go
...
This fix consists of some improvement in restart_test.go
by replacing Fatal with assert, so that they are consistent
with other tests in integration/container.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 67535921b32f68863f7a882d2300b59e0bbeffa4
Component: engine
2018-04-21 19:42:20 +00:00
GordonTheTurtle
9c80391a08
Merge component 'engine' from git@github.com:moby/moby master
2018-04-21 17:13:27 +00:00
Vincent Demeester
554b5427fa
Merge pull request #36091 from kolyshkin/mount
...
pkg/mount improvements
Upstream-commit: 53982e3fc1642f2605189cea48bc6de7b9318611
Component: engine
2018-04-21 11:03:54 +02:00
Sebastiaan van Stijn
73e14f67f8
Merge pull request #36879 from cpuguy83/extra_unmount_check
...
Extra check before unmounting on shutdown
Upstream-commit: cf9c48bb3ecf47ed56a4b7b466eda577913f838e
Component: engine
2018-04-20 17:08:11 -07:00
Brian Goff
97f152d2c1
Merge pull request #36912 from vdemeester/api-no-daemon-dep
...
Remove daemon dependency on api packages
Upstream-commit: c028b6d089ec21ae3c5e90e0a50740d71d18c739
Component: engine
2018-04-20 16:04:26 -04:00
Kir Kolyshkin
d80d707e96
context.WithTimeout: do call the cancel func
...
govet complains (when using standard "context" package):
> the cancel function returned by context.WithTimeout should be called,
> not discarded, to avoid a context leak (vet)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 05e2f7e2fafd0fbc818c9f4cda7ac513c785d49c
Component: engine
2018-04-20 12:27:13 -07:00
GordonTheTurtle
53bcb78f51
Merge component 'engine' from git@github.com:moby/moby master
2018-04-20 17:07:42 +00:00
GordonTheTurtle
e812a9de38
Merge component 'cli' from git@github.com:docker/cli master
2018-04-20 16:41:35 +00:00
Vincent Demeester
07428d75bd
Merge pull request #36888 from vdemeester/mark-test-helpers
...
Make testing helpers as such…
Upstream-commit: ba02880786b9924f251ea0785de168f45996e325
Component: engine
2018-04-20 17:00:17 +02:00
Vincent Demeester
5b320bf640
Merge pull request #36744 from kolyshkin/t-enospc
...
TestDaemonNoSpaceLeftOnDeviceError: simplify
Upstream-commit: 7d9cbfa96f7d43764eb44422ac0a848f96d0484d
Component: engine
2018-04-20 15:40:39 +02:00
Vincent Demeester
57e3475a77
Merge pull request #36492 from alejgh/36478-log-standardization
...
36478 storage-drivers log format standardization
Upstream-commit: c4ba5be6af4aa960d2f6d2071b2218cf0b62bb20
Component: engine
2018-04-20 12:11:14 +02:00
Vincent Demeester
3da083e7f4
Remove daemon dependency on api packages
...
We are using interface in the api routers to not explicitely depend on
the daemon struct (`daemon.Daemon`), but somehow, we do depend on the
`daemon` package for the cluster functionalities.
This removes this dependency by defining the correct interfaces.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f4106b46db47524b4f38abeee48137d42e3fe4eb
Component: engine
2018-04-20 11:06:40 +02:00
Vincent Demeester
695bc0d42c
Make testing helpers as such…
...
That way, those lines won't be reported in the failure.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: cb8db44395df70fa3044d2a9683d6d24438cfa74
Component: engine
2018-04-20 10:38:43 +02:00
Sebastiaan van Stijn
c27dd5c4ac
Merge pull request #36887 from alexjomin/master
...
pkg/term add build tag for netbsd
Upstream-commit: d6706dddd5c40f47ecb529422446152039934a84
Component: engine
2018-04-19 19:41:36 -07:00
Brian Goff
7b9de88fa5
Merge pull request #36896 from cpuguy83/move_mount_parsing
...
Move mount parsing to separate package.
Upstream-commit: a9bd60d674f85c2161bb702404b23501d6b746c3
Component: engine
2018-04-19 20:31:53 -04:00
Brian Goff
625b8ccfec
Merge pull request #36875 from vdemeester/integration-cli-some-fixme
...
[test/integration-cli] small cleanups of FIXME(s)
Upstream-commit: 4da83efdfbbbb8a69ae155fc1998cfbc7b070b1c
Component: engine
2018-04-19 20:31:27 -04:00