p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
24,175 Commits 2 Branches 295 Tags
e7146eaec9b04ceed6d25acefa8a50b0929cfe3a
Commit Graph

1532 Commits

Author SHA1 Message Date
Alexander Morozov
687f64e55c Merge pull request #22679 from cyli/bump-notary-version 
Bump notary version up to 0.3.0 and re-vendor.
Upstream-commit: c95f1fcbd9d6acc02c9af5fd62d21921b0150cd2
Component: engine
 2016-05-12 14:38:07 -07:00
cyli
f15ebde7e0 Bump notary version up to 0.3.0 and re-vendor. 
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 6094be63ac3d29c23024daa2152719b653c78092
Component: engine
 2016-05-11 22:57:51 -07:00
Qiang Huang
ac0ab24166 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>
Upstream-commit: ed868a2e119ded10cdc794e2d109210c8a6b0546
Component: engine
 2016-05-12 09:19:23 +08:00
Arnaud Porterie
3f6678c440 Merge pull request #22262 from kencochrane/fix_release_deb 
Create the correct directory structure for apt-ftparchive
Upstream-commit: dc430944b9682b0f46806dcb7bd733d25e2b6f31
Component: engine
 2016-05-11 12:38:12 -10:00
Tibor Vass
624bb38952 Merge pull request #21708 from tianon/InRelease 
Also generate "InRelease" files for newer APT clients
Upstream-commit: e421668b1bdd611e49cd268341e75d9f5e8801c2
Component: engine
 2016-05-11 13:21:15 -04:00
Alexander Morozov
958502d650 Merge pull request #22642 from amitkris/uprev_gozfs 
update go-zfs to include Solaris support
Upstream-commit: da74f9653dc11c28e0b70267a2882628945051e9
Component: engine
 2016-05-11 07:41:17 -07:00
Amit Krishnan
3314e541a1 update go-zfs to include Solaris support 
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
Upstream-commit: efb3946171ffa30b716a0614e8037c6b0e699771
Component: engine
 2016-05-10 13:51:03 -07:00
Michael Crosby
820ddc1c92 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>
Upstream-commit: 4e290986cdf08a34ad508473bab702793503fa6b
Component: engine
 2016-05-09 15:21:41 -07:00
Michael Crosby
783763f84c Update runc and containerd deps 
containerd:     57b7c3da915ebe943bd304c00890959b191e5264
runc:           d49ece5a83da3dcb820121d6850e2b61bd0a5fbe

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: cfb976438677b15ec023b2ad4822bf1b2f63cc8f
Component: engine
 2016-05-09 15:05:44 -07:00
Alexander Morozov
b2727a10c2 Merge pull request #22317 from cyli/bump-notary-version 
Bump notary version to v0.3.0-RC1
Upstream-commit: a603fa33d52144ccf5578d8f499c1406612bfc36
Component: engine
 2016-05-06 12:54:53 -07:00
Alexander Morozov
a92471514e Merge pull request #22076 from thtanaka/rpmbuild-error 
DWZ problem with multiple golang binary caused OL7 RPM build to fail
Upstream-commit: ebc5a615931fa6a4beb6f55d04e3969380f308d9
Component: engine
 2016-05-06 11:22:27 -07:00
Alexander Morozov
f9129f7641 Merge pull request #22236 from kencochrane/remove_git_from_rpm 
Exclude .git directories from the source RPMS and debian packages
Upstream-commit: 4531c01509602a6be3741d1999fc2f5b77c16718
Component: engine
 2016-05-06 11:16:12 -07:00
cyli
67162abf1a Bump notary version to v0.3.0-RC1 
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 88c6675ed2d61dfb56434dd15391f01147abc5e6
Component: engine
 2016-05-06 10:59:26 -07:00
Mrunal Patel
b07f1e75d0 Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 97d95604e0f2ac259d60257db0282561e5f52d03
Component: engine
 2016-05-05 18:36:09 -04:00
Vincent Demeester
45f5ea437e Merge pull request #22519 from mlaventure/add-dockerd-to-rpm-packaged-files 
Add dockerd to the list of files included in generated rpms
Upstream-commit: af916d316af19bcfa17619c6bf84dcc0fa69cb7a
Component: engine
 2016-05-05 13:16:06 +02:00
