docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity
22,022 Commits 12 Branches 295 Tags
f6dfa135ec53797ffbc792df4d0684c0120ceb66
Commit Graph

1283 Commits

Author SHA1 Message Date
Jess Frazelle
8cc70508c1 Merge pull request #19980 from tonistiigi/fix-microsoft-vendor-dir 
Remove case sensitive duplicate dir in vendor
Upstream-commit: e74c07b947adf2d6d804068e4a647265e6e419f2
Component: engine
 2016-02-03 17:32:14 -08:00
Alexander Morozov
05cb58c519 Merge pull request #19972 from jfrazelle/fix-opensuse 
fix opensuse rpm
Upstream-commit: 57025bd58821a6972185fb4c0a5559289d769ef6
Component: engine
 2016-02-03 13:19:51 -08:00
Tonis Tiigi
f7ee374e15 Remove case sensitive duplicate dir in vendor 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b9a395c85de3f4ea10810c8df789fc67e5b4b604
Component: engine
 2016-02-03 13:06:32 -08:00
Jessica Frazelle
455910471d fix opensuse rpm 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 1cbd77262987d821a675f51da1213c7bf171e05b
Component: engine
 2016-02-03 10:34:17 -08:00
Amit Krishnan
79d176ce8a bump logrus to v0.9.0 
Signed-off-by: Amit Krishnan <amit.krishnan@oracle.com>
Upstream-commit: 408092e56b7859d54138e82575a33bcfcb5fcaad
Component: engine
 2016-02-02 17:53:51 -08:00
Brian Goff
eb79a73a95 Merge pull request #19889 from Microsoft/jjh/reliabilitytake2 
Windows CI: TP4 reliability hack
Upstream-commit: a39ad952ec1efc3b7536d3d8a93e96a22cd1818b
Component: engine
 2016-02-01 22:30:51 -05:00
Brian Goff
52763c5ef6 Merge pull request #19902 from Microsoft/jstarks/revendor_hcsshim_fix_docker_crash 
Revendor Microsoft/hcsshim and vendor Microsoft/go-winio
Upstream-commit: a034ac66eb766891676d1417826756870185de40
Component: engine
 2016-02-01 22:30:08 -05:00
John Howard
e2603dbc62 Windows CI: TP4 reliability hack 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2ebcb48cf1b4f883260b62f687e2c54926749b68
Component: engine
 2016-02-01 18:02:57 -08:00
John Starks
07bdbb1537 Revendor Microsoft/hcsshim and vendor Microsoft/go-winio 
This update changes the way hcsshim invokes Windows DLLs to avoid races
with the garbage collector. It also now uses go-winio to access the
pipes used for communication with processes running in the container;
this reduces the number of threads used by docker.exe, improving
scalability.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 7ccc0e2101a66e0621faf1f043bf7cd5515501d5
Component: engine
 2016-02-01 23:11:25 +00:00
Alessandro Boch
bd6ac00111 Vendoring libnetwork 0.6.0-rc7 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: b80f761b141cf88c506f40b3e439cbe7a011c5d9
Component: engine
 2016-02-01 14:52:18 -08:00
Alessandro Boch
1fc2a011dc Vendoring libnetwork 0.6.0-rc6 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: f943fd7d2427fbf893b9e0795528500fc99081b8
Component: engine
 2016-01-30 20:03:03 -08:00
Jess Frazelle
0063d9bddd Merge pull request #19735 from jfrazelle/add-repo-scripts 
add scripts to clean experimental rpms and debs
Upstream-commit: c006c0261159224675397162aa3a03d9adbb180b
Component: engine
 2016-01-29 15:52:18 -08:00
Govinda Fichtner
9512e36135 add support for building first ARM debian package 
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
Upstream-commit: 7b31ed432ee2fa95938d64dc76c982e52cd00330
Component: engine
 2016-01-29 00:21:17 +01:00
Jessica Frazelle
f35ef7f96a add scripts to clean experimental rpms and debs 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 9ca8386c5720d887f6c22b657324e9fc6ff2487d
Component: engine
 2016-01-27 15:54:53 -08:00
Jess Frazelle
5ca7c24367 Merge pull request #19747 from cpuguy83/nogc 
Turn off GC during `make binary`
Upstream-commit: 07312af8fa160c1c87558288e1de9d309b1e9c90
Component: engine
 2016-01-27 15:02:38 -08:00
Brian Goff
259365d60a Add DOCKER_BUILD_GOGC to tweak GOGC for compile 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9672afa3391119b3b06d87735041168b01b7f1da
Component: engine
 2016-01-27 13:35:26 -05:00
cyli
ee8542db2e Include a new version of notary with less verbose INFO+ logging 
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 71a1caddf0af51cfc79db04f80513b292adb0231
Component: engine
 2016-01-27 09:46:26 -08:00
