clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-25 08:36:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,260 Commits 9 Branches 112 Tags
4e25d2982b3af25bf55b8bc788d4604f7b539ea4
Commit Graph

17260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Calavera 4e25d2982b Use *int64 for MemorySwappiness. 
So we marshal/unmarshal its value properly when it's empty.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-07-29 14:14:04 -07:00
Tibor Vass 0bab97fcba Merge pull request #15076 from hqhq/hq_merge_daemon_test 
Merge daemon_unit_test.go to daemon_test.go
 2015-07-29 14:53:34 -04:00
Tibor Vass c09c497c71 Merge pull request #15111 from Microsoft/fix-archive-copy-log 
Fix log to logrus
 2015-07-29 14:48:19 -04:00
Tibor Vass 2a593bea12 Merge pull request #15116 from ibuildthecloud/devices 
Revert change to make ParseDevice unexported
 2015-07-29 14:42:30 -04:00
Tibor Vass 0a2ec227f8 Merge pull request #15128 from ankushagarwal/logging 
Doc fixes in daemon/logger, update NewCopier method
 2015-07-29 14:20:34 -04:00
Tibor Vass e77ea5aa7a Merge pull request #14784 from brahmaroutu/lint_api_client 
fix golint errors/warnings
 2015-07-29 14:04:45 -04:00
David Calavera 1cfae07a6e Merge pull request #15015 from runcom/14911-fix-install-script-debian81 
Fix install script to handle debian 8.1 apt repo string
 2015-07-29 10:45:50 -07:00
Tibor Vass dfcdde4d98 Merge pull request #14930 from brahmaroutu/lint_daemon_graphdriver_devmapper 
daemon/graphdriver/devmapper/ fix lint errors/warnings
 2015-07-29 13:29:57 -04:00
root 929f2c2f40 api/client fix golint errors/warnings 
Addresses #14756

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-29 17:20:54 +00:00
Tibor Vass 2cd058ce4f Merge pull request #14785 from brahmaroutu/lint_api_server 
fix golint errors/warnings
 2015-07-29 13:09:31 -04:00
David Calavera 8a8de53d3d Merge pull request #15129 from jfrazelle/golint 
fix linnt
 2015-07-29 10:07:25 -07:00
Ankush Agarwal 41d85c014d Doc fixes in logger, update NewCopier method 
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-07-29 10:05:46 -07:00
Jessica Frazelle c2c9e99d84 fix linnt 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-07-29 10:05:30 -07:00
John Howard 2bf73c4b1a Fix log to logrus 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-29 09:58:07 -07:00
Jessie Frazelle d7661cb48b Merge pull request #15099 from ewindisch/apparmor-restore-en 
Restore AppArmor generation + fixes
 2015-07-29 09:36:59 -07:00
Tibor Vass 9d3ad6d892 Merge pull request #15107 from LK4D4/unsafe_random 
Use non-crypto version of random to generate ids.
 2015-07-29 11:47:38 -04:00
Tibor Vass 0c330a7823 Merge pull request #15064 from jfrazelle/14590-fix-sudo 
sh -c the cat repo for yum
 2015-07-29 10:02:27 -04:00
Sebastiaan van Stijn 60ed0a7f77 Merge pull request #15117 from ChanderG/master 
Fix minor formatting error in security article docs
 2015-07-29 13:41:19 +02:00
Chander G 6cf0e27ee0 Fix minor formatting error in security article docs 
Signed-off-by: Chander G <chandergovind@gmail.com>
 2015-07-30 01:06:04 +05:30
Darren Shepherd 421786e925 Make ParseDevice public 
This reverts the change in 5170a2c096 that made ParseDevice private

Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-07-29 02:12:35 -07:00
Alexander Morozov 6bca8ec3c9 Replace GenerateRandomID with GenerateNonCryptoID 
This allow us to avoid entropy usage in non-crypto critical places.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-07-28 22:31:01 -07:00
Alexander Morozov 4553b6af4b Add GenerateNonCryptoID function to avoid entropy exhaustion 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-07-28 22:31:01 -07:00
Alexander Morozov 6963b9c716 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>
 2015-07-28 22:30:57 -07:00