Vincent Demeester
940b2e7c3c Merge pull request #22270 from runcom/too-many-login 
distribution: errors: do not retry if too many login attempts
Upstream-commit: 4de672690ce10bf106387bd40d536bc19350345f
Component: engine
 2016-05-05 09:44:09 +02:00
Kenfe-Mickael Laventure
91d4a233cd Add dockerd to the list of files included in generated rpms 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 6118952e449bb70bcc06e9d342affc593262a44e
Component: engine
 2016-05-04 20:45:22 -07:00
Tibor Vass
a6ae3cf211 Merge pull request #22403 from mlaventure/fix-docker-build-pkgs 
Update build-deb to make correct use of DOCKER_BUILD_PKGS
Upstream-commit: 0c68402887f7403f4fa7a6abccd3181f5f66d75d
Component: engine
 2016-05-04 17:55:20 -04:00
Antonio Murdaca
6912e449fb vendor docker/distribution 9ec0d742d69f77caa4dd5f49ceb70c3067d39f30 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 305ebfda8bc39b39f018d06a554245872b1ff63a
Component: engine
 2016-05-04 18:57:35 +02:00
Kenfe-Mickael Laventure
d72bbfcb65 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>
Upstream-commit: 20e1b9593ee1d23c5df7c78903d27a72cee711e8
Component: engine
 2016-05-02 11:22:01 -07:00
Brian Goff
1db5f40a10 Update engine-api 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 988f48164346f5cae713c630d884089958748238
Component: engine
 2016-05-02 14:17:40 -04:00
Brian Goff
6f46f75951 Merge pull request #22367 from dnephin/fix_dockerd_lookup_and_warn 
Fix lookup of dockerd when called from outside of $PATH
Upstream-commit: ba6209f7448865885519face97b1ffe30396939e
Component: engine
 2016-05-02 13:58:57 -04:00
Daniel Nephin
86a8cdbb4b Raise a more relevant error when dockerd is not available on the platform. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8983d42988ad59f1a19a0f4e9e88dfec8b1be690
Component: engine
 2016-05-02 11:59:25 -04:00
Vincent Demeester
e7d7019314 Vendor engine-api with pull fixes 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: ba901bb062d8f1fbc7cc8d9fae5b7365afb66e69
Component: engine
 2016-04-30 17:24:25 +02:00
John Starks
4fa4d37ded 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>
Upstream-commit: 57aef3b49025aac6bb084491478eb461b14b9109
Component: engine
 2016-04-26 14:04:47 -07:00
John Howard
7882678c17 Make dockerd debuggable 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 0c7eab31577d65f0d33766af533144e358ffe651
Component: engine
 2016-04-26 09:35:22 -07:00
