0e0adf0eea
Merge component 'engine' from git@github.com:moby/moby master
2018-05-04 17:07:22 +00:00
ad7b1373ce
Merge component 'cli' from git@github.com:docker/cli master
2018-05-04 16:41:43 +00:00
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
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
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
ec16580804
Merge pull request #922 from kolyshkin/man-fixes
...
Man page fixes
Upstream-commit: 0ff5f52051
2018-05-03 07:34:06 -10:00
9bc9d40087
Merge component 'engine' from git@github.com:moby/moby master
2018-05-03 17:07:17 +00:00
1b30fa4e80
Merge component 'cli' from git@github.com:docker/cli master
2018-05-03 16:41:44 +00:00
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
87f255b417
Merge pull request #36396 from selansen/master
...
Allow user to specify default address pools for docker networks
Upstream-commit: 82d9185470c99d5768b60926648b3739ec15bbc4
Component: engine
2018-05-03 06:34:14 -04:00
0246710e59
Merge pull request #1005 from eiais/fishupdate
...
Update Attach, Build, Commit, Cp, Create subcommand fish completions
Upstream-commit: e956159572
2018-05-03 10:28:53 +02:00
3d4a877b7f
Merge pull request #1006 from essamhassan/908_show_secrets_configs_srv_inspect
...
908 - Adding configs/secrets to service inspect pretty
Upstream-commit: e9731e9d0f
2018-05-03 10:12:51 +02:00
6848b40040
Update hcsshim to v0.6.10
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: d1fa012fa0104bb8aac45fd04bf22cdac0ec4144
Component: engine
2018-05-02 10:15:52 -07:00
f2f1605a20
Merge component 'engine' from git@github.com:moby/moby master
2018-05-02 17:07:13 +00:00
44d68d9d33
Merge component 'cli' from git@github.com:docker/cli master
2018-05-02 16:41:41 +00:00
294e7aa568
Merge pull request #36960 from arm64b/fix-multi-stage-name-issue
...
Fix the target name issue for multi-stage build
Upstream-commit: 51a9119f6b817bbae21805ec05787d462c9492cd
Component: engine
2018-05-02 13:27:50 +02:00
ec3e6ec6a5
Bump version to 18.06.0-dev
...
Docker-CE 18.05.0-rc1 was cut off from these commits;
- docker-ce 18.05 branch created for code freeze: https://github.com/docker/docker-ce/tree/18.05
- engine: https://github.com/moby/moby/tree/1a57535
- cli: https://github.com/docker/cli/tree/4970824
- packaging: https://github.com/docker/docker-ce-packaging/tree/c216602
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: deb8bd740b
2018-05-02 12:11:23 +02:00
8fa7a28767
Merge pull request #1026 from dhiltgen/expose_pull
...
Export pull as a public function
Upstream-commit: 784430737b
2018-05-02 12:07:49 +02:00
0074e6a87b
Merge pull request #36522 from IRCody/awslogs-non-blocking
...
Allow awslogs to use non-blocking mode
Upstream-commit: fe2d3a1551f666465e65ec4337e92b774a5e81f1
Component: engine
2018-05-01 16:30:52 -04:00
0e7b49da2e
Add --target name case sensitive test code for multi-stage build
...
Add testing code to cover the `--target` name case sensitive
issue reported by issue #36956 .
Signed-off-by: Dennis Chen <dennis.chen@arm.com >
Upstream-commit: a95fabc70efacc1ff6c0c62c490cf551215bc503
Component: engine
2018-05-01 11:31:52 +08:00
4c5e76b26e
Fix the target name issue for multi-stage build
...
This PR is trying to fix issue #36956 .
The stage name is case-insensitive by design, so we should use
`strings.EqualFold()` as the comparison method to eliminate the
case sensitive noise.
Also we need to return a pre-defined error code order to avoid below
message like:
"FIXME: Got an API for which error does not match any expected type!!!:
failed to reach build target dev in Dockerfile"
Signed-off-by: Dennis Chen <dennis.chen@arm.com >
Upstream-commit: 7c0570473cfa181aeb3278072cc9af4f9298cb98
Component: engine
2018-05-01 10:28:40 +08:00
09778021e4
Merge pull request #1024 from clnperez/manifest-token-perms
...
manifest list: request specific permissions
Upstream-commit: f42c66bd24
2018-04-30 20:22:11 +02:00
d38f9b7e29
Merge component 'engine' from git@github.com:moby/moby master
2018-04-30 17:06:22 +00:00
e0af2510f5
Merge component 'cli' from git@github.com:docker/cli master
2018-04-30 16:41:31 +00:00
40a1520f3d
Bump docker/distribution to 83389a148052d74ac602f5f1d62f86ff2f3c4aa5
...
vendored distribution is quite old, and current distribution contains an
API break, which means it's not possible to vendor a bugfixed
distribution and a docker/docker at the same time.
Signed-off-by: Mike Lundy <mike@fluffypenguin.org >
Upstream-commit: 07ffa1cea9d995a7ab55793b5b08758c38fec3f0
Component: engine
2018-04-30 09:30:56 -07:00
b9f36ffdf0
Allow user to control the default address pools
...
- Via daemon flag --default-address-pools base=<CIDR>,size=<int>
Signed-off-by: Elango Siva <elango@docker.com >
Upstream-commit: 173b3c364ebedd56bd5b6c190a9b41f592ba57d6
Component: engine
2018-04-30 11:14:08 -04:00
4502df9e25
Merge pull request #1028 from nstapelbroek/feature/exec-die-event
...
Add exec_die to the list of known container events
Upstream-commit: 8103326311
2018-04-30 12:26:28 +02:00
2ff7c2ca43
Add an orchestrator column in the docker stack ls command
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 13d0c9c695
2018-04-30 12:04:02 +02:00
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
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
2018-04-30 11:56:14 +02:00
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
2018-04-30 11:27:22 +02:00
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
340f40eb39
Add exec_die to the list of known container events
...
Signed-off-by: Nico Stapelbroek <nstapelbroek@gmail.com >
Upstream-commit: 4d91812b88
2018-04-29 14:52:08 +02:00
a774d0458e
Merge component 'engine' from git@github.com:moby/moby master
2018-04-28 17:06:52 +00:00
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
2018-04-27 12:21:19 -07:00
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
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
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
fd1a47eb04
Merge component 'engine' from git@github.com:moby/moby master
2018-04-26 17:07:28 +00:00
5bc18aa45a
Merge component 'cli' from git@github.com:docker/cli master
2018-04-26 16:43:04 +00:00
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
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
c783effbb0
Merge pull request #1017 from thaJeztah/warn-when-using-host-ip
...
Warn when using host-ip for published ports
Upstream-commit: 99bd7ed693
2018-04-25 17:09:42 -04:00
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
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
2771210b85
Merge component 'engine' from git@github.com:moby/moby master
2018-04-25 17:06:30 +00:00
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
08243ac4d3
testing config/secrets are showing in pretty print
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com >
Upstream-commit: 8238644796
2018-04-25 17:22:18 +02:00
9193280536
add config and secret to service in inspect test
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com >
Upstream-commit: 2b1f27ea5e
2018-04-25 17:22:18 +02:00
8531403103
adding configs/secrets to service inspect pretty
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com >
Upstream-commit: 3ae2d4b24c
2018-04-25 17:21:31 +02:00
