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

1704 commits

Author SHA1 Message Date
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
Anusha Ragunathan
379ec38222 Dont leak DOCKER_INCREMENTAL_BINARY flag into go test. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-06-14 13:02:54 -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
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
John Howard
c7ee503082 Merge pull request #22958 from Microsoft/hcs_rpc 
Windows: Use the new HCS RPC API
 2016-05-25 09:25:22 -07:00
John Starks
fa82c0aa10 Windows: work around Go 1.6.2/Nano Server TP5 issue 
This works around golang/go#15286 by explicitly loading shell32.dll at
load time, ensuring that syscall can load it dynamically during process
startup.

Signed-off-by: John Starks <jostarks@microsoft.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-05-25 11:59:28 +02:00
Vincent Demeester
522698dd43 Merge pull request #22967 from srinsriv/master 
Update dind
 2016-05-25 09:55:10 +02:00
srinsriv
27afaf3774 Update dind 
Typo

Signed-off-by: Srinivasan Srivatsan <srinivasan.srivatsan@hpe.com>
 2016-05-24 20:42:28 -07:00
Darren Stahl
959c1a52bf Change Docker to use the new HCS RPC API 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-05-24 16:36:51 -07:00
Vincent Demeester
5812b6927c
Vendor engine-api updates 
Adds UniqueExactMatch method to filters along other changes.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-05-24 11:02:19 +02:00
Amit Krishnan
86d8758e2b Get the Docker Engine to build clean on Solaris 
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
 2016-05-23 16:37:12 -07:00
Tibor Vass
80f61c4108
Allow granular vendoring 
hack/vendor.sh can now accept command line arguments

`./hack/vendor.sh github.com/docker/engine-api` will revendor only the
engine-api dependency.

`./hack/vendor.sh github.com/docker/engine-api v0.3.3` will vendor only
engine-api at the specified tag/commit.

`./hack/vendor.sh git github.com/docker/engine-api v0.3.3` is the same
but specifies the VCS for cases where the VCS is something else than git

`./hack/vendor.sh git golang.org/x/sys
eb2c74142fd19a79b3f237334c7384d5167b1b46
https://github.com/golang/sys.git` will vendor only golang.org/x/sys
downloading from the specified URL

Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-05-22 16:44:25 +02:00
John Starks
9c902364fb Revendor docker/distribution 
Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-05-20 14:16:48 -07:00
Alexander Morozov
af705ca0ae Merge pull request #22765 from cyphar/update-boltdb 
vendor: bump boltdb to v1.2.1
 2016-05-18 06:03:02 -07:00
Aleksa Sarai
a7781b130c vendor: bump boltdb to v1.2.1 
This includes a fix to soft database corruption that would cause Docker
to fail to start if the daemon died in the middle of a transaction
write.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-05-17 16:19:35 +10:00
Alessandro Boch
1f9e3815aa Vendoring libnetwork b66c0385f30c6aa27b2957ed1072682c19a0b0b4 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-05-16 15:04:01 -07:00
Alessandro Boch
ebcf785f2f Update libnetwork dependencies for b66c038 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-05-16 15:04:01 -07:00
John Howard
4c6838137c Merge pull request #22728 from Microsoft/jstarks/improve_import 
Windows: reexec during layer import
 2016-05-16 11:08:05 -07:00
