Commit Graph

16057 Commits

Author SHA1 Message Date
c53f933e8d Fix for #14924. Seperates lsb_dist detection from dist_version detection
so that the latter can be distro specific.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 5c6446f335a9f9010cabe93104f6feced0166dd8
Component: engine
2015-07-30 07:30:51 +10:00
4e9957ee2d Merge pull request #15133 from dmcgowan/notary-fix-test-date
Skip notary tests which update system clock
Upstream-commit: 0f85fadb4ec1aa3d0270351fc72fa9a70cffd3b9
Component: engine
2015-07-29 12:51:05 -07:00
4c1bdea55d Skip notary tests which update system clock
Currently some notary tests change the system clock to check for expiration.
Skip these tests until the code can be refactored to not rely on updating the system clock.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: bf3c1e6a3afc951e41643b8d55d4ac25fa9cb06d
Component: engine
2015-07-29 12:09:40 -07:00
4126b923f8 Merge pull request #15076 from hqhq/hq_merge_daemon_test
Merge daemon_unit_test.go to daemon_test.go
Upstream-commit: 0bab97fcba8d2b4be1650fef381926e6b0259cc5
Component: engine
2015-07-29 14:53:34 -04:00
abf825af14 Merge pull request #15111 from Microsoft/fix-archive-copy-log
Fix log to logrus
Upstream-commit: c09c497c71e3fbcec6fee6ee0f4eb5097fc1b4b7
Component: engine
2015-07-29 14:48:19 -04:00
78b8a7e21c Merge pull request #15116 from ibuildthecloud/devices
Revert change to make ParseDevice unexported
Upstream-commit: 2a593bea12f2f4a93e2d1da93fba3707d476a368
Component: engine
2015-07-29 14:42:30 -04:00
a14f132348 Merge pull request #15128 from ankushagarwal/logging
Doc fixes in daemon/logger, update NewCopier method
Upstream-commit: 0a2ec227f89d602f73867cae14bab0294d32fe20
Component: engine
2015-07-29 14:20:34 -04:00
86cfb16a84 Merge pull request #14784 from brahmaroutu/lint_api_client
fix golint errors/warnings
Upstream-commit: e77ea5aa7aee20bc29b65efd92e9960b58db3435
Component: engine
2015-07-29 14:04:45 -04:00
61d8e3e275 Merge pull request #15015 from runcom/14911-fix-install-script-debian81
Fix install script to handle debian 8.1 apt repo string
Upstream-commit: 1cfae07a6e04cc0158142afa37a1a758f83aeecb
Component: engine
2015-07-29 10:45:50 -07:00
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
36ee6380c9 api/client fix golint errors/warnings
Addresses #14756

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 929f2c2f4074e66bb1e942a338e4d2a815096d45
Component: engine
2015-07-29 17:20:54 +00: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
9da89dbbd1 Doc fixes in logger, update NewCopier method
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 41d85c014defd96cda06abac73554d9f9d1de0d8
Component: engine
2015-07-29 10:05:46 -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
a7dc60d0d3 Fix log to logrus
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2bf73c4b1a3b195ee426e74d221a9df032aaa89e
Component: engine
2015-07-29 09:58:07 -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
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
36b86246d3 Make ParseDevice public
This reverts the change in 5170a2c096 that made ParseDevice private

Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 421786e9254b728298397b8ae3e81e9f6259f369
Component: engine
2015-07-29 02:12:35 -07:00
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
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
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
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
6f54df793f Merge daemon_unit_test.go to daemon_test.go
daemon_test.go supposted to be unit test for daemon, so
don't see reason why we need another daemon_unit_test.go.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: ada852aa701e1ba34fd29589401b114309a2f74f
Component: engine
2015-07-28 15:36:29 +08: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