32fb3c1d02
Merge component 'engine' from git@github.com:moby/moby master
2018-05-09 17:06:15 +00:00
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
d39da73d16
Export BuildArgs
...
Signed-off-by: Priya Wadhwa <priyawadhwa@google.com >
Upstream-commit: 593255ffb07989e416743d4235fef65e75414e6b
Component: engine
2018-05-08 14:57:26 -07:00
ebc7fa7c75
Merge component 'engine' from git@github.com:moby/moby master
2018-05-08 17:07:32 +00:00
4d422dd853
Merge component 'cli' from git@github.com:docker/cli master
2018-05-08 16:41:46 +00:00
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
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
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
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
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
e73ed7d7f7
Merge component 'engine' from git@github.com:moby/moby master
2018-05-07 17:06:37 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
