0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
31952 commits 14 branches 412 tags 338 MiB
Commit graph

31952 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Demeester
18f90133ac Merge pull request #32544 from yuexiao-wang/fix-service-logs 
Fix inconsistency for service logs
 2017-04-12 09:51:15 +02:00
yuexiao-wang
78b2c1a84a Fix inconsisticy for service logs 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2017-04-12 22:43:14 +08:00
Vincent Demeester
a0a977864f Merge pull request #32180 from joaofnfernandes/run-docs 
Clean `docker run -e` reference docs
 2017-04-12 09:34:30 +02:00
Anusha Ragunathan
3343653edb Merge pull request #32030 from ehazlett/any-runtime 
Support Swarmkit Generic Task Runtime
 2017-04-11 17:53:20 -07:00
Joao Fernandes
d11c1520f4 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>
 2017-04-11 15:03:31 -07:00
Vincent Demeester
8a8c1961b5 Merge pull request #32059 from seriousben/support-dns-stack-file 
add support for dns nameservers and search domains in stack files
 2017-04-11 21:32:52 +02:00
Vincent Demeester
9d4a8cda6b Merge pull request #32488 from dnephin/docs-for-dockerfile-stdin 
Add docs for reading Dockerfile from stdin
 2017-04-11 20:46:14 +02:00
Evan Hazlett
12601e3559 Merge pull request #32536 from vieux/bump_api_and_version 
bump API and version
 2017-04-11 14:27:21 -04:00
Victor Vieux
b507158c0f bump API and version 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-04-11 11:21:55 -07:00
Evan Hazlett
d6bb4ae434 updated swagger with new fields for task spec 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-04-11 14:02:02 -04:00
Evan Hazlett
dc762610ab add service convert tests 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-04-11 14:02:02 -04:00
Evan Hazlett
3a9be92927 return exec.Controller instead of nil 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-04-11 14:02:02 -04:00
Evan Hazlett
8c2c69d31e updates for review comments 
- runtimeUrl -> type_url
- runtimes -> runtime

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-04-11 14:02:01 -04:00
Evan Hazlett
f71bdc67a2 filter services by runtime; default to container 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-04-11 14:02:01 -04:00
Evan Hazlett
e06e2ef107 add support for swarmkit generic runtime 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-04-11 14:02:01 -04:00
Vincent Demeester
1a8206ca1f Merge pull request #32521 from mkumatag/update_shellwords 
Vendor package update github.com/mattn/go-shellwords
 2017-04-11 18:27:37 +02:00
Vincent Demeester
595f1c4af2 Merge pull request #32520 from thaJeztah/remove-ubuntu-12.04-precise 
Remove Ubuntu 12.04 "precise pangolin" from build scripts
 2017-04-11 18:05:18 +02:00
Sebastiaan van Stijn
74742dbeff Merge pull request #32486 from dnephin/docs-for-arg-in-from 
Add Dockerfile reference docs for using ARG in FROM
 2017-04-11 17:45:02 +02:00
Daniel Nephin
e838679cd7 Add docs for reading Dockerfile from stdin. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-11 11:40:10 -04:00
Daniel Nephin
3437715e20 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>
 2017-04-11 11:34:43 -04:00
Sebastiaan van Stijn
f30e94a495 Merge pull request #32505 from fcrisciani/conntrack_test 
Conntrack flush support
 2017-04-11 16:40:56 +02:00
Brian Goff
b93db34363 Merge pull request #32503 from dongluochen/fix_startperiod 
fix gRPC serialization for healthcheck start-period
 2017-04-11 10:19:16 -04:00
Sebastiaan van Stijn
8d25490145 Merge pull request #32523 from albers/typo-api-version-history 
Fix typo in version-history.md
 2017-04-11 15:44:41 +02:00
Harald Albers
269df77be2 Fix typo in version-history.md 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-04-11 15:39:01 +02:00
Manjunath A Kumatagi
3d6d9061e3 Vendor package update github.com/mattn/go-shellwords 
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com>
 2017-04-11 18:14:00 +05:30
Sebastiaan van Stijn
618d6bd0ce
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>
 2017-04-11 14:08:39 +02:00
