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

32522 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stanislav Bondarenko
92291a7355 Stop referring CLI flags in error messages if API client is unknown 
Signed-off-by: Stanislav Bondarenko <stanislav.bondarenko@gmail.com>
 2017-05-22 18:50:49 -04:00
Sebastiaan van Stijn
916e9ad754 Merge pull request #33307 from dongluochen/swarm_event_test 
Event tests need retry logic
 2017-05-20 15:48:50 +02:00
Sebastiaan van Stijn
a40595d498 Merge pull request #33308 from ehazlett/remove-runtime-data 
Remove RuntimeData from cluster and types
 2017-05-20 02:05:06 +02:00
Evan Hazlett
8eeba75198
remove RuntimeData from cluster and types 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-05-19 17:10:32 -04:00
Dong Chen
59b2d0473a Event tests need to wait for events 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2017-05-19 12:14:50 -07:00
Sebastiaan van Stijn
f888a25ff5 Merge pull request #33261 from aaronlehmann/empty-platform 
api: Only return a Platform when relevant information is available
 2017-05-19 20:05:07 +02:00
Sebastiaan van Stijn
58b1788c81 Merge pull request #33299 from thaJeztah/explain-relation-between-paused-and-stopped 
Improve description of Running and Paused booleans
 2017-05-19 16:29:05 +02:00
Sebastiaan van Stijn
d98d4faef8 Merge pull request #33293 from fd/patch-1 
Remove deadlock in ContainerWait
 2017-05-19 16:17:54 +02:00
Brian Goff
39a604c0d4 Merge pull request #33286 from aboch/ingr 
Properly identify ingress network created with older swarm
 2017-05-19 10:04:29 -04:00
Brian Goff
d8e85f8c60 Merge pull request #33296 from vdemeester/more-opts-cleanup 
Remove more opts unused in docker/docker
 2017-05-19 10:01:34 -04:00
Sebastiaan van Stijn
a3536d2c6d Merge pull request #33291 from YuPengZTE/devFilter 
arg filter for printf verb %s of wrong type
 2017-05-19 12:33:33 +02:00
Sebastiaan van Stijn
b654b6244d
Improve description of Running and Paused booleans 
Commit abd72d4008 added
a "FIXME" comment to the container "State", mentioning
that a container cannot be both "Running" and "Paused".

This comment was incorrect, because containers on
Linux actually _must_ be running in order to be
paused.

This patch adds additional information both in a
comment, and in the API documentation to clarify
that these booleans are not mutually exclusive.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-05-19 12:29:54 +02:00
Vincent Demeester
61e527f16c
Remove more opts unused in docker/docker 
These are already present in `docker/cli` 👼

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-05-19 12:05:51 +02:00
Simon Menke
4d2d2ea393 Remove deadlock in ContainerWait 
when `cli.post(...)` fails `errC <- err` blocks because `errC` is unbufferd.

Signed-off-by: Simon Menke <simon.menke@gmail.com>
 2017-05-19 09:23:52 +02:00
yupengzte
49bf533fe7 arg filt 
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
 2017-05-19 13:47:32 +08:00
Brian Goff
ab83b924bc Merge pull request #33280 from mavenugo/vin-ln-1706 
Vendoring libnetwork b2bc1a684
 2017-05-18 23:31:23 -04:00
Alessandro Boch
93763f11ee Properly identify ingress network created with older swarm 
- otherwise docker network prune will remove it

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-05-18 19:47:45 -07:00
Sebastiaan van Stijn
01af41ed99 Merge pull request #33281 from dmcgowan/overlay2-on-btrfs 
Support overlay2 on btrfs
 2017-05-19 03:09:39 +02:00
Sebastiaan van Stijn
6c05ceeb0b Merge pull request #33278 from tonistiigi/plugin-chroot 
Use chrootarchive for plugin rootfs
 2017-05-19 02:38:29 +02:00
Sebastiaan van Stijn
dd27bbb41a Merge pull request #33269 from tophj-ibm/switch-more-syscalls-pkg-term 
[pkg/term] switch more syscalls to /x/sys/
 2017-05-19 02:37:52 +02:00
Derek McGowan
f64a4ad008
Support overlay2 on btrfs 
OverlayFS is supported on top of btrfs as of Linux Kernel 4.7.
Skip the hard enforcement when on kernel 4.7 or newer and
respect the kernel check override flag on older kernels.
https://btrfs.wiki.kernel.org/index.php/Changelog#By_feature

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-05-18 15:26:03 -07:00
Madhu Venugopal
9b0e1df4dd Vendoring libnetwork 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-05-18 15:14:12 -07:00
Kenfe-Mickaël Laventure
da9a885483 Merge pull request #33274 from aaronlehmann/update-cli 
Update CLI commit hash
 2017-05-18 15:11:10 -07:00
Tonis Tiigi
6f3f907cdb Use chrootarchive for plugin rootfs 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-05-18 14:53:46 -07:00
Sebastiaan van Stijn
b0dd3dfc11 Merge pull request #33267 from YuPengZTE/devImageWithDigestString 
ineffectual assignment to isCanonical, delete it, and make the "if" sentence to fit the golang usage
 2017-05-18 23:37:52 +02:00
Sebastiaan van Stijn
6b26257202 Merge pull request #33250 from cyphar/apparmor-readonly-root-fix 
apparmor: make pkg/aaparser work on read-only root
 2017-05-18 23:17:31 +02:00
Kenfe-Mickaël Laventure
cc24049f77 Merge pull request #33264 from wenjianhn/chkp-ls 
Fix checkpoint ls
 2017-05-18 13:37:42 -07:00
Sebastiaan van Stijn
7061b0f748 Merge pull request #33271 from masahide/fix-append-loop-awslogs 
Improved poor memory efficiency of awslogs
 2017-05-18 21:29:17 +02:00
Aaron Lehmann
d012569b78 Update CLI commit hash 
Since this new version of the CLI resolves image digests for swarm
services by default, and we do not want integration tests to talk to
Docker Hub, update CLI tests to suppress this behavior.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-18 12:23:28 -07:00
YAMASAKI Masahide
524f306340 Improved poor memory efficiency of awslogs 
Signed-off-by: YAMASAKI Masahide <masahide.y@gmail.com>
 2017-05-18 23:30:00 +09:00
Christopher Jones
df6dfcf198
[pkg/term] switch more syscalls to /x/sys/ 
Switches the remaining syscalls except Errno to /x/sys/.
This was supposed to be part of 33180

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2017-05-18 09:02:42 -04:00
Vincent Demeester
23e857cd3d Merge pull request #33116 from dnephin/refactor-builder-copy 
[Builder] Refactor COPY/ADD dispatchers
 2017-05-18 14:18:14 +02:00
yupengzte
b28c1eae01 ineffectual assignment to isCanonical, delete it 
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
 2017-05-18 17:16:19 +08:00
Madhu Venugopal
45c6f4262a Merge pull request #33130 from abhinandanpb/network-opt 
Adding network specific options to service create/update
 2017-05-17 21:03:06 -07:00
Jacob Wen
c0d2ec1eb5 Fix checkpoint ls 
Use create=false when calling getCheckpointDir
Fix #33263

Signed-off-by: Jacob Wen <jian.w.wen@oracle.com>
 2017-05-18 10:57:10 +08:00
Madhu Venugopal
4874e05f74 Merge pull request #33239 from nishanttotla/add-platform-information-service-spec 
Adding compatible platforms to service spec
 2017-05-17 19:31:24 -07:00
Abhinandan Prativadi
f3d8ff774e swarmkit vendoring 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-05-17 18:46:34 -07:00
Abhinandan Prativadi
fe11de0177 Adding network specific options to service create/update 
The commit adds capability to accept csv parameters
for network option in service create/update commands.The change
includes name,alias driver options specific to the network.
With this the following will be supported

docker service create --name web --network name=docknet,alias=web1,driver-opt=field1=value1 nginx
docker service create --name web --network docknet nginx
docker service update web --network-add name=docknet,alias=web1,driver-opt=field1=value1
docker service update web --network-rm docknet

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-05-17 18:46:34 -07:00
Madhu Venugopal
ca4b3c6f67 Merge pull request #32981 from aboch/nlo2 
Support swarm-mode services with node-local networks
 2017-05-17 18:43:06 -07:00
Aaron Lehmann
df86a14af2 api: Only return a Platform when relevant information is available 
I noticed that we could return a Platform that has no information filled
in. This doesn't look like it would cause any problems, but it would be
confusing. Fix the handler to only append to this slice when the
Platform is not empty.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-17 18:42:16 -07:00
Nishant Totla
7d4b8fb3b5
Updating test for compatible platforms to test unmarshal body 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2017-05-17 17:12:22 -07:00
Tõnis Tiigi
e103125883 Merge pull request #32986 from moypray/containerd_close 
fix when rpc reports "transport is closing" error, health check go routine will exit
 2017-05-17 17:04:05 -07:00
Nishant Totla
587d07cca8
Adding compatible platforms to service spec 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2017-05-17 16:20:42 -07:00
Alessandro Boch
d618b56b40 Docs and manual changes 
- for service create on node-local networks

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-05-17 15:50:28 -07:00
Alessandro Boch
3950cef941 Vendor gogoprotobuf v0.4 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-05-17 15:50:28 -07:00
Alessandro Boch
8daeeacfc1 Vendor swarmkit @998a47f 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-05-17 15:50:28 -07:00
Alessandro Boch
46392f2442 Vendoring libnetwork @b2bc1a6 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-05-17 15:50:28 -07:00
Alessandro Boch
b34d3e730f Integrate local datascope network with swarm 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-05-17 15:50:28 -07:00
Alessandro Boch
fcafc7108b Allow to control network scope 
- User can now promote a network's scope to swarm,
  so that the network is visible to swarm

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-05-17 15:50:28 -07:00
Alessandro Boch
9ee7b4dda9 Support configuration networks 
- They are configuration-only networks which
  can be used to supply the configuration
  when creating regular networks.
- They do not get allocated and do net get plumbed.
  Drivers do not get to know about them.
- They can be removed, once no other network is
  using them.
- When user creates a network specifying a
  configuration network for the config, no
  other network specific configuration field
  is are accepted. User can only specify
  network operator fields (attachable, internal,...)

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-05-17 15:50:28 -07:00