Vincent Demeester
3d056fb569 Merge pull request #22308 from tianon/dockerd-consistency 
Tweak hack/make/*-{client,daemon} to be consistent
Upstream-commit: dc7664d62e4e758ba1a532dca578f53880faa388
Component: engine
 2016-04-26 15:32:06 +02:00
Ken Cochrane
aafad00038 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>
Upstream-commit: f1ad6f127bf83dfd549166120d16fceea7c9b3e6
Component: engine
 2016-04-26 09:26:32 -04:00
Vincent Demeester
7239ebb0f7 Merge pull request #22321 from Microsoft/jstarks/revendor_ansiterm 
Windows: revendor Azure/go-ansiterm
Upstream-commit: dc98cb534e1ac2375112db56f5c98dd08010c4dc
Component: engine
 2016-04-26 08:19:47 +02:00
John Howard
b0763649ac Merge pull request #22275 from Microsoft/jstarks/no_rsrc 
Windows: Add file version information
Upstream-commit: 78895c92c2baab420ae73322cc3d15009efa221e
Component: engine
 2016-04-25 20:53:19 -07:00
Brian Goff
3500c1d298 Merge pull request #22318 from mrunalp/mount_label_fix 
Fix mount label
Upstream-commit: e2c40555f76c0fddff8e17f7930ad90d4cf375b8
Component: engine
 2016-04-25 19:54:32 -04:00
John Starks
db3db29c9f 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>
Upstream-commit: fab67ab677e14c908f879e362f8805c8e91570c6
Component: engine
 2016-04-25 15:57:59 -07:00
Mrunal Patel
3ee9fe57f8 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>
Upstream-commit: e0f98c698b49e3790fe63bff611eeda6f5b46055
Component: engine
 2016-04-25 14:26:49 -07:00
Stefan J. Wernli
452a7d0ba9 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>
Upstream-commit: da92dad59f76421a22a955d2aed25bfeb4562385
Component: engine
 2016-04-25 12:16:26 -07:00
Tianon Gravi
d2c52f7016 Tweak hack/make/*-{client,daemon} to be consistent 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 626d25a7d94aa05427ecb85ba73bad1e8738c57b
Component: engine
 2016-04-25 11:40:36 -07:00
Tibor Vass
bdb0102fb8 Merge pull request #22303 from kencochrane/fix_integration_daemon_start 
Fixing the PATH in .integration-daemon-start to find dyn docker binary
Upstream-commit: e974eadd949c5d7cb91a7d4406c2e0da8b1db677
Component: engine
 2016-04-25 14:39:45 -04:00
Ken Cochrane
c3c0a0ed24 Fixing the PATH in .integration-daemon-start to find dynamic docker binary 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: 5ee737c70c7b8f7a0a915ca048538ee12cf1d737
Component: engine
 2016-04-25 11:18:34 -04:00
Ken Cochrane
33e8b136d5 Change name from docker-client to docker in dynbinary-client 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: f9e03d52e9b4b80cf869f0c279278dcb8340f585
Component: engine
 2016-04-25 10:44:37 -04:00
John Starks
f103a2320b 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>
Upstream-commit: 4677f8036e8d090303ef76cbbe4f703d5c85d752
Component: engine
 2016-04-24 10:55:51 -07:00
Tibor Vass
63034168e4 Add dockerd daemon binary to tgz and zip archives 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 44ff21698580052d037f7b84ef76b7a94567d012
Component: engine
 2016-04-23 18:26:05 -04:00
John Howard
95f6733644 Merge pull request #20639 from dnephin/split_client 
Split the binary into two: client and daemon
Upstream-commit: 27f44b8af63d563f53c04b342cbafc3b8f27cb45
Component: engine
 2016-04-23 14:14:20 -07:00
Daniel Nephin
f856b40438 Cleanup from CR. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c0acfccc7be6c49bf243821e535dfe1122ff5a52
Component: engine
 2016-04-23 15:05:15 -04:00
Ken Cochrane
7b511aec8e Create the correct directory structure for apt-ftparchive. fixes #22238 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: f68b61052ba12a0387eb0a761f05ccd16c4c3105
Component: engine
 2016-04-22 16:28:49 -04:00
Michael Crosby
de7c442d63 Bump containerd to v0.2.1 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 199472c75a8e0c60108399de2da0247af1a0bdab
Component: engine
 2016-04-22 09:39:02 -07:00
Daniel Nephin
dcd6f9747a 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>
Upstream-commit: 9e7651db4d464649bc32cf346fdee8c6900ebe0f
Component: engine
 2016-04-22 11:26:01 -04:00
Amit Krishnan
2a1aa1222c Update godbus/dbus to v4.0.0 
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
Upstream-commit: 1c967911b979040a6316050b3c00d89e17cb4cb1
Component: engine
 2016-04-19 14:51:55 -07:00
Vincent Demeester
f4a20799d2 Vendoring engine-api to a2999dbd3471ffe167f2aec7dccb9fa9b016dcbc 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 04bb3a2f45de32794a031f09dbe03fdbba711906
Component: engine
 2016-04-19 15:50:20 +02:00
David Calavera
f8a8c81f4e Merge pull request #21657 from vdemeester/update-engine-api 
Update engine api with required arguments
Upstream-commit: 7fd53f7c711474791ce4292326e0b1dc7d4d6b0f
Component: engine
 2016-04-18 19:47:22 -07:00
Alexander Morozov
51b831f818 Merge pull request #22082 from tiborvass/revert-go-security-fix-for-windows 
Workaround Windows bug discovered with Go security fix
Upstream-commit: 1cd7dd89175bea9a89c433093180e5aa3c8f04b3
Component: engine
 2016-04-18 12:44:13 -07:00
Alexander Morozov
c341b1945f Merge pull request #22088 from amitkris/update_fsnotify 
Update fsnotify to v1.2.11
Upstream-commit: 2b6d7f728e163a82b3114c819bc7785ad22b5756
Component: engine
 2016-04-18 12:38:29 -07:00