Sebastiaan van Stijn
a258ef58d8 Merge pull request #32284 from aaronlehmann/fix-service-defaults 
Improve default handling for "service create"
 2017-04-11 13:06:53 +02:00
Vincent Demeester
5e9a0efec7 Merge pull request #32514 from albers/completion-multiple-stack-rm 
Bash completion supports multiple stacks in `stack rm`
 2017-04-11 11:31:39 +02:00
Akihiro Suda
8d53fb5172 Merge pull request #32511 from mkumatag/remove_mock_vendor 
Remove unused github.com/golang/mock from vendor.conf
 2017-04-11 17:54:35 +09:00
Harald Albers
dc0523313e Bash completion supports multiple stacks in stack rm 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-04-11 08:29:55 +02:00
Akihiro Suda
b764c471bf Merge pull request #32495 from dnephin/cleanup-builder-dispatcher-env 
Remove Builder.dockerfile field
 2017-04-11 14:50:55 +09:00
Manjunath A Kumatagi
30a1625002 Remove unused github.com/golang/mock 
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com>
 2017-04-11 10:20:16 +05:30
Flavio Crisciani
1c4286bcff
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>
 2017-04-10 21:31:35 -07:00
Victor Vieux
a6746e6ca5 Merge pull request #31954 from darrenstahlmsft/GraphdriverReference 
Windows: Fix reference counting in graphdriver
 2017-04-10 20:23:15 -07:00
Victor Vieux
18ae574cab Merge pull request #32496 from tonistiigi/build-target 
builder: add an option for specifying build target
 2017-04-10 19:02:21 -07:00
Victor Vieux
17a3e4511d Merge pull request #32462 from dperny/service-logs-general-availability 
Remove experimental from service logs
 2017-04-10 18:30:20 -07:00
Victor Vieux
74093fe4ca Merge pull request #32092 from alfred-landrum/gdcaps 
Let graphdrivers declare diff stream fidelity
 2017-04-10 18:20:32 -07:00
Victor Vieux
3a9572ca14 Merge pull request #32110 from adshmh/30977-stack-rm-should-accept-multiple-labels 
stack rm should accept multiple arguments
 2017-04-10 18:19:59 -07:00
Flavio Crisciani
c16eb5f88a
Vendoring Libnetwork library 
- adding conntrack flush fix for docker/docker#8795

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-04-10 17:52:16 -07:00
Benjamin Boudreau
6b60a60729
Adding support for dns in stack files 
Signed-off-by: Benjamin Boudreau <boudreau.benjamin@gmail.com>
 2017-04-10 20:46:33 -04:00
Darren Stahl
7fab9b8a60 Windows: Fix reference counting in graphdriver 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-04-10 17:13:17 -07:00
Flavio Crisciani
e88bc31afa
Vendoring Netlink library 
- Added conntrack support

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-04-10 17:09:24 -07:00
Dong Chen
caab178509 fix gRPC serialization for healthcheck start-period 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2017-04-10 17:02:58 -07:00
Tonis Tiigi
33e07f41ad builder: add an option for specifying build target 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-04-10 16:21:43 -07:00
Victor Vieux
2c6bcf3ee7 Merge pull request #32497 from thaJeztah/master-update-changelog 
[master] update changelog with 17.04.0 changes
 2017-04-10 16:02:38 -07:00
Victor Vieux
3569dac3c0
bump to rc2 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 2f35d73b7d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-04-11 00:58:34 +02:00
Vincent Demeester
9c2f8febaf
Merge pull request #31848 from thaJeztah/17.04.0-changelog-updates 
[17.04.x] deprecation and changelog updates
(cherry picked from commit f15f593751)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-04-11 00:57:37 +02:00
Victor Vieux
d55ec07acd
Merge pull request #31811 from vieux/bump_17.04.0 
bump 17.04.0-rc1
(cherry picked from commit b2fc918c5a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-04-11 00:57:19 +02:00
Daniel Nephin
f3e205ddc1 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>
 2017-04-10 18:09:17 -04:00
Victor Vieux
7da7fc3ad0 Merge pull request #32492 from icecrime/update_gitdm_domain-map 
Update gitdm domain-map
 2017-04-10 14:54:12 -07:00