1
0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Commit Graph

17226 Commits

Author SHA1 Message Date
Alexander Morozov
67bf5ba305 Replace GenerateRandomID with GenerateNonCryptoID
This allow us to avoid entropy usage in non-crypto critical places.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6bca8ec3c9ccc169c53b3d7060fe5c8ba8670aac
Component: engine
2015-07-28 22:31:01 -07:00
Alexander Morozov
5ca33487e4 Add GenerateNonCryptoID function to avoid entropy exhaustion
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 4553b6af4badd3e182204ed2178348b894688460
Component: engine
2015-07-28 22:31:01 -07:00
Alexander Morozov
6876cc1bf2 Add global instance of *(math/rand).Rand and Reader
You can read random bytes from Reader without exhausting entropy.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6963b9c71694509d8511264655f05c203f5b8f97
Component: engine
2015-07-28 22:30:57 -07:00
Alexander Morozov
a011b8f810 Merge pull request #14848 from hqhq/hq_golint_execdriver
Fix golint warnings for daemon/execdriver/*
Upstream-commit: f8090371280a23c430342a43ca99bb777c5f2318
Component: engine
2015-07-28 14:23:22 -07:00
Alexander Morozov
427bfbd915 Merge pull request #14824 from fcantournet/lint_pkg_mflag
Fix golint for pkg/mflag
Upstream-commit: 2c162292b7f6bbbcf392795c8fd1baf302dbc5ab
Component: engine
2015-07-28 13:51:09 -07:00
Alexander Morozov
a9c5ed7c39 Merge pull request #14818 from MHBauer/volume-lint
lint for volume/*
Upstream-commit: 9cfc223cc06142376e6d94e7f0554f539a68ee68
Component: engine
2015-07-28 13:42:18 -07:00
Sebastiaan van Stijn
2d57408e26 Merge pull request #15082 from ChanderG/master
Add link to Systemd article in Debian Jessie docs, fix typo
Upstream-commit: bfbac726c774a3a9cf308555aa01b96e7129bf1f
Component: engine
2015-07-28 22:35:48 +02:00
Chander G
153ab403d4 Add link to Systemd article, fix typo
Signed-off-by: Chander G <chandergovind@gmail.com>
Upstream-commit: b9e6be25d1afbf04a3455ff55394bd9037238b2c
Component: engine
2015-07-29 01:54:44 +05:30
Jessie Frazelle
fb177a237a Merge pull request #14863 from brahmaroutu/lint_daemon_graphdriver_aufs
daemon/graphdriver/aufs fix lint errors/warnings
Upstream-commit: e06df594f5a449572d6807788f30a0240048b6a2
Component: engine
2015-07-28 11:46:40 -07:00
Jessie Frazelle
07a198d3da Merge pull request #14932 from brahmaroutu/lint_daemon_graphdriver_graphtest
daemon/graphdriver/graphtest/ fix lint errors/warnings
Upstream-commit: be60047b43ae856fedc484a9349e5756922ae84b
Component: engine
2015-07-28 11:20:33 -07:00
Sebastiaan van Stijn
3e2d264192 Merge pull request #15096 from kolyshkin/doc-fixes-2
daemon.md: do fix placement of exec driver heading
Upstream-commit: f989d68014d876e3fe83f3dc2cb92a4292933253
Component: engine
2015-07-28 20:10:11 +02:00
Kir Kolyshkin
48c1e253ec daemon.md: do fix placement of exec driver heading
Options for zfs storage driver were incorrectly placed
under 'exec driver options' header. Move the header to
the correct place.

Now, this is the second time I am fixing this. First time
it was commit 68efb27, but the following commit 9af7afb
screwed it up again, so the header appears twice now.

Get rid of the the wrong one.

Cc: David Calavera <david.calavera@gmail.com>
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Upstream-commit: f52514a03888441a51aac677054958516b2ae43f
Component: engine
2015-07-28 10:58:17 -07:00
Morgan Bauer
cdd8f67046 lint fixes for volume/*
- comments on exported values
 - constant string replaced by constant reference
 - unexport implementation details of VolumeDriver 'local'
 - add fixed packages to linter list

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 9af963aba032d65bb37eafbbe7cafedfc234edf6
Component: engine
2015-07-28 10:40:44 -07:00
David Calavera
f032e7748f Merge pull request #15094 from Microsoft/10662-fixvendorhelper
Windows: Fix vendor-helpers.sh
Upstream-commit: c473ae14fd242d028d51e5848c8d3fb7c86d0d07
Component: engine
2015-07-28 10:17:30 -07:00
John Howard
6e04af4b2f Windows: Fix vendor-helpers.sh
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 663d50464e1932f924e875244783718699ca559f
Component: engine
2015-07-28 10:13:33 -07:00
Félix Cantournet
3f76e1b38f Fix golint for pkg/mflag
Signed-off-by: Félix Cantournet <felix.cantournet@cloudwatt.com>
Upstream-commit: 8e6ad2171a2fbf51d127326c215608475c031b41
Component: engine
2015-07-28 15:32:42 +02:00
moxiegirl
17679ada6b Merge pull request #14713 from moxiegirl/remove-boot2docker-14563
Remove references to boot2docker replace with docker-machine
Upstream-commit: 3a7b4230b2af1d44897499fee3c18f6b8e6ecde0
Component: engine
2015-07-28 06:05:29 -07:00
Srini Brahmaroutu
7f7157de05 daemon/graphdriver/aufs fix lint errors/warnings
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 55885daa56a0278ed5b412497b3bf99f52d6c52e
Component: engine
2015-07-28 06:17:05 +00:00
Srini Brahmaroutu
39dd67d7c5 daemon/graphdriver/graphtest/ fix lint errors/warnings
Addresses #14756

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 12460f41a462b441d40db1a70165f7854f3fb77a
Component: engine
2015-07-28 06:01:00 +00:00
Mary Anthony
06f659e1d1 Remove references to boot2docker replace with docker-machine
- boot2docker is deprecated in the 1.8.0
- docker-machine replaces it
- this fixes #14563
- Updating with thaJetzah comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 1825e06944db20ec677aa8d26b36e9036b0dd257
Component: engine
2015-07-27 18:25:50 -07:00
Jessie Frazelle
6b7f5ef206 Merge pull request #14694 from Microsoft/10662-apparmorprofile
Windows: Factoring out unused fields
Upstream-commit: 4ed3e3a5b26a365e9b270011b0ba2b772fb98ab9
Component: engine
2015-07-27 18:18:54 -07:00
John Howard
5acbf86531 Windows: Factoring out unused fields
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 47c56e4353792e16f994a35ea4063768bee6590e
Component: engine
2015-07-27 17:44:18 -07:00
Qiang Huang
1322d4be91 Add daemon/execdriver/* to validate-lint
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 4862d723a445fd647a7e4a8ac0697043bc23fab4
Component: engine
2015-07-28 08:44:12 +08:00
Qiang Huang
f2ac9ec822 Fix golint warnings for daemon/execdriver/*
Addresses: #14756

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 3d17c3bb663a5d7a65bd39a5ef32cb4668b48c53
Component: engine
2015-07-28 08:43:22 +08:00
Tibor Vass
aa4344fe9d Merge pull request #15067 from aaronlehmann/term-windows-golint
Fix golint nit in term_windows.go
Upstream-commit: 8ad1d3fec6ebfeede24ddf888c14a1e0dfc21c06
Component: engine
2015-07-27 20:43:18 -04:00
Aaron Lehmann
6ceeb0ed2b Fix golint nit in term_windows.go
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 35e498beca13de4ef8cecf45c0d132cc38daf0d5
Component: engine
2015-07-27 17:40:49 -07:00
Jessie Frazelle
809c751de2 Merge pull request #14838 from Microsoft/10662-ansirewrite
Windows: CLI Improvement (TP3)
Upstream-commit: 33358f80e592686bb1872d9d50a4dd1e0391487f
Component: engine
2015-07-27 17:30:14 -07:00
Jessie Frazelle
6075d6d732 Merge pull request #15034 from aaronlehmann/update-vendored-distribution
Update vendored distribution repo to new version
Upstream-commit: f32cab874c73c6c73629bc1227bc7adc35c15258
Component: engine
2015-07-27 17:24:35 -07:00
Jessie Frazelle
6ffaac6b6e Merge pull request #15062 from chrisseto/master
Skip DockerSuite.TestExecResizeImmediatelyAfterExecStart on lxc
Upstream-commit: f3c23fc463f562da742d3888dd929a164cfe74a0
Component: engine
2015-07-27 17:20:20 -07:00
Chris Seto
6f7ccf2956 Skip DockerSuite.TestExecResizeImmediatelyAfterExecStart on lxc
Signed-off-by: Chris Seto <chriskseto@gmail.com>
Upstream-commit: 83cb28857551d0077b3877d1de1c3c44a39da705
Component: engine
2015-07-27 19:20:15 -04:00
Jessie Frazelle
dde2806e53 Merge pull request #15059 from calavera/fix_overlay_comments_typo
Fix typo in overlay's create godoc.
Upstream-commit: 7886056d74f902a82b56e1f3bf1a27cc70952bbe
Component: engine
2015-07-27 15:40:22 -07:00
David Calavera
b123b9f21b Fix typo in overlay's create godoc.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 5bac5302e59f0759545910ef748cc9a6f87db5c5
Component: engine
2015-07-27 15:37:26 -07:00
Jessie Frazelle
3d5c90498b Merge pull request #14759 from vdemeester/pkg-golint
golint on some pkg/* packages
Upstream-commit: 25c42cc0d0a83325817e5fdb8fa654c9e5ab54d5
Component: engine
2015-07-27 15:19:46 -07:00
Michael Crosby
e075bafeec Merge pull request #15039 from jlhawn/fix_build_context_is_symlink
[api/client] Fix build when context dir is symlink
Upstream-commit: bdc55be9b49bd4cdcc9373e2eb847b133532cedc
Component: engine
2015-07-27 15:11:36 -07:00
Jessie Frazelle
3363c19f5c Merge pull request #15055 from calavera/log_release_steps
Log each release step.
Upstream-commit: 72afd792fd8dd080fa0fd6146ab78f334f697545
Component: engine
2015-07-27 15:03:29 -07:00
Jessie Frazelle
fc3779e694 Merge pull request #15051 from LK4D4/32bit_const
Use math.MaxInt32 instead of math.MaxUint32
Upstream-commit: 0fe564cbb6768c315da4f9476e8e035bac96d465
Component: engine
2015-07-27 15:02:40 -07:00
Jessie Frazelle
8743c4baf2 Merge pull request #14751 from vdemeester/runconfig-lint
golint fixes on runconfig
Upstream-commit: 542de786c2600f5936224308d293d25a588513a4
Component: engine
2015-07-27 15:01:08 -07:00
David Calavera
cf128458c4 Log each release step.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 776600fabbf52d21a061a9021011774d23df9b67
Component: engine
2015-07-27 14:28:05 -07:00
Sebastiaan van Stijn
ddd991a6be Merge pull request #14963 from MHBauer/plugins-links
Fix Plugins links
Upstream-commit: e5af7a0e869c0a66f8ab30d3a90280843b9999e0
Component: engine
2015-07-27 23:25:48 +02:00
Jessie Frazelle
4303d565ae Merge pull request #15050 from DieterReuter/fix-bash-completion
Fix file mode for docker bash completion
Upstream-commit: df75411b0f5e7edf9139a913a05e3f8d717a65d2
Component: engine
2015-07-27 14:24:49 -07:00
Sebastiaan van Stijn
26a080a43f Merge pull request #15052 from MHBauer/ubuntu-docs
Fix interrupted numbering sequence in ubuntu installation docs
Upstream-commit: 967bc13ae68939c616033710f7695993aa4f5208
Component: engine
2015-07-27 22:45:51 +02:00
Alexander Morozov
905c09e034 Use math.MaxInt32 instead of math.MaxUint32
I think it was original intention, because even half of a comment was about
MaxInt32.

Fix #15038

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: eb45602d2fa0fac8a694d2afb1c59ef60b0e1f77
Component: engine
2015-07-27 13:11:16 -07:00
Morgan Bauer
9b82ceb5e0 Fix interrupted numbering sequence in ubuntu installation docs
- increase indent of note to match surrounding text

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 289e0d244bcbf98c064ce80dcad1a1985974a068
Component: engine
2015-07-27 13:10:29 -07:00
Dieter Reuter
f1dcd8a79e Fix file mode for docker bash completion
A bash completion file shouldn't have a executable bit set.
Just change file mode to 644 (instead of 755).

Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
Upstream-commit: 37169daddabe19754659d8e28aaa1bf4f31c6124
Component: engine
2015-07-27 22:07:04 +02:00
Doug Davis
c3325b7678 Merge pull request #15045 from cpuguy83/fix_dockercmdwitherror
Don't pass check.C to dockerCmdWithError
Upstream-commit: 8c9cd0418d1baa5ceddec58e3a4873607e9cafcd
Component: engine
2015-07-27 16:04:16 -04:00
Sebastiaan van Stijn
1afac43bc7 Merge pull request #15041 from runcom/remove-saucy-from-installation-guide
Remove Ubuntu Saucy 13.10 from Ubuntu installation guide
Upstream-commit: 8492e62306166fa8d79ecf6eb95186933bbeaa09
Component: engine
2015-07-27 21:39:55 +02:00
Vincent Demeester
2db54e3ac2 Lint on pkg/* packages
- pkg/useragent
- pkg/units
- pkg/ulimit
- pkg/truncindex
- pkg/timeoutconn
- pkg/term
- pkg/tarsum
- pkg/tailfile
- pkg/systemd
- pkg/stringutils
- pkg/stringid
- pkg/streamformatter
- pkg/sockets
- pkg/signal
- pkg/proxy
- pkg/progressreader
- pkg/pools
- pkg/plugins
- pkg/pidfile
- pkg/parsers
- pkg/parsers/filters
- pkg/parsers/kernel
- pkg/parsers/operatingsystem

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 18c7c67308bd4a24a41028e63c2603bb74eac85e
Component: engine
2015-07-27 21:26:21 +02:00
Vincent Demeester
b61648e148 Lint fixes on runconfig
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5170a2c096ff64d4bfbe0fab296ec6777c412bc3
Component: engine
2015-07-27 21:23:15 +02:00
David Calavera
07ad6dff5c Merge pull request #14923 from Djelibeybi/fix14905
Switch to using only the RPM command to determine the distro version.
Upstream-commit: 0852170e8c9787bf277b054ef08ed2c038a40dec
Component: engine
2015-07-27 12:01:57 -07:00
Josh Hawn
a5d4f063b0 [api/client] Fix build when context dir is symlink
Symbolic links in the context directory path are now evaluated.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 01d570ad30a794f2736b679700af91625e61bc85
Component: engine
2015-07-27 12:01:13 -07:00