307e5a8a1e
Merge pull request #14930 from brahmaroutu/lint_daemon_graphdriver_devmapper
...
daemon/graphdriver/devmapper/ fix lint errors/warnings
Upstream-commit: dfcdde4d9832adb5bbee146cdf5fac2cc5926b4f
Component: engine
2015-07-29 13:29:57 -04:00
4c4cfdbd2e
Merge pull request #14785 from brahmaroutu/lint_api_server
...
fix golint errors/warnings
Upstream-commit: 2cd058ce4f022f98be22c780a703d93b51722d19
Component: engine
2015-07-29 13:09:31 -04:00
da80514353
Merge pull request #15129 from jfrazelle/golint
...
fix linnt
Upstream-commit: 8a8de53d3d3062e3f5b0fe523d4e366825399985
Component: engine
2015-07-29 10:07:25 -07:00
ec5ef287b8
fix linnt
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: c2c9e99d845a412717513d91c1886b2da5c4f9a9
Component: engine
2015-07-29 10:05:30 -07:00
7b7157591c
Merge pull request #15099 from ewindisch/apparmor-restore-en
...
Restore AppArmor generation + fixes
Upstream-commit: d7661cb48b93978b4b30d2c60f3201d685af7f95
Component: engine
2015-07-29 09:36:59 -07:00
9d7f169c3f
Merge pull request #15107 from LK4D4/unsafe_random
...
Use non-crypto version of random to generate ids.
Upstream-commit: 9d3ad6d892312b544950dc1c2d7aae224a4b9d06
Component: engine
2015-07-29 11:47:38 -04:00
d50c9449dd
Merge pull request #15064 from jfrazelle/14590-fix-sudo
...
sh -c the cat repo for yum
Upstream-commit: 0c330a7823443ebffd9bae47dc5e4e8df1c5fa70
Component: engine
2015-07-29 10:02:27 -04:00
45477eeddf
Merge pull request #15117 from ChanderG/master
...
Fix minor formatting error in security article docs
Upstream-commit: 60ed0a7f77de13f5defb17cc7c743af6179085ea
Component: engine
2015-07-29 13:41:19 +02:00
30d606b70d
Fix minor formatting error in security article docs
...
Signed-off-by: Chander G <chandergovind@gmail.com >
Upstream-commit: 6cf0e27ee0400654addcb8e9eac963dc71846dd5
Component: engine
2015-07-30 01:06:04 +05:30
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
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
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
5876286f87
sh -c the cat repo for yum
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 93d134c61f90a366065b28c2b48021361c00cd76
Component: engine
2015-07-28 20:25:26 -07:00
581a7026d5
daemon/graphdriver/devmapper/ fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 972a94b449ea6a68f041c47fe7bda35b5ac765a2
Component: engine
2015-07-29 01:43:34 +00:00
20be6af896
Merge pull request #15060 from jlhawn/fix_build_renamed_dockerfile
...
[api/client] update check Dockerfile in Context
Upstream-commit: c19a00d4cbc52adc7da76f2f5f70bb38190c2271
Component: engine
2015-07-28 21:30:19 -04:00
6419990105
Merge pull request #14565 from moxiegirl/14561-mac-rewrite
...
Docker Toolbox Updates fixes #14561
Upstream-commit: ed1d9d022d1cc3ade9c3b9f8b49ba45e4a48b169
Component: engine
2015-07-28 18:20:26 -07:00
31bfebec11
Docker Toolbox Updates fixes #14561
...
- Tested Mac/iterated with Jeff on fixes
- Waiting on formal uninstall;manual now
- 4 hour work
- Fixe #14562 converting Windows to Mac
- Found errors in installer need fixes/another iteration
- Updated as far as possible with limited installation
- 3 Hours work
- Entering comments from PR review
- New screen captures and migration material
- Entering Sven's comment
- Testing with powershell, Seb's comments
- Fix link in upgrade
- Minor tweaks to http and typos
- Adding deprecation note
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 6ca22add1845ca87ba9a3ec0c319a70f981545b2
Component: engine
2015-07-28 18:17:24 -07:00
7b767eb632
Merge pull request #15063 from jfrazelle/only-write-distributions-file-if-dne
...
only write distributions file if dne
Upstream-commit: cc6138d94620a89702cfae6cffb1683b1585fa2c
Component: engine
2015-07-28 20:45:04 -04:00
dcda9483a8
api/server fix golint errors/warnings.
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 351f6b8ec011983d894951769c2116c9feaf81d2
Component: engine
2015-07-28 22:44:39 +00:00
98427d5929
Mark engine AA policy as complain-only
...
The engine policy will now only complain
as a temporary measure to ensure we do not
cause breakages while users exercise this
policy.
This is NOT the policy for containers, but
for the newly-introduced policy for the
daemon itself.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 6c887be76951e802900a07e16aeaf0a079ac4534
Component: engine
2015-07-28 17:45:53 -04:00
52f12a12af
AA: Eliminate 'file' permission
...
Implements the policies for the remaining binaries
called by the Docker engine and eliminates the
giant whitelisted 'all files' permission in favor
of granular whitelisting and child-specific policies.
It should be possible now to remove the 'file' permission,
but for the sake of keeping Docker unbroken, we'll try
to gradually tighten the policy.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 8b2fcddcd251e58473abf6c4949573e03f44bb96
Component: engine
2015-07-28 17:45:53 -04:00
e9b83a5a26
Restore AppArmor profile generation
...
Will attempt to load profiles automatically. If loading fails
but the profiles are already loaded, execution will continue.
A hard failure will only occur if Docker cannot load
the profiles *and* they have not already been loaded via
some other means.
Also introduces documentation for AppArmor.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 3edc88f76df6a3bc9d887de8157ec71730c9057a
Component: engine
2015-07-28 17:45:51 -04:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
a6fad1702d
only write distributions file if dne
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 2eee19236650c5146274172e08751cfce52c2fbe
Component: engine
2015-07-27 16:26:35 -07:00
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
