862dffcf24
Remove unused Builder.Cancel()
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 068f344e032ad4489a88665adec683e06ad6f3c7
Component: engine
2017-04-11 20:33:13 -04:00
a00fca972d
Remove unused id field from Builder.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a6abd57b83dc0aaf0cedeeb488c8a41262e46b7d
Component: engine
2017-04-11 14:44:32 -04:00
a5b8a0845e
Factor out functions from builder/dockerfile/builder.go:Builder.build()
...
Remove the block comment which is stale, and redundant now that the
function is just as readable as the comment.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: bfcd95817afaedb078022fc2f335ead64afee55c
Component: engine
2017-04-11 14:44:32 -04:00
6fb208126e
Cleanup in dispatcher.env
...
Remove commented code blocks
Remove some duplication in comparing and restructuring env
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c7fad9b750f8f143a22cc5a85a1dc26573025414
Component: engine
2017-04-11 14:44:28 -04:00
841b5bc44d
Merge pull request #32521 from mkumatag/update_shellwords
...
Vendor package update github.com/mattn/go-shellwords
Upstream-commit: 1a8206ca1fefdcc50577248bf27107499fa3d55e
Component: engine
2017-04-11 18:27:37 +02:00
05a1048022
Merge pull request #32520 from thaJeztah/remove-ubuntu-12.04-precise
...
Remove Ubuntu 12.04 "precise pangolin" from build scripts
Upstream-commit: 595f1c4af2292676023ebc902382a56e452e19df
Component: engine
2017-04-11 18:05:18 +02:00
aaee4136fa
Merge pull request #32486 from dnephin/docs-for-arg-in-from
...
Add Dockerfile reference docs for using ARG in FROM
Upstream-commit: 74742dbeff37b544358c7f629032d2bfc6ec6acc
Component: engine
2017-04-11 17:45:02 +02:00
0e1fc8025c
Add Dockerfile reference docs for using ARG in FROM
...
Also fixed some examples of using `docker build` to clarify that the
positional argument is a directory, not a file.
Also fixed some terminology. Dockerfiles contain instructions, not directives or
commands.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3437715e20b3a1b16ea93a47802794b58b007863
Component: engine
2017-04-11 11:34:43 -04:00
993ce0e0d7
Merge pull request #32505 from fcrisciani/conntrack_test
...
Conntrack flush support
Upstream-commit: f30e94a495c6e18d15b577b804984635a38b9fd6
Component: engine
2017-04-11 16:40:56 +02:00
c0ea8e35b1
Merge pull request #32503 from dongluochen/fix_startperiod
...
fix gRPC serialization for healthcheck start-period
Upstream-commit: b93db343630119b186294e50216b76190b942c98
Component: engine
2017-04-11 10:19:16 -04:00
afc9ca5ea7
Merge pull request #32523 from albers/typo-api-version-history
...
Fix typo in version-history.md
Upstream-commit: 8d254901451df57231c0052124bad070a8e7ef96
Component: engine
2017-04-11 15:44:41 +02:00
26e209c931
Fix typo in version-history.md
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 269df77be24b0644a267f693a89ef4a794c62dd9
Component: engine
2017-04-11 15:39:01 +02:00
c227e1300b
Vendor package update github.com/mattn/go-shellwords
...
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com >
Upstream-commit: 3d6d9061e3df82bd1728de9873b872e2800c3b92
Component: engine
2017-04-11 18:14:00 +05:30
5569e1d778
Remove Ubuntu 12.04 "precise pangolin" from build scripts
...
Ubuntu 12.04 will be EOL on April 28, after which it won't
receive updates and security fixes;
https://lists.ubuntu.com/archives/ubuntu-announce/2017-March/000218.html
This patch removes Ubuntu 12.04 from the build scripts
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 618d6bd0ce190b4186add0f8f5d7f8f380d6c7c5
Component: engine
2017-04-11 14:08:39 +02:00
d2aa64e45c
Merge pull request #32284 from aaronlehmann/fix-service-defaults
...
Improve default handling for "service create"
Upstream-commit: a258ef58d8a100467d5d948b026a884ebe58eaf4
Component: engine
2017-04-11 13:06:53 +02:00
d0386ff5a2
Merge pull request #32514 from albers/completion-multiple-stack-rm
...
Bash completion supports multiple stacks in `stack rm`
Upstream-commit: 5e9a0efec714b46af3de51a22bdd344a600f84eb
Component: engine
2017-04-11 11:31:39 +02:00
21d92ba641
Merge pull request #32511 from mkumatag/remove_mock_vendor
...
Remove unused github.com/golang/mock from vendor.conf
Upstream-commit: 8d53fb517280a5b7b60d875b2fe12b7332df531e
Component: engine
2017-04-11 17:54:35 +09:00
4c139b77c0
Bash completion supports multiple stacks in stack rm
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: dc0523313e71a8d4bce4e63032c864bd96fd2831
Component: engine
2017-04-11 08:29:55 +02:00
443e2161ff
Merge pull request #32495 from dnephin/cleanup-builder-dispatcher-env
...
Remove Builder.dockerfile field
Upstream-commit: b764c471bf1a648342a4b4f58de1e9768b49b4ed
Component: engine
2017-04-11 14:50:55 +09:00
f745194027
Remove unused github.com/golang/mock
...
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com >
Upstream-commit: 30a16250027fd3794c5400031e8f447c5c360497
Component: engine
2017-04-11 10:20:16 +05:30
529c0891e7
Adding test for docker/docker#8795
...
When a container was being destroyed was possible to have
flows in conntrack left behind on the host.
If a flow is present into the conntrack table, the packet
processing will skip the POSTROUTING table of iptables and
will use the information in conntrack to do the translation.
For this reason is possible that long lived flows created
towards a container that is destroyed, will actually affect
new flows incoming to the host, creating erroneous conditions
where traffic cannot reach new containers.
The fix takes care of cleaning them up when a container is
destroyed.
The test of this commit is actually reproducing the condition
where an UDP flow is established towards a container that is then
destroyed. The test verifies that the flow established is gone
after the container is destroyed.
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 1c4286bcffcdc6668f84570a2754c78cccbbf7e1
Component: engine
2017-04-10 21:31:35 -07:00
89e454a1d4
Merge pull request #31954 from darrenstahlmsft/GraphdriverReference
...
Windows: Fix reference counting in graphdriver
Upstream-commit: a6746e6ca5da6df6af9d93fc51149c35d58a55fd
Component: engine
2017-04-10 20:23:15 -07:00
0bf5e70579
Merge pull request #32496 from tonistiigi/build-target
...
builder: add an option for specifying build target
Upstream-commit: 18ae574cab9c4eb5183e419b1ca698dd76ed1194
Component: engine
2017-04-10 19:02:21 -07:00
108aa4253e
Merge pull request #32462 from dperny/service-logs-general-availability
...
Remove experimental from service logs
Upstream-commit: 17a3e4511d8f20868a051f10dbedabdce7ea2f9c
Component: engine
2017-04-10 18:30:20 -07:00
9c833700c4
Merge pull request #32092 from alfred-landrum/gdcaps
...
Let graphdrivers declare diff stream fidelity
Upstream-commit: 74093fe4ca259c5378da89098c48fb7b1167732e
Component: engine
2017-04-10 18:20:32 -07:00
6516b7e3d8
Merge pull request #32110 from adshmh/30977-stack-rm-should-accept-multiple-labels
...
stack rm should accept multiple arguments
Upstream-commit: 3a9572ca14c821ea0cf24dd590f608392e7a6ad1
Component: engine
2017-04-10 18:19:59 -07:00
db16ab77b5
Vendoring Libnetwork library
...
- adding conntrack flush fix for docker/docker#8795
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: c16eb5f88a1ea3bef53b2bd7ea366397803c2af1
Component: engine
2017-04-10 17:52:16 -07:00
72f89cba18
Windows: Fix reference counting in graphdriver
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 7fab9b8a6054270763508ce88cb06c584cfeb153
Component: engine
2017-04-10 17:13:17 -07:00
a9bae169ae
Vendoring Netlink library
...
- Added conntrack support
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: e88bc31afa63e41e67b277e73a8921868807d49f
Component: engine
2017-04-10 17:09:24 -07:00
a06cb35e0f
fix gRPC serialization for healthcheck start-period
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: caab178509b9da0194b3a45286ff6f253fec667c
Component: engine
2017-04-10 17:02:58 -07:00
a89a2c21c5
builder: add an option for specifying build target
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 33e07f41adc0ec96edad5f22bc2cfaec0d26ea58
Component: engine
2017-04-10 16:21:43 -07:00
be24ba4d1a
Merge pull request #32497 from thaJeztah/master-update-changelog
...
[master] update changelog with 17.04.0 changes
Upstream-commit: 2c6bcf3ee7a72d0bfab58161f1db13ae220a820e
Component: engine
2017-04-10 16:02:38 -07:00
51259136c6
bump to rc2
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
(cherry picked from commit 2f35d73b7dc7a9e234ea06f6145a26c37472c775)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3569dac3c01f8966375b564e01ce1c29f0dc1aa0
Component: engine
2017-04-11 00:58:34 +02:00
a22988a573
Merge pull request #31848 from thaJeztah/17.04.0-changelog-updates
...
[17.04.x] deprecation and changelog updates
(cherry picked from commit f15f5937514c386ace40a43441dddc28337ca12d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9c2f8febaff2d61a30828db57bdef0064fac8e91
Component: engine
2017-04-11 00:57:37 +02:00
d0562f46dc
Merge pull request #31811 from vieux/bump_17.04.0
...
bump 17.04.0-rc1
(cherry picked from commit b2fc918c5aa6d0c96953acaf62f9fb38049b608e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d55ec07acd31e1557e0076aa7280a33f891f503c
Component: engine
2017-04-11 00:57:19 +02:00
4eb0844e51
Remove the dockerfile field from Builder.
...
Return dockerfile from parseDockerfile and pass the dockerfile nodes
as an arg
Strip unused arg from builder.NewBuilder.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f3e205ddc15040ec80ef047959afa7b75586a491
Component: engine
2017-04-10 18:09:17 -04:00
1abf6ed1ab
Merge pull request #32492 from icecrime/update_gitdm_domain-map
...
Update gitdm domain-map
Upstream-commit: 7da7fc3ad071b7ce90185fa4a2e2a8f085d89e2b
Component: engine
2017-04-10 14:54:12 -07:00
9a2b12ff7d
Update gitdm domain-map
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: bfb6815f481c4112087f44fb6539019ec52d7c33
Component: engine
2017-04-10 14:28:27 -07:00
70dbb373c2
Merge pull request #32485 from albers/completion-node-ls--filter
...
Add bash completion for `node ls --format`
Upstream-commit: 5f7150059fdf04ff78d6108f22a9ca66bc3da969
Component: engine
2017-04-10 17:04:20 -04:00
bdda1a695e
Merge pull request #32116 from mkumatag/inspect_template
...
Adopt text/template in node inspect
Upstream-commit: ec207ce186bff1804f49c456f77fe7d377e63d30
Component: engine
2017-04-10 23:02:26 +02:00
1dfd61e802
Make the CLI show defaults from the swarmkit defaults package
...
If no fields related to an update config or restart policy are
specified, these structs should not be created as part of the service,
to avoid hardcoding the current defaults.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: bbe1202410a580b8bdb35e7b50e4e4028e530111
Component: engine
2017-04-10 13:41:18 -07:00
3d267a0dc8
Change "service inspect" to show defaults in place of empty fields
...
This adds a new parameter insertDefaults to /services/{id}. When this is
set, an empty field (such as UpdateConfig) will be populated with
default values in the API response. Make "service inspect" use this, so
that empty fields do not result in missing information when inspecting a
service.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 1d274e9acfe96b98be3ec956636ff4e5c70e98af
Component: engine
2017-04-10 13:41:16 -07:00
24a0a6b6bb
Remove experimental from service logs
...
Service logs API is now stable. Service logs now support all features,
except retrieving details provided to the log driver.
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: 306cfecc8c146ea8addb44dd35296808b25916a2
Component: engine
2017-04-10 13:40:45 -07:00
88f1fa957c
Merge pull request #32479 from aboch/vnd
...
Do not error out on serv bind deactivation if no sbox is found
Upstream-commit: 129d1f7051d77278bcc918b4fd2e848292d74f84
Component: engine
2017-04-10 22:16:04 +02:00
ef02a743db
Merge pull request #28403 from cpuguy83/logging_plugins
...
Implement plugins for logging drivers
Upstream-commit: 28334c1d829b9ea8ac7e10d45a6db37c3821d5db
Component: engine
2017-04-10 21:57:56 +02:00
4e6c66cece
Add bash completion for node ls --format
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ef77f002e7f6722b839f9afb02dd2dbfe0ff601b
Component: engine
2017-04-10 12:57:32 -07:00
65a5e8539f
Merge pull request #31877 from albers/completion-update--cpus
...
Add bash completion for `update --cpus`
Upstream-commit: 9b2ac77f645430609db951551dafd17307a2733f
Component: engine
2017-04-10 21:43:16 +02:00
15fc803536
Merge pull request #31236 from tonistiigi/docker-stdin
...
build: accept -f - to read Dockerfile from stdin
Upstream-commit: 778e32a2fadcf1ccb1819ad6534af5c477585300
Component: engine
2017-04-10 20:14:54 +02:00
e5dfac43c9
Merge pull request #31148 from yongtang/31032-NanoCPU-update
...
Add `--cpus` support for `docker update`
Upstream-commit: 5b1cae227171a299e41835a4806cd939b984c596
Component: engine
2017-04-10 20:02:15 +02:00
6d75b7a10d
Merge pull request #30740 from yongtang/29999-prune-filter-label
...
Add `label` filter for `docker system prune`
Upstream-commit: 4460312ce1a53316e3c474ab951b85e737a902c5
Component: engine
2017-04-10 19:38:01 +02:00