Jessica Frazelle 93d134c61f sh -c the cat repo for yum 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-28 20:25:26 -07:00
Srini Brahmaroutu 972a94b449 daemon/graphdriver/devmapper/ fix lint errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-29 01:43:34 +00:00
Tibor Vass c19a00d4cb Merge pull request #15060 from jlhawn/fix_build_renamed_dockerfile 
[api/client] update check Dockerfile in Context
 2015-07-28 21:30:19 -04:00
moxiegirl ed1d9d022d Merge pull request #14565 from moxiegirl/14561-mac-rewrite 
Docker Toolbox Updates fixes #14561
 2015-07-28 18:20:26 -07:00
Mary Anthony 6ca22add18 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>
 2015-07-28 18:17:24 -07:00
Tibor Vass cc6138d946 Merge pull request #15063 from jfrazelle/only-write-distributions-file-if-dne 
only write distributions file if dne
 2015-07-28 20:45:04 -04:00
root 351f6b8ec0 api/server fix golint errors/warnings. 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-28 22:44:39 +00:00
Eric Windisch 6c887be769 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>
 2015-07-28 17:45:53 -04:00
Eric Windisch 8b2fcddcd2 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>
 2015-07-28 17:45:53 -04:00
Eric Windisch 3edc88f76d 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>
 2015-07-28 17:45:51 -04:00
Alexander Morozov f809037128 Merge pull request #14848 from hqhq/hq_golint_execdriver 
Fix golint warnings for daemon/execdriver/*
 2015-07-28 14:23:22 -07:00
Alexander Morozov 2c162292b7 Merge pull request #14824 from fcantournet/lint_pkg_mflag 
Fix golint for pkg/mflag
 2015-07-28 13:51:09 -07:00
Alexander Morozov 9cfc223cc0 Merge pull request #14818 from MHBauer/volume-lint 
lint for volume/*
 2015-07-28 13:42:18 -07:00
Sebastiaan van Stijn bfbac726c7 Merge pull request #15082 from ChanderG/master 
Add link to Systemd article in Debian Jessie docs, fix typo
 2015-07-28 22:35:48 +02:00
Chander G b9e6be25d1 Add link to Systemd article, fix typo 
Signed-off-by: Chander G <chandergovind@gmail.com>
 2015-07-29 01:54:44 +05:30
Jessie Frazelle e06df594f5 Merge pull request #14863 from brahmaroutu/lint_daemon_graphdriver_aufs 
daemon/graphdriver/aufs fix lint errors/warnings
 2015-07-28 11:46:40 -07:00
Jessie Frazelle be60047b43 Merge pull request #14932 from brahmaroutu/lint_daemon_graphdriver_graphtest 
daemon/graphdriver/graphtest/ fix lint errors/warnings
 2015-07-28 11:20:33 -07:00
Sebastiaan van Stijn f989d68014 Merge pull request #15096 from kolyshkin/doc-fixes-2 
daemon.md: do fix placement of exec driver heading
 2015-07-28 20:10:11 +02:00
Kir Kolyshkin f52514a038 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>
 2015-07-28 10:58:17 -07:00
Morgan Bauer 9af963aba0 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>
 2015-07-28 10:40:44 -07:00
David Calavera c473ae14fd Merge pull request #15094 from Microsoft/10662-fixvendorhelper 
Windows: Fix vendor-helpers.sh
 2015-07-28 10:17:30 -07:00
John Howard 663d50464e Windows: Fix vendor-helpers.sh 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-28 10:13:33 -07:00
Félix Cantournet 8e6ad2171a Fix golint for pkg/mflag 
Signed-off-by: Félix Cantournet <felix.cantournet@cloudwatt.com>
 2015-07-28 15:32:42 +02:00
moxiegirl 3a7b4230b2 Merge pull request #14713 from moxiegirl/remove-boot2docker-14563 
Remove references to boot2docker replace with docker-machine
 2015-07-28 06:05:29 -07:00
Qiang Huang ada852aa70 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>
 2015-07-28 15:36:29 +08:00
Srini Brahmaroutu 55885daa56 daemon/graphdriver/aufs fix lint errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-28 06:17:05 +00:00
Srini Brahmaroutu 12460f41a4 daemon/graphdriver/graphtest/ fix lint errors/warnings 
Addresses #14756

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-28 06:01:00 +00:00