Yong Tang
0f57f47ac3 Vendor engine-api to allow docker daemon reload event. 
This fix updated the vendored engine-api to version
e374c4fb5b121a8fd4295ec5eb91a8068c6304f4, which defines a new event
type of `DaemonEventType`. The purpose is to allow emitting`
`daemon reload` event as is raised in #22463.

This fix is related to #22463 and #22590.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-05-13 20:39:24 -07:00
John Starks
6d40104f11 Windows: revendor go-winio 
This fixes a variety of small bugs in layer handling and adds a new API
for acquiring privileges for the whole process.

Fixes #22404 (but only for new images -- existing images will need to be
re-pushed).

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-05-13 11:53:14 -07:00
Alexander Morozov
c95f1fcbd9 Merge pull request #22679 from cyli/bump-notary-version 
Bump notary version up to 0.3.0 and re-vendor.
 2016-05-12 14:38:07 -07:00
cyli
6094be63ac Bump notary version up to 0.3.0 and re-vendor. 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-05-11 22:57:51 -07:00
Qiang Huang
ed868a2e11 Update go-check 
It includes a small improvement, we hit test timeout sometimes
for some reason, print out the timed out case would be very
helpful.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-05-12 09:19:23 +08:00
Arnaud Porterie
dc430944b9 Merge pull request #22262 from kencochrane/fix_release_deb 
Create the correct directory structure for apt-ftparchive
 2016-05-11 12:38:12 -10:00
Tibor Vass
e421668b1b Merge pull request #21708 from tianon/InRelease 
Also generate "InRelease" files for newer APT clients
 2016-05-11 13:21:15 -04:00
Alexander Morozov
da74f9653d Merge pull request #22642 from amitkris/uprev_gozfs 
update go-zfs to include Solaris support
 2016-05-11 07:41:17 -07:00
Amit Krishnan
efb3946171 update go-zfs to include Solaris support 
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
 2016-05-10 13:51:03 -07:00
Michael Crosby
4e290986cd Update protobufs to 8d92cf5fc15a4382f8964b08e1f42a 
This syncs the protobuf version with the one that is used with
containerd.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-05-09 15:21:41 -07:00
Michael Crosby
cfb9764386 Update runc and containerd deps 
containerd:     57b7c3da915ebe943bd304c00890959b191e5264
runc:           d49ece5a83da3dcb820121d6850e2b61bd0a5fbe

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-05-09 15:05:44 -07:00
Alexander Morozov
a603fa33d5 Merge pull request #22317 from cyli/bump-notary-version 
Bump notary version to v0.3.0-RC1
 2016-05-06 12:54:53 -07:00
Alexander Morozov
ebc5a61593 Merge pull request #22076 from thtanaka/rpmbuild-error 
DWZ problem with multiple golang binary caused OL7 RPM build to fail
 2016-05-06 11:22:27 -07:00
Alexander Morozov
4531c01509 Merge pull request #22236 from kencochrane/remove_git_from_rpm 
Exclude .git directories from the source RPMS and debian packages
 2016-05-06 11:16:12 -07:00
cyli
88c6675ed2 Bump notary version to v0.3.0-RC1 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-05-06 10:59:26 -07:00
Mrunal Patel
97d95604e0 Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-05-05 18:36:09 -04:00
Vincent Demeester
af916d316a Merge pull request #22519 from mlaventure/add-dockerd-to-rpm-packaged-files 
Add dockerd to the list of files included in generated rpms
 2016-05-05 13:16:06 +02:00
Vincent Demeester
4de672690c Merge pull request #22270 from runcom/too-many-login 
distribution: errors: do not retry if too many login attempts
 2016-05-05 09:44:09 +02:00
Kenfe-Mickael Laventure
6118952e44 Add dockerd to the list of files included in generated rpms 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-05-04 20:45:22 -07:00
Tibor Vass
0c68402887 Merge pull request #22403 from mlaventure/fix-docker-build-pkgs 
Update build-deb to make correct use of DOCKER_BUILD_PKGS
 2016-05-04 17:55:20 -04:00
Antonio Murdaca
305ebfda8b vendor docker/distribution 9ec0d742d69f77caa4dd5f49ceb70c3067d39f30 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-05-04 18:57:35 +02:00
Kenfe-Mickael Laventure
20e1b9593e Update build-deb to make correct use of DOCKER_BUILD_PKGS 
An environment variable cannot directly be used as a bash array, this
patch loops through all the IFS separated value (which default to
space) instead.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-05-02 11:22:01 -07:00
Brian Goff
988f481643 Update engine-api 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-05-02 14:17:40 -04:00
Brian Goff
ba6209f744 Merge pull request #22367 from dnephin/fix_dockerd_lookup_and_warn 
Fix lookup of dockerd when called from outside of $PATH
 2016-05-02 13:58:57 -04:00
Daniel Nephin
8983d42988 Raise a more relevant error when dockerd is not available on the platform. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-02 11:59:25 -04:00
Vincent Demeester
ba901bb062 Vendor engine-api with pull fixes 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-04-30 17:24:25 +02:00
John Starks
57aef3b490 Windows: Support running dockerd as a service 
This adds support for Windows dockerd to run as a Windows service, managed
by the service control manager. The log is written to the Windows event
log (and can be viewed in the event viewer or in PowerShell). If there is
a Go panic, the stack is written to a file panic.log in the Docker root.

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-04-26 14:04:47 -07:00
John Howard
0c7eab3157 Make dockerd debuggable 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-04-26 09:35:22 -07:00
Vincent Demeester
dc7664d62e Merge pull request #22308 from tianon/dockerd-consistency 
Tweak hack/make/*-{client,daemon} to be consistent
 2016-04-26 15:32:06 +02:00
Ken Cochrane
f1ad6f127b Exclude .git directories from the source RPMS 
Ignore .git directory when creating debian sources

Added missing DOCKER_GITCOMMIT env variable to build-deb

Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
 2016-04-26 09:26:32 -04:00
Vincent Demeester
dc98cb534e Merge pull request #22321 from Microsoft/jstarks/revendor_ansiterm 
Windows: revendor Azure/go-ansiterm
 2016-04-26 08:19:47 +02:00
John Howard
78895c92c2 Merge pull request #22275 from Microsoft/jstarks/no_rsrc 
Windows: Add file version information
 2016-04-25 20:53:19 -07:00
Brian Goff
e2c40555f7 Merge pull request #22318 from mrunalp/mount_label_fix 
Fix mount label
 2016-04-25 19:54:32 -04:00
John Starks
fab67ab677 Windows: revendor Azure/go-ansiterm 
go-ansiterm was previously pulling the testing package into the docker
binaries.

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-04-25 15:57:59 -07:00
Mrunal Patel
e0f98c698b Update runc and spec dependencies for mount label 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>

Set up the mount label in the spec for a container

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-04-25 14:26:49 -07:00
Stefan J. Wernli
da92dad59f Adding servicing update to postRunProcessing for Windows containers. 
This change enables the workflow of finishing installing Windows OS updates in the container after it has completed running, via a special servicing container.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
 2016-04-25 12:16:26 -07:00
Tianon Gravi
626d25a7d9 Tweak hack/make/*-{client,daemon} to be consistent 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2016-04-25 11:40:36 -07:00
Tibor Vass
e974eadd94 Merge pull request #22303 from kencochrane/fix_integration_daemon_start 
Fixing the PATH in .integration-daemon-start to find dyn docker binary
 2016-04-25 14:39:45 -04:00
Ken Cochrane
5ee737c70c
Fixing the PATH in .integration-daemon-start to find dynamic docker binary 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
 2016-04-25 11:18:34 -04:00
Ken Cochrane
f9e03d52e9
Change name from docker-client to docker in dynbinary-client 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
 2016-04-25 10:44:37 -04:00
John Starks
4677f8036e Windows: Add file version information 
This change adds file version information to docker.exe and dockerd.exe by
adding a Windows version resource with the windres tool.

This change adds a dependency to binutils-mingw-w64 on Linux, but removes
a dependency on rsrc. Most Windows build environments should already have
windres if they have gcc (which is necessary to build dockerd).

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-04-24 10:55:51 -07:00
Tibor Vass
44ff216985 Add dockerd daemon binary to tgz and zip archives 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-04-23 18:26:05 -04:00
John Howard
27f44b8af6 Merge pull request #20639 from dnephin/split_client 
Split the binary into two: client and daemon
 2016-04-23 14:14:20 -07:00
Daniel Nephin
c0acfccc7b Cleanup from CR. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-23 15:05:15 -04:00
Ken Cochrane
f68b61052b Create the correct directory structure for apt-ftparchive. fixes #22238 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
 2016-04-22 16:28:49 -04:00
Michael Crosby
199472c75a Bump containerd to v0.2.1 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-22 09:39:02 -07:00
Daniel Nephin
9e7651db4d Build two binaries client and daemon. 
Add a proxy to support 'docker daemon'
Fix configFile option, and remove a test that is no longer relevant.
Remove daemon build tag.
Remove DOCKER_CLIENTONLY from build scripts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Change docker-daemon to dockerd.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-22 11:26:01 -04:00
Amit Krishnan
1c967911b9 Update godbus/dbus to v4.0.0 
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
 2016-04-19 14:51:55 -07:00
Vincent Demeester
04bb3a2f45
Vendoring engine-api to a2999dbd3471ffe167f2aec7dccb9fa9b016dcbc 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-04-19 15:50:20 +02:00
David Calavera
7fd53f7c71 Merge pull request #21657 from vdemeester/update-engine-api 
Update engine api with required arguments
 2016-04-18 19:47:22 -07:00
Alexander Morozov
1cd7dd8917 Merge pull request #22082 from tiborvass/revert-go-security-fix-for-windows 
Workaround Windows bug discovered with Go security fix
 2016-04-18 12:44:13 -07:00
Alexander Morozov
2b6d7f728e Merge pull request #22088 from amitkris/update_fsnotify 
Update fsnotify to v1.2.11
 2016-04-18 12:38:29 -07:00
Vincent Demeester
9b6c055f92 Merge pull request #22098 from thaJeztah/cherry-pick-21998 
cherry-pick "runc install path changed from /usr/local/bin to /usr/local/sbin"
 2016-04-18 11:09:55 +02:00
Madhu Venugopal
b1459f1b94 Vendoring libnetwork v0.8.0-dev.1 
- Fixes docker/docker#16964
- Added maximum egress bandwidth qos for Windows

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-04-17 11:17:48 -07:00
Tibor Vass
cbb6c6e959
runc install path changed from /usr/local/bin to /usr/local/sbin 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 3d85e51ef4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-04-17 01:36:53 +02:00
Amit Krishnan
ae75a7d3b2 Update fsnotify to v1.2.11 
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
 2016-04-15 18:40:07 -07:00
Tibor Vass
3b3e58b639 Workaround Windows bug discovered with Go security fix 
For context: https://github.com/golang/go/issues/15286

This commit downloads go1.5.3 in addition to go1.5.4 in order to
workaround the issue.

It is not expected to do a Docker release without a proper fix, however
this should help unblock Docker development on Windows TP5.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-04-15 21:00:45 -04:00
Thomas Tanaka
c892a8d620 DWZ problem with multiple golang binary caused OL7 RPM build to fail 
Refering to this: https://fedoraproject.org/wiki/PackagingDrafts/Go
this could be due to the following bug:
https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12

This fixes #22051

Signed-off-by: Thomas Tanaka <thomas.tanaka@oracle.com>
 2016-04-15 09:48:53 -07:00
Vincent Demeester
9802d7d10f Vendor engine-api with required arguments 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-04-15 10:11:05 +02:00
Natanael Copa
355ad33087 Fix detection of git commit during build from tarball 
Distro packagers will often use the tarball to build a package and have
the build script for the package in git. To avoid that the docker build
script picks up the git commit from the distro repo we also check for a
directory named .git before check for -unsupported builds.

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-04-14 17:30:18 +02:00
Brian Goff
40502e3813 Merge pull request #21949 from aaronlehmann/vendor-distribution-1622 
Vendor distribution to correct config blob media type in schema2 manifest
 2016-04-12 21:23:22 -04:00
Alexander Morozov
7b5a6844c2 Merge pull request #21943 from Microsoft/jstarks/utilityvm 
Windows: support embedded utility VM images
 2016-04-12 10:19:47 -07:00
Aaron Lehmann
c18d03a778 Vendor distribution to correct config blob media type in schema2 manifest 
@nwt noticed that the media type specified in the config section of a
schema2 manifest is application/octet-stream, instead of the correct
value application/vnd.docker.container.image.v1+json.

This brings in https://github.com/docker/distribution/pull/1622 to fix
this.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-04-11 17:29:17 -07:00
John Starks
15b0f06a9a Windows: Revendor Microsoft/hcsshim 
This change supports the importing of layers that contain utility VM
images. This is necessary to support Hyper-V containers running on a
non-centrally-managed image.

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-04-11 13:23:38 -07:00
Michael Crosby
45fb803316 Improve source for containerd/runc copy 
This improves getting the source for the binaries that are compiled on
the system so that they can be copied into the bundles output.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-11 12:02:01 -07:00
Santhosh Manohar
6dd2c33217 Vendor Libnetwork v0.7.0-rc.6 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-04-09 10:45:13 -07:00
John Starks
9b486999f2 Windows: revendor Microsoft/go-winio and Microsoft/hcsshim 
These changes add support for importing base layers and change the tar
metadata for Windows layers to better match the intent of the tar format.

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-04-07 17:52:27 -07:00
Tonis Tiigi
07fe6947a4 vendor: patch template init in trace pkg for performance 
Temporarily include a fork of golang/net package
that includes a performance patch. Measured performance
gain is ~60ms for every `docker run` command.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-04-07 11:02:14 -07:00
Tibor Vass
e82830ecde Merge pull request #21628 from clnperez/systemd-tasksmax-workaround 
Build-deb hack for systemd tasksmax
 2016-04-07 12:30:45 -04:00
Christy Perez
2b849e0263 Build-deb hack for systemd tasksmax 
Since we can't use the TasksMax value in the docker.service
file by default, we can uncomment it at buildtime.

See docker/docker/pull/21491 for some background.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
 2016-04-07 11:08:30 -05:00
Sebastiaan van Stijn
d82e522e36 Merge pull request #21810 from aboch/vnd 
Vendoring libnetwork v0.7.0-rc.4
 2016-04-06 14:18:33 -07:00
Vincent Demeester
5709f8e422 Merge pull request #21092 from WeiZhang555/fix-21064-detach-keys 
Client print error when specify wrong detach keys
 2016-04-06 22:14:14 +02:00
Alessandro Boch
8a957bafa5 Vendoring libnetwork v0.7.0-rc.4 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-04-06 12:18:21 -07:00
Tibor Vass
a79e79c58e Merge pull request #21780 from sanimej/libn-v0.7rc2 
Vendor Libnetwork v0.7.0-rc.3
 2016-04-06 13:54:21 -04:00
Santhosh Manohar
5b892819a6 Vendor Libnetwork v0.7.0-rc.3 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-04-05 22:01:19 -07:00
Tonis Tiigi
3f81b49352 Define readonly/mask paths in spec 
This vendors in new spec/runc that supports
setting readonly and masked paths in the 
configuration. Using this allows us to make an
exception for `—-privileged`.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-04-04 18:55:55 -07:00
Ken Cochrane
e7d54a4133 Fixed a typo in release.sh 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
 2016-04-04 09:27:14 -04:00
Zhang Wei
e1a4332c13 vendor engine-api 8924d6900370b4c7e7984b 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-04-04 15:32:26 +08:00
Tianon Gravi
b82fc524a7 Also generate "InRelease" files for newer APT clients 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2016-03-31 17:39:50 -07:00
Tibor Vass
3acb466f2d Merge pull request #21695 from kencochrane/change_tgz_to_zip_on_windows 
Change the windows bundle from a .tgz to a .zip file
 2016-03-31 18:40:37 -04:00