GordonTheTurtle
e73ed7d7f7
Merge component 'engine' from git@github.com:moby/moby master
2018-05-07 17:06:37 +00: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
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
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
Brian Goff
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
Vincent Demeester
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
Vincent Demeester
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
Victor Vieux
21855605a8
Merge pull request #1030 from thaJeztah/bump-version-to-v18.06-dev
...
Bump version to 18.06.0-dev
Upstream-commit: 222b0245f7
2018-05-02 11:39:52 -07:00
Darren Stahl
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
GordonTheTurtle
f2f1605a20
Merge component 'engine' from git@github.com:moby/moby master
2018-05-02 17:07:13 +00:00
GordonTheTurtle
44d68d9d33
Merge component 'cli' from git@github.com:docker/cli master
2018-05-02 16:41:41 +00:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Anshul Pundir
6539329293
Bump swarmkit to bd69f6e8e301645afd344913fa1ede53a0a111fb
...
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com >
Upstream-commit: 6dce068caaec86b3d6655d49902032f35bab2fe1
Component: engine
2018-05-01 15:48:50 -07:00
Brian Goff
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
Dennis Chen
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
Dennis Chen
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
Sebastiaan van Stijn
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
GordonTheTurtle
d38f9b7e29
Merge component 'engine' from git@github.com:moby/moby master
2018-04-30 17:06:22 +00:00
GordonTheTurtle
e0af2510f5
Merge component 'cli' from git@github.com:docker/cli master
2018-04-30 16:41:31 +00:00
Mike Lundy
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
Alessandro Boch
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
221837e1ba
Merge pull request #973 from silvin-lubecki/orchestrator-column
...
Orchestrator column
Upstream-commit: 3a55cd709c
2018-04-30 12:16:41 +02:00
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
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
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
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
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
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
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
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
GordonTheTurtle
Sebastiaan van Stijn
Yong Tang
Brian Goff
John Stephens
Tibor Vass
Vincent Demeester
Victor Vieux
Darren Stahl
Sebastiaan van Stijn
Anshul Pundir
Dennis Chen
Mike Lundy
Alessandro Boch
Silvin Lubecki
Patrik Cyvoct
Nico Stapelbroek
Daniel Hiltgen
Cody Roseborough