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

1636 commits

Author SHA1 Message Date
Justin Cormack
d28a8673b5 Make the docker proxy a standalone binary not a re-exec 
This reduces memory usage with a lot of docker proxy processes.
On Docker for Mac we are currently carrying a patch to replace
the binary as we modify it to forward ports to the Mac rather
than the Linux VM, this allows us to simply replace this binary
in our packaging with one that has a compatible interface. This
patch does not provide an easy way to substitute a binary as
the interface is complex and there are few use cases, but where
needed this can be done.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
(cherry picked from commit 0682468431)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-08 15:33:28 -07:00
Vincent Demeester
3b8f724a96 Vendor engine-api 1d247454d4307fb1ddf10d09fd2996394b085904 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 6ec4a640de)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-08 15:32:34 -07:00
Brian Goff
272e75f9a0 re-vendor swarmkit 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit db271b8833)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-08 15:32:23 -07:00
Brian Goff
f331f05f9a re-vendor engine-api 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 140ec59db6)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-08 15:32:23 -07:00
Antonio Murdaca
f7a8a315e7 vendor docker/distribution 4e17ab5d319ac5b70b2769442947567a83386fbc 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 8aa37bdbb7)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-08 15:32:22 -07:00
Otto Kekäläinen
664c75ebba Fix spelling in comments, strings and documentation 
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
(cherry picked from commit 644a7426cc)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-08 15:31:42 -07:00
Antonio Murdaca
0500446b36 fix F24 rpm build 
error: line 89: Invalid version (epoch must be unsigned integer):
%{epoch}:1.12.0-0.3.rc3.fc24: Requires(pre): docker-engine-selinux >=
%%{epoch}:1.12.0-0.3.rc3.fc24

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 0c07e55e4c)
 2016-07-01 16:51:47 -07:00
Kenfe-Mickael Laventure
5199e3960e Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 2685c82c2e)
 2016-07-01 12:01:28 -07:00
Tonis Tiigi
7d835ed934 Vendor updated swarmkit, libnetwork, engine-api 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 54255f53d8)
 2016-07-01 00:40:36 -07:00
Nishant Totla
d199f78d18 Updating header name and executor 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit af5df117a8)
 2016-07-01 00:39:51 -07:00
Stefan Scherer
06cbb86a29 Revert tasksmax workaround to avoid unsupported bins 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
(cherry picked from commit 6509cc4e63)
 2016-06-30 17:12:46 -07:00
Adam Kunk
d83a27471b updates to fix install script for RHEL 
fixing install script for rhel7

fixing install script for rhel7

Signed-off-by: Adam Kunk <adam.kunk@tiaa-cref.org>

updates to fix install script for RHEL

fixing install script for rhel7

fixing install script for rhel7

Signed-off-by: Adam Kunk <adam.kunk@tiaa-cref.org>
(cherry picked from commit 485c27e186)
 2016-06-30 16:57:31 -07:00
Michael Crosby
4dc392b213 Update containerd to b93a33be39bc4ef0fb00bfcb79147 
This updates containerd to b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
fixing the start sync issues.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 7db7e04631)
 2016-06-30 16:47:52 -07:00
Sebastiaan van Stijn
63ce6b60d5 Fix installation script for RHEL 
the previous fix changed the lsb_dist variable
too early. We only normalize to "centos"
for the repository-location, so changing
it just before that.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 73d5f0648e)
 2016-06-30 16:47:51 -07:00
John Howard
f3da720d8b Windows: Ensure frozen cope with prefix 
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit b820ead426)
 2016-06-30 16:47:46 -07:00
Kenfe-Mickael Laventure
1641f5e308 Fix the value of the Components value in apt {In,}Release files 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 63b0713014)
 2016-06-30 16:47:46 -07:00
Alessandro Boch
ada93c7182 Vendoring libnetwork ed311d0 
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit e26c513fa8)
 2016-06-30 16:47:45 -07:00
Alessandro Boch
e928358dfb Vendoring vishvananda/netlink 734d02c 
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit 58b8b8fa15)
 2016-06-30 16:47:45 -07:00
Ken Cochrane
8f677417d1 Fixed issue #23787 install script not working for RHEL7 host 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
(cherry picked from commit 0e84474672)
 2016-06-30 16:47:42 -07:00
Jana Radhakrishnan
2b45db42b2 Vendoring @ab62dd6bf06bf0 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit 663159e9ac)
 2016-06-30 16:47:37 -07:00
Jana Radhakrishnan
0728f28cbe Vendoring swarmkit @3f135f206179e 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit 64a567d24c)
 2016-06-18 20:58:24 -07:00
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