14ac7227ab
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 >
Upstream-commit: 2e9ea5c194e5fbb83f59e30f8bda5467086598fe
Component: engine
2016-06-14 07:47:31 -07:00
0173891ba6
Merge pull request #23361 from docker/swarm
...
Add dependency to docker/swarmkit
Upstream-commit: a1e319e847f41e648ebede7f9d79999d75bd14c8
Component: engine
2016-06-14 00:55:55 -07:00
2a2694e613
Merge pull request #23224 from mlaventure/dont-overwrite-existing-deb
...
Do not overwrite already published deb files when releasing
Upstream-commit: 494098534023096f016fa7f184b379929a3f8096
Component: engine
2016-06-13 22:16:53 -07:00
230cf74120
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 >
Upstream-commit: 44793049ce1ad364720b4be915a92291d1f808c2
Component: engine
2016-06-13 22:16:18 -07:00
711259e403
Merge pull request #23261 from dimrozakis/23260
...
Escape brackets in hack/install.sh
Upstream-commit: f7600fc6413cc7dcc5a243c174ecb086870fb16f
Component: engine
2016-06-13 20:19:26 +02:00
96c1665876
Update vendored hcsshim to v0.3.4
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: d4d8cc9c0a94840a2d45b549925301daa3bfcad3
Component: engine
2016-06-10 15:27:05 -07:00
44f55e1d1d
Merge pull request #23406 from thaJeztah/update-deb-script
...
release-deb: create "dists" directory if missing
Upstream-commit: a4ff707e993ac01c05eee5dd9e7eb7d374d129cf
Component: engine
2016-06-10 00:05:43 +02:00
7f639864bd
Merge pull request #23392 from Microsoft/RevendorHcsshim
...
Revendor hcsshim to v0.3.2
Upstream-commit: 30bbf184e937ee2aab075a4a6890d9f9f0b74cde
Component: engine
2016-06-09 11:39:39 -07:00
6ca123dd75
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 >
Upstream-commit: 94ac03cdf549567c01f191a066d8435731f41e06
Component: engine
2016-06-09 15:22:49 +02:00
fd09c4f818
Bump seccomp version to enable ppc/s390x seccomp support
...
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com >
Upstream-commit: 758f9a8cebbc3f6a0f07cd66146c726452b4207d
Component: engine
2016-06-09 05:48:06 -04:00
7b699065ec
Merge pull request #23380 from Microsoft/jjh/refreshwin2lin
...
Update win2lin scripts to match production
Upstream-commit: 456551a672db7285dfdba9927c1acb8d2ab07a6b
Component: engine
2016-06-09 08:14:14 +02:00
99c133c055
Revendor hcsshim to v0.3.2
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: bb1c54bc1f0379b03eac50949c4b1fba0f91dd57
Component: engine
2016-06-08 17:32:22 -07:00
0cfb313091
Merge pull request #23385 from thaJeztah/fix-rpm-manpages
...
fix RPM spec for man8
Upstream-commit: 6717b355034e81659cd8144590eaa7ac8c573fba
Component: engine
2016-06-09 01:04:02 +02:00
ecac3fcd79
Merge pull request #23344 from pdalpra/timeout-as-time.Duration
...
Timeout as time.duration
Upstream-commit: 6fd8c96f6164fa70170a2400f8fa092de9507cf9
Component: engine
2016-06-08 16:37:08 -04:00
2c68dc49b6
fix RPM spec for man8
...
installation for man-8 was added in 1514b499f04e317d6bc81bb2d46a6623db422763
(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 >
Upstream-commit: 70a03951a037c2c415d84fc65eff989151c1dfc4
Component: engine
2016-06-08 22:21:21 +02:00
ef59715b3a
Update win2lin scripts to match production
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9ea3f2aca2ce3b12d42e72290e404592209ee652
Component: engine
2016-06-08 11:08:23 -07:00
87fa5c341b
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 >
Upstream-commit: d17b9f3da064f4c7e70867be5e64d06b127df301
Component: engine
2016-06-07 15:27:23 -07:00
5b8c5d757b
Bump engine-api to 8c2141e14bb9e7540938d155976b3ef0661e4814
...
Signed-off-by: Pierre Dal-Pra <dalpra.pierre@gmail.com >
Upstream-commit: 66234eaf9bd78ccad44db4a199fa865334e7b418
Component: engine
2016-06-07 18:18:37 +02:00
08ad8f3172
Merge pull request #23269 from vdemeester/migrate-import-to-cobra
...
Use spf13/cobra for docker import
Upstream-commit: f061f556f2d3819f293e76a434c8212d613eca6b
Component: engine
2016-06-07 13:07:30 +02:00
fcec050c14
Merge pull request #23236 from runcom/fix-spec
...
Fix spec and man
Upstream-commit: 8e63de1f63ac6bb8b0eefad4836599255d1eaea6
Component: engine
2016-06-07 12:54:42 +02:00
3ff13f560e
Merge pull request #22866 from jstarks/foreign_layers
...
Support layers from external URLs
Upstream-commit: 7d08f3a5ad16446952b9b461feb0895a5c73ea58
Component: engine
2016-06-07 00:27:40 +00:00
d04d755b65
Update cobra to 75205f23b3ea70dc7ae5e900d074e010c23c37e9
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: ca01e57d55699ab9e30f120a1de9d00a477547ad
Component: engine
2016-06-06 13:58:18 +02:00
6075499108
Merge pull request #23063 from yongtang/22961-aws-sdk-go
...
Update aws-sdk-go to v1.1.30
Upstream-commit: 3f970819bb4231375f7821aa54670fd59e384f4d
Component: engine
2016-06-05 16:01:52 -04:00
e816a61078
Escape brackets in hack/install.sh
...
Fixes #23260
Signed-off-by: Dimitris Rozakis <dimrozakis@gmail.com >
Upstream-commit: c088321ea88b5f4dad8a56b79d45617aa117f6c1
Component: engine
2016-06-05 13:01:44 +03:00
bd5e8e3754
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 >
Upstream-commit: feab8db60da39ecda00c86b34bf5958ae257a14f
Component: engine
2016-06-04 10:06:07 -07:00
e951d738d2
bump engine-api to 772250a752e34cacaeef7c92b8e0ddf43450b629
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ed870716324426c5c5de2e12de48515ef8cbcf39
Component: engine
2016-06-04 14:16:36 +02:00
ada47a3e3f
Merge pull request #23124 from kencochrane/fix_redhat_install_script
...
Fix issues with get.docker.com install script with redhat
Upstream-commit: e6637f8d9ebd693f4a6f7992eb0c14aac4a5871e
Component: engine
2016-06-04 00:04:09 +02:00
291598aa4c
docker-engine.spec: install man8
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 1514b499f04e317d6bc81bb2d46a6623db422763
Component: engine
2016-06-03 15:27:24 +02:00
1d2d19ec51
Merge pull request #23215 from BlackYoup/pkg-config
...
make.sh: use PKG_CONFIG environment variable if it exists
Upstream-commit: 726ef47d5c50c329b5b0c30f3a0612cc7ee241b3
Component: engine
2016-06-03 15:04:37 +02:00
14f34960c4
Merge pull request #23227 from yongtang/06032016-engine-api
...
Vendor engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6
Upstream-commit: f1755b256070f7654ab958523cee5fbbe0f10d1d
Component: engine
2016-06-03 14:15:31 +02:00
56f0d7968e
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 >
Upstream-commit: 9bb54f89ad26015c79dab7c5ac210cb846e0713b
Component: engine
2016-06-03 12:08:33 +02:00
911ef54d71
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 >
Upstream-commit: 10c35196b19389da5bb64921b7e1f23eb054c739
Component: engine
2016-06-03 02:27:17 -07:00
94248d97f8
Do not overwrite already published deb files when releasing
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: acd67e25a9d419f2933ea2d6afacdfa60519e3b9
Component: engine
2016-06-02 21:01:57 -07:00
25e7113b7c
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 >
Upstream-commit: f02ffd9e19acb3cc0a0ea6e58a8944be60f249e1
Component: engine
2016-06-02 18:35:45 -07:00
b7559c81f8
Bump engine-api to fa04f66c7871183dd53a5ec666479f49b452743d
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 76d8b0dab76610526b28a657ac13db6f8c89c0e1
Component: engine
2016-06-03 00:14:55 +02:00
44649a5cdf
Merge pull request #23140 from Microsoft/HcsshimRevendor
...
Revendor hcsshim
Upstream-commit: eb9274844efd5e08226a98de79f0f5237a6e2458
Component: engine
2016-06-02 22:09:19 +02:00
22121ca2b2
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 >
Upstream-commit: 20bf00dfa56ef9584d25777031ac4d11360386a8
Component: engine
2016-06-02 21:53:28 +02:00
bc51dad73c
Merge pull request #23206 from mlaventure/fix-release-deb
...
Fix release-deb script
Upstream-commit: 4399d3b309a5af06471382ecf22c40f24d218c73
Component: engine
2016-06-02 21:22:49 +02:00
c30ea46ede
Fix release-deb script
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: afc2579d1a5aa3b95d90d6a1fdf7d6a4e3058fd6
Component: engine
2016-06-02 08:53:33 -07:00
27ed0fbcf5
Update engine-api to 009ba1641d669613b38818f6f6385b0e74c5728f
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8ea051f01261c44512bcaa76569a7fb9a200bab6
Component: engine
2016-06-02 16:55:49 +02:00
e0398fafd2
Merge pull request #22769 from dnephin/integrate_cobra
...
Use spf13/cobra for the cli
Upstream-commit: 28676fc04b9a307718b66bd28e8d9281d05f38ac
Component: engine
2016-06-01 14:18:23 -07:00
2d116f099f
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 >
Upstream-commit: 1dab9af5d5acc1fe3a1bfb84a5cc576d664095e4
Component: engine
2016-06-01 09:44:25 -07:00
8b7b615274
Update cobra vendor
...
- adds support for usage strings on flag errors
- adds support for arg validation
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3d624ed5d6c6bc8d4cbc6fdf579bd066c2f45e12
Component: engine
2016-05-31 15:43:13 -07:00
e8454769c2
Revendor hcsshim
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: d96e36cbbfb076f4adb967644e7d6e2da73eb0ec
Component: engine
2016-05-31 14:42:01 -07:00
e1ba5cfcf6
Vendor spf13/cobra and spf13/pflag
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 8c77c73e7b43a6a01133227e93c1e3f25d8a6e70
Component: engine
2016-05-31 14:41:37 -07:00
08161a24b2
Fix issues with get.docker.com install script with redhat fixes #23101
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com >
Upstream-commit: dcc407a820fae10c142fc05aab16cc60df5ccfd9
Component: engine
2016-05-31 08:44:40 -04:00
e07f1df86d
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 >
Upstream-commit: 51f0a042239f2fb6f7ca1af2571f65a56a8bc001
Component: engine
2016-05-28 18:49:17 -07:00
c5c3e7945d
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 >
Upstream-commit: d864a1462037a2746b7633fb0212218d017a5532
Component: engine
2016-05-27 11:12:47 -04:00
9b06540d32
Merge pull request #22840 from runcom/go1.6
...
Upgrade to golang 1.6.2
Upstream-commit: 9b0d385975c80359b4cab2c75e4834fe803e12d5
Component: engine
2016-05-27 06:54:57 -07:00
6e20543be2
Merge pull request #22861 from vdemeester/daemon-images-search-refactoring
...
Daemon images search refactoring
Upstream-commit: 75109b32db4c23f469b57fb99300fc5d4a689dce
Component: engine
2016-05-26 12:34:31 +02:00