Jess Frazelle
0da34ddb69 Merge pull request #19760 from cyli/re-vendor-notary 
Re-vendor Notary and docker/go
Upstream-commit: c39c7e6edf7d432730a84fa549b74203954b54c4
Component: engine
 2016-01-27 09:36:26 -08:00
Brian Goff
7383a82de4 Merge pull request #19071 from icecrime/incremental_builds 
Enable incremental builds
Upstream-commit: ae14e6cc0ab24b57e7a6873ece7263bb6cc6aa44
Component: engine
 2016-01-27 11:21:01 -05:00
Arnaud Porterie
50846c5d05 Enable incremental builds 
Remove the `-a` build flag and introduce `-i` in order to reuse
previously compiled dependencies.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 1445e4db32e648277470513213473021ca59010a
Component: engine
 2016-01-26 21:24:44 -08:00
cyli
65cf98bf38 Re-vendor notary, as well as change jfrazelle/go to docker/go. 
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 8fd2c8791d9c7cf0dd28b77565f0a04349a8c9a2
Component: engine
 2016-01-26 18:02:00 -08:00
Tibor Vass
75b4488b94 Merge pull request #19751 from crosbymichael/update-libcontainer-jan26 
Update libcontainer to 3d8a20bb772defc28c355534d83
Upstream-commit: 3eaf878999553cebc5b77e5f835f017793991b9a
Component: engine
 2016-01-26 16:57:49 -08:00
Sebastiaan van Stijn
272aadc7e6 Merge pull request #19150 from mikedougherty/cs-108-rpm-release 
[CS-108] Adjust version string processing for RPM build
Upstream-commit: 4bcb6c7fc8758ad390a634a270cda66a8c98c9f3
Component: engine
 2016-01-26 15:22:14 -08:00
Michael Crosby
a7727691d8 Update libcontainer to 3d8a20bb772defc28c355534d83 
Fixes #14203

This bump fixes the issue of having the container's pipes connection
reset by peer because of using the json.Encoder and having a \n added to
the output.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7b5896702bd2951541af27925620172edb5d3505
Component: engine
 2016-01-26 15:00:07 -08:00
Mike Dougherty
f352b24e50 Adjust version string processing for RPM build 
This will only trim off the last '-' separated token to be checked for
RC status. This allows including a 'cs#' token in the version string.

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
Upstream-commit: 04100233679124a2d0b6c622cec81954f3aaf38d
Component: engine
 2016-01-26 11:49:59 -08:00
Jana Radhakrishnan
bed434b1dc Vendoring libnetwork v0.6.0-rc5 
- Cleanup stale overlay sandboxes

Fixes #19694

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 730a6d2fc22f9efdb18a79b39935f1438a5e5f84
Component: engine
 2016-01-26 11:44:43 -08:00
Jess Frazelle
aa78ebdfe7 Merge pull request #19013 from hqhq/add_support_docker_aarch64 
Add support for build and test docker on arm64
Upstream-commit: b5420be597ea9ce6a0ea7f544a141711289cd3da
Component: engine
 2016-01-26 10:33:48 -08:00
Arnaud Porterie
eed5e0f1c7 Merge pull request #19705 from mavenugo/18222 
Vendor libnetwork v0.6.0-rc4 & corresponding changes in engine for port-map sandobx handling.
Upstream-commit: 269a6d7d3656fe7edf7cb630125ee4664dd24c78
Component: engine
 2016-01-26 09:16:57 -08:00
Aleksa Sarai
7bc1dfc4e5 vendor: update engine-api 
This removes all references to InitPath and InitSha1, as well as pulling
in a few other minor engine-api fixes.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: 71c63aa72e3788af27fef0de9005cde6c7728a2b
Component: engine
 2016-01-27 00:34:31 +11:00
Aleksa Sarai
4edafc3bc1 *: purge dockerinit from source code 
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: 4357ed4a7363a1032edf93cf03232953c805184f
Component: engine
 2016-01-26 23:47:02 +11:00
Madhu Venugopal
36c72742b4 Vendor libnetwork v0.6.0-rc4 
- Add Endpoints() API to Sandbox interface
- Fixes #19677

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 7029d9e6ad766492c2619084c13a8ef88167eddf
Component: engine
 2016-01-25 19:51:21 -08:00
Madhu Venugopal
bd05e8f1c1 Vendor libnetwork v0.6.0-rc3 
- Fixes docker/docker#19576
- Fixed embedded DNS to listen in TCP as well
- Fixed a race-condition in IPAM to choose non-overlapping subnet for concurrent requests

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 6ac9a2f410ad506204faf8f22fc502dc780e3986
Component: engine
 2016-01-25 13:22:47 -08:00
Jessica Frazelle
e59c1e2d2f add trailing slash 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0f379fab3195f70f8e565d1deab6051828254a6e
Component: engine
 2016-01-25 09:01:46 -08:00
John Howard
285dba59c1 Windows CI: In container logic flaw 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5601fc8507d9edb4eb764b7337866ea04f44be54
Component: engine
 2016-01-24 09:22:50 -08:00
