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

1598 commits

Author SHA1 Message Date
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
Arnaud Porterie
f02ffd9e19 Bump etcd to 2.3.2 
Bump etcd to 2.3.2 and `github.com/ugorji/go` accordingly.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2016-06-02 18:35:45 -07:00
Sebastiaan van Stijn
76d8b0dab7
Bump engine-api to fa04f66c7871183dd53a5ec666479f49b452743d 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-03 00:14:55 +02:00
Vincent Demeester
eb9274844e Merge pull request #23140 from Microsoft/HcsshimRevendor 
Revendor hcsshim
 2016-06-02 22:09:19 +02:00
Arnaud Lefebvre
20bf00dfa5 Use PKG_CONFIG environment variable if it exists 
pkg-config is not always available in the path
so let people choose where it's located

Signed-off-by: Arnaud Lefebvre <a.lefebvre@outlook.fr>
 2016-06-02 21:53:28 +02:00
Sebastiaan van Stijn
4399d3b309 Merge pull request #23206 from mlaventure/fix-release-deb 
Fix release-deb script
 2016-06-02 21:22:49 +02:00
Kenfe-Mickael Laventure
afc2579d1a Fix release-deb script 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-02 08:53:33 -07:00
Vincent Demeester
8ea051f012
Update engine-api to 009ba1641d669613b38818f6f6385b0e74c5728f 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-02 16:55:49 +02:00
Alexander Morozov
28676fc04b Merge pull request #22769 from dnephin/integrate_cobra 
Use spf13/cobra for the cli
 2016-06-01 14:18:23 -07:00
Yong Tang
1dab9af5d5 Vendor engine-api to 6facb3f3c38717b8f618dcedc4c8ce20d1bfc61e 
This fix updates engine-api to 6facb3f3c38717b8f618dcedc4c8ce20d1bfc61e.

This fix is related to #23090.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-06-01 09:44:25 -07:00
Daniel Nephin
3d624ed5d6 Update cobra vendor 
- adds support for usage strings on flag errors
- adds support for arg validation

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-31 15:43:13 -07:00
Darren Stahl
d96e36cbbf Revendor hcsshim 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-05-31 14:42:01 -07:00
Daniel Nephin
8c77c73e7b Vendor spf13/cobra and spf13/pflag 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-31 14:41:37 -07:00
Ken Cochrane
dcc407a820
Fix issues with get.docker.com install script with redhat fixes #23101 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
 2016-05-31 08:44:40 -04:00
Yong Tang
51f0a04223 Update aws-sdk-go to v1.1.30 
This fix tries to update aws-sdk-go to v1.1.30.

The following dependencies has been added:
github.com/go-ini/ini 060d7da055ba6ec5ea7a31f116332fe5efa04ce0
github.com/jmespath/go-jmespath 0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74
Note: the commits matches v1.1.30 of aws-sdk-go.

The following dependency has been removed
github.com/vaughan0/go-ini a98ad7ee00ec53921f08832bc06ecf7fd600e6a1

This fix fixes #22961.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-05-28 18:49:17 -07:00
Christy Perez
d864a14620 Bump the seccomp versions to pull in fixes and new commits 
enabling s390 and ppc64le function

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
 2016-05-27 11:12:47 -04:00
Alexander Morozov
9b0d385975 Merge pull request #22840 from runcom/go1.6 
Upgrade to golang 1.6.2
 2016-05-27 06:54:57 -07:00
Sebastiaan van Stijn
75109b32db Merge pull request #22861 from vdemeester/daemon-images-search-refactoring 
Daemon images search refactoring
 2016-05-26 12:34:31 +02:00