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

1615 commits

Author SHA1 Message Date
Jana Radhakrishnan
a7c925cba4 Vendoring libnetwork @13be89d1cf79 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit 70e2585d54)
 2016-06-17 13:09:12 -07:00
Tonis Tiigi
528f3ab668 Update swarmkit to 310f1119 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 2783568284)
 2016-06-16 23:36:57 -07:00
Vincent Demeester
7444bb2c25 Bump engine-api to c57d0447ea1ae71f6dad83c8d8a1215a89869a0c 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 58529a1553)
 2016-06-16 23:36:56 -07:00
Madhu Venugopal
ed01cfc6db Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed 
* fixes https://github.com/docker/docker/issues/23622
* fixes a memory leak issue with bulk sync
* fixes external DNS resolution issue after live restore

Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 7f2f6ed0d6)
 2016-06-16 23:36:56 -07:00
Victor Vieux
7cc76facba fix docker swarm init/update --secret 
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit 085895342c)
 2016-06-16 23:36:54 -07:00
Sebastiaan van Stijn
dd5573bc60 Update release script installation instructions 
Instructions for installing the static binaries
has changed, so updated the instructions.

The comment on top already requires the steps
to be executed as root, so removing the 'sudo'

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e233c8dd72)
 2016-06-16 23:36:54 -07:00
Michael Crosby
cdb04519e2 Update libnetwork to 96d45528599c32354230480a1ebc0 
This fixes an issue with hanging tests due to store.

Fixes #23560

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit e927df7b4b)
 2016-06-16 23:36:52 -07:00
Madhu Venugopal
588b76c2a1 Vendoring swarmkit 682e0b69be208176d6055cba855a5e9cf15c7cb4 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 5af8e2a9c0)
 2016-06-16 23:36:51 -07:00
Madhu Venugopal
f1d5c3374c Vendoring libnetwork 0d517a9e4e5cbdb889b3257eebd2351addcd46d4 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit f2f97f768e)
 2016-06-16 23:36:51 -07:00
Kenfe-Mickael Laventure
301f3d776f Revert build-{deb,rpm} to cloning from opencontainers repository 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-16 09:06:53 -07:00
Kenfe-Mickael Laventure
9eb6e049bd Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit b675124cf5)
 2016-06-16 08:46:23 -07:00
Arnaud Porterie (icecrime)
e2b7f648f4
Use runc from crosbymichael's fork 
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
 2016-06-14 21:10:38 -07:00
Arnaud Porterie
91197953d0 Merge pull request #23524 from aboch/restore 
Daemon to support network restore
 2016-06-15 02:33:16 +00:00
Arnaud Porterie
574f7d2149 Merge pull request #23551 from tonistiigi/update-swarmkit 
Update swarmkit to 25572005f
 2016-06-15 02:25:31 +00:00
Tonis Tiigi
cdf279d74d Update swarmkit to 25572005f 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-14 17:07:14 -07:00
Tibor Vass
e5b7d36e99 plugins: vendor engine-api to import new plugin types 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-06-14 14:20:27 -07:00
Alessandro Boch
5b79122146 Vendoring libnetwork 452dff1 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-06-14 13:45:24 -07:00
Kenfe-Mickael Laventure
2e9ea5c194 Update containerd and runc vendoring 
containerd: 860f3a94940894ac0a106eff4bd1616a67407ee2
runc: 85873d917e86676e44ccb80719fcb47a794676a1
runtime-specs: v1.0.0-rc1

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-14 07:47:31 -07:00
Tibor Vass
a1e319e847 Merge pull request #23361 from docker/swarm 
Add dependency to docker/swarmkit
 2016-06-14 00:55:55 -07:00
Tibor Vass
4940985340 Merge pull request #23224 from mlaventure/dont-overwrite-existing-deb 
Do not overwrite already published deb files when releasing
 2016-06-13 22:16:53 -07:00
Tonis Tiigi
44793049ce Add dependency to docker/swarmkit 
Add a dependency to `docker/swarmkit` in preparation for adding
first-class Swarm-wide service management inside the Docker Engine as
described in our ROADMAP.md.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-06-13 22:16:18 -07:00
Sebastiaan van Stijn
f7600fc641 Merge pull request #23261 from dimrozakis/23260 
Escape brackets in hack/install.sh
 2016-06-13 20:19:26 +02:00
Darren Stahl
d4d8cc9c0a Update vendored hcsshim to v0.3.4 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-06-10 15:27:05 -07:00
Sebastiaan van Stijn
a4ff707e99 Merge pull request #23406 from thaJeztah/update-deb-script 
release-deb: create "dists" directory if missing
 2016-06-10 00:05:43 +02:00
John Howard
30bbf184e9 Merge pull request #23392 from Microsoft/RevendorHcsshim 
Revendor hcsshim to v0.3.2
 2016-06-09 11:39:39 -07:00
Sebastiaan van Stijn
94ac03cdf5
release-deb: create "dists" directory if missing 
The script failed if an empty volume is used
to generate the repo. This adds the directory
if missing.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-09 15:22:49 +02:00
Michael Holzheu
758f9a8ceb Bump seccomp version to enable ppc/s390x seccomp support 
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
 2016-06-09 05:48:06 -04:00
Vincent Demeester
456551a672 Merge pull request #23380 from Microsoft/jjh/refreshwin2lin 
Update win2lin scripts to match production
 2016-06-09 08:14:14 +02:00
Darren Stahl
bb1c54bc1f Revendor hcsshim to v0.3.2 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-06-08 17:32:22 -07:00
Sebastiaan van Stijn
6717b35503 Merge pull request #23385 from thaJeztah/fix-rpm-manpages 
fix RPM spec for man8
 2016-06-09 01:04:02 +02:00
Brian Goff
6fd8c96f61 Merge pull request #23344 from pdalpra/timeout-as-time.Duration 
Timeout as time.duration
 2016-06-08 16:37:08 -04:00
Sebastiaan van Stijn
70a03951a0
fix RPM spec for man8 
installation for man-8 was added in 1514b499f0
(pull-request 23236), but had a typo in a path,
causing generation of the RPM's to fail.

This fixes the path

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-08 22:21:21 +02:00
John Howard
9ea3f2aca2 Update win2lin scripts to match production 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-06-08 11:08:23 -07:00
Michael Crosby
d17b9f3da0 Update containerd to cf554d59dd96e459544748290eb91 
This bumps containerd to cf554d59dd96e459544748290eb9167f4bcde509 and
includes various fixes and updates the grpc package and types generated
for use.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-06-07 15:27:23 -07:00
Pierre Dal-Pra
66234eaf9b Bump engine-api to 8c2141e14bb9e7540938d155976b3ef0661e4814 
Signed-off-by: Pierre Dal-Pra <dalpra.pierre@gmail.com>
 2016-06-07 18:18:37 +02:00
Sebastiaan van Stijn
f061f556f2 Merge pull request #23269 from vdemeester/migrate-import-to-cobra 
Use spf13/cobra for docker import
 2016-06-07 13:07:30 +02:00
Vincent Demeester
8e63de1f63 Merge pull request #23236 from runcom/fix-spec 
Fix spec and man
 2016-06-07 12:54:42 +02:00
Arnaud Porterie
7d08f3a5ad Merge pull request #22866 from jstarks/foreign_layers 
Support layers from external URLs
 2016-06-07 00:27:40 +00:00
Vincent Demeester
ca01e57d55
Update cobra to 75205f23b3ea70dc7ae5e900d074e010c23c37e9 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-06 13:58:18 +02:00
Brian Goff
3f970819bb Merge pull request #23063 from yongtang/22961-aws-sdk-go 
Update aws-sdk-go to v1.1.30
 2016-06-05 16:01:52 -04:00
Dimitris Rozakis
c088321ea8 Escape brackets in hack/install.sh 
Fixes #23260

Signed-off-by: Dimitris Rozakis <dimrozakis@gmail.com>
 2016-06-05 13:01:44 +03:00
David Calavera
feab8db60d
Vendor docker-credential-helpers v0.3.0 
Fix a bug in the vendor helpers that took packages
that started with github.com/docker/docker like if
they were from within the project.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-06-04 10:06:07 -07:00
Sebastiaan van Stijn
ed87071632
bump engine-api to 772250a752e34cacaeef7c92b8e0ddf43450b629 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-04 14:16:36 +02:00
Antonio Murdaca
e6637f8d9e Merge pull request #23124 from kencochrane/fix_redhat_install_script 
Fix issues with get.docker.com install script with redhat
 2016-06-04 00:04:09 +02:00
Antonio Murdaca
1514b499f0 docker-engine.spec: install man8 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-06-03 15:27:24 +02:00
Sebastiaan van Stijn
726ef47d5c Merge pull request #23215 from BlackYoup/pkg-config 
make.sh: use PKG_CONFIG environment variable if it exists
 2016-06-03 15:04:37 +02:00
Sebastiaan van Stijn
f1755b2560 Merge pull request #23227 from yongtang/06032016-engine-api 
Vendor engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6
 2016-06-03 14:15:31 +02:00
Brian Goff
9bb54f89ad
Add make install task 
This installs docker and dockerd to `$DOCKER_MAKE_INSTALL_PREFIX/bin`, which
defaults to `/usr/local/bin`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-03 12:08:33 +02:00
Yong Tang
10c35196b1 Vendor engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6 
This fix tries to update engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6

This fix brings engine-api up to date, which includes changes from:
https://github.com/docker/engine-api/pull/256
https://github.com/docker/engine-api/pull/254

This fix is related to

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-06-03 02:27:17 -07:00
Kenfe-Mickael Laventure
acd67e25a9 Do not overwrite already published deb files when releasing 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-02 21:01:57 -07:00