Paul Liljenberg
bfaa6f239b Fixes #19614 
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
Upstream-commit: 0c7201ee736f77e63cd1f191dfd6a3cf549b6def
Component: engine
 2016-01-24 10:28:18 +01:00
Sebastiaan van Stijn
dd594705a0 Merge pull request #19579 from cyphar/hotfix-vendor-libcontainer 
Hotfix vendor libcontainer
Upstream-commit: 6d1455e74b388faeae0f90379b8aa908afed0bf7
Component: engine
 2016-01-22 16:46:04 -08:00
Jess Frazelle
fba580f28b Merge pull request #19146 from mikedougherty/cs-105-download-script 
Create a bundle for the install script to support other domains
Upstream-commit: 21ec6d3789b93aad5788785cf4be4a2445044375
Component: engine
 2016-01-22 09:25:24 -08:00
Tibor Vass
17026542ae Merge pull request #19573 from sanimej/libn 
Vendor in libnetwork v0.6.0-rc2
Upstream-commit: a9fc4939dfd864bc2ab2c9bc1dc0211feb03ec65
Component: engine
 2016-01-22 12:07:40 -05:00
Tibor Vass
4b43f56b91 Merge pull request #19488 from hypriot/enable-docker-trust-suite-on-arm 
Enable DockerTrustSuite for ARM again
Upstream-commit: cba7ba25f4358c86aee4872186d9dfd2fc3dc0fd
Component: engine
 2016-01-22 11:23:19 -05:00
Aleksa Sarai
2aed85b059 vendor: *: update libcontainer 
This fixes a security vulnerability in Docker, which can cause a DoS
under certain circumstances. This is from the hotfix branch, so the
vendored commit is actually bf899fef451956be4abd63de6d6141d9f9096a02 in
runc master.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: 40b5eebb0b8f34cb3f6a3e6a83cac1b3a34a1d29
Component: engine
 2016-01-22 20:15:09 +11:00
Santhosh Manohar
0704f515fb Vendor in libnetwork v0.6.0-rc2 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 02c9d48144c0523d59fe4ba1c0b645c17fd05f80
Component: engine
 2016-01-21 20:46:28 -08:00
Mike Dougherty
d0c4b1bf31 Create a bundle for the install script to support other domains 
For the CS Engine we need to have an install script like OSS does, but
the locations are all different, as is the GPG key used. This is
accomplished here by slightly altering the script itself and adding a
simple 'sed' based bundle for make.sh.

This install script is used in to change the URLs instead of sed in
release.sh.

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
Upstream-commit: 51dad1185a8dcf55f2e3473b79748e0e72c6590c
Component: engine
 2016-01-21 20:42:20 -08:00
Jess Frazelle
a7b9f6d573 Merge pull request #19316 from Microsoft/jjh/incontainererror 
Windows: In container build check
Upstream-commit: e287bef453f2b4419a26e9bfa94987f13aa8376f
Component: engine
 2016-01-21 13:44:19 -08:00
Tibor Vass
9b2be4c8e0 Merge pull request #19552 from aaronlehmann/vendor-distribution-3 
Vendor updated distribution package
Upstream-commit: 3ecba7089be0fec32ab46f3bf55deb7878562b6d
Component: engine
 2016-01-21 16:21:59 -05:00
John Howard
fb1bb8a419 Windows: In container build check 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4dbd612d474317fdd7bd983f2d1a05654c2ceaad
Component: engine
 2016-01-21 13:15:23 -08:00
Aaron Lehmann
e43ee5b6f8 Vendor updated distribution package 
Another day, another revendor.

This revision of distribution is more tolerant of incorrect Content-Type
headers when fetching manifests.

Fixes #19526

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 921eae9d6d028187daff7521740977b07414b631
Component: engine
 2016-01-21 11:01:14 -08:00
Tibor Vass
5f04a8c8b6 Merge pull request #19349 from jfrazelle/add-link-to-wiki 
add warning if upgrading via script to migrate
Upstream-commit: 5f9375cf390b9a0ea04aba8b6bafa83a8879cb65
Component: engine
 2016-01-21 12:51:25 -05:00
Tibor Vass
128e0a1c5a Merge pull request #19423 from jfrazelle/apparmor-no-install 
disable install of docker-engine for 1.10, try to get ready for 1.11
Upstream-commit: 7d19ca7c40bc2b5172854ce073a6d11175027d82
Component: engine
 2016-01-21 12:08:50 -05:00
David Calavera
4787976da3 Merge pull request #19522 from aaronlehmann/vendor-distribution-2 
Vendor updated distribution
Upstream-commit: 8c0dd9d1821fe99fa720de84a4bf96e6fb50f94b
Component: engine
 2016-01-21 08:15:41 -08:00
Jess Frazelle
bc39a3fed6 Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb 
Cleanup build rpm deb
Upstream-commit: 5537a92e450ea56e2002f83ff50bb70fdb2cc25e
Component: engine
 2016-01-20 23:58:33 -08:00