cb7f296afd
Introduce cli.Wait* fuctions
...
These replace `wait*` functions from `docker_utils_test.go` and work
more or less like other `cli` functions.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: db35c2a5a8d93cfeac9e75a3add60ae7c64a5856
Component: engine
2017-04-14 19:27:33 +02:00
c9b5a51747
Clean some function in docker_utils_test.go
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 10e171cd9463ca0bfda4556b3eb04d9f89d1bbbf
Component: engine
2017-04-12 11:22:32 +02:00
7b2c24fd0f
Merge pull request #32473 from vdemeester/integration-cli-package-take3
...
[test-integration] Move FakeContext to `integration-cli/cli/build/fakecontext` package…
Upstream-commit: 2a17d048de7bf5a0152789617c83a318fac508e7
Component: engine
2017-04-12 10:24:49 +02:00
cc87542bde
Merge pull request #32539 from aaronlehmann/tag-hex-string
...
client: Allow hex strings as source references for ImageTag
Upstream-commit: 6672ffa566936dc7dc6e10b494b2a1567c536ddc
Component: engine
2017-04-12 09:52:56 +02:00
33f39daca5
Merge pull request #32544 from yuexiao-wang/fix-service-logs
...
Fix inconsistency for service logs
Upstream-commit: 18f90133ac4fe0b63745228c49eda441f6b91ecd
Component: engine
2017-04-12 09:51:15 +02:00
ac649e5b5e
Fix inconsisticy for service logs
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 78b2c1a84a3be4f0004ebd277d8a88eb0ac9d006
Component: engine
2017-04-12 22:43:14 +08:00
ba4754cea8
Merge pull request #32180 from joaofnfernandes/run-docs
...
Clean `docker run -e` reference docs
Upstream-commit: a0a977864f4160cca882bbe8cc72d944025f6fee
Component: engine
2017-04-12 09:34:30 +02:00
b94b999d77
Merge pull request #32030 from ehazlett/any-runtime
...
Support Swarmkit Generic Task Runtime
Upstream-commit: 3343653edb9a9c152c043de577effda1d528d6c0
Component: engine
2017-04-11 17:53:20 -07:00
7c776ba71c
Clean docker run -e reference docs
...
Simplified the docs on how to set environment variables in a
container. Makes it clear that you have three options, and how
to use them.
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com >
Upstream-commit: d11c1520f4f4f2c2a3206343f573024b92c42bce
Component: engine
2017-04-11 15:03:31 -07:00
640fde4eb4
client: Allow hex strings as source references for ImageTag
...
The source of a tag operation is allowed to be a 64-character hex
string. This means it should use ParseAnyReference for validation
instead of ParseNormalizedNamed.
This fixes a regression that happened in 17.04.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 4a0704cdbd1805d0d9ef046eb62a77352f1feab0
Component: engine
2017-04-11 13:37:04 -07:00
7ec6dbcc2e
Merge pull request #32059 from seriousben/support-dns-stack-file
...
add support for dns nameservers and search domains in stack files
Upstream-commit: 8a8c1961b58ef687e4a07002bdf1be4784ff7142
Component: engine
2017-04-11 21:32:52 +02:00
8915598c83
Merge pull request #32488 from dnephin/docs-for-dockerfile-stdin
...
Add docs for reading Dockerfile from stdin
Upstream-commit: 9d4a8cda6baa29ad22b4bd0f3c63392b73bde8a7
Component: engine
2017-04-11 20:46:14 +02:00
122c9b8aa8
Merge pull request #32536 from vieux/bump_api_and_version
...
bump API and version
Upstream-commit: 12601e3559ab880fc29c4fc2ad7031e74c931ca9
Component: engine
2017-04-11 14:27:21 -04:00
e5fb241134
bump API and version
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: b507158c0f0c6cbee52d3ff7e0278004d3486c9d
Component: engine
2017-04-11 11:21:55 -07:00
f0e93c44da
updated swagger with new fields for task spec
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: d6bb4ae434b9737fc392f98130b0be3d632d6bdc
Component: engine
2017-04-11 14:02:02 -04:00
3323cc5ab7
add service convert tests
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: dc762610ab538bb7909eeb6ca13ada83e3d409b4
Component: engine
2017-04-11 14:02:02 -04:00
26d7ec7da8
return exec.Controller instead of nil
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 3a9be929272d089d57745350b8888760a18b2526
Component: engine
2017-04-11 14:02:02 -04:00
3cad237312
updates for review comments
...
- runtimeUrl -> type_url
- runtimes -> runtime
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 8c2c69d31ec0ce4a9b125ca3cbf7b04ee81ce579
Component: engine
2017-04-11 14:02:01 -04:00
21134b3d48
filter services by runtime; default to container
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: f71bdc67a21a63b901e484a0650bea36d15eece5
Component: engine
2017-04-11 14:02:01 -04:00
5d661a7bc0
add support for swarmkit generic runtime
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: e06e2ef107ad09191bfea3dfe51cfa830114b54b
Component: engine
2017-04-11 14:02:01 -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
5f5b71f0ea
Move FakeContext to integration-cli/cli/build/context package…
...
… and continue emptying `docker_utils_test.go` from build related function.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 56fb4653e8b867802d2a33121f933d164a4e6325
Component: engine
2017-04-11 18:25:49 +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
670f141a55
Add docs for reading Dockerfile from stdin.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e838679cd7954775cbe7ff72ef2da02dbe791fcb
Component: engine
2017-04-11 11:40:10 -04: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
7254b7d783
Adding support for dns in stack files
...
Signed-off-by: Benjamin Boudreau <boudreau.benjamin@gmail.com >
Upstream-commit: 6b60a60729e0b22cc74197e5d00d1621435da7f7
Component: engine
2017-04-10 20:46:33 -04: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
