clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 15:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,578 Commits 9 Branches 112 Tags
2df65c32d71cc9dff059f03469f770fa746bca75
Commit Graph
16578 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek McGowan 35081ea4b6 Fix duplicate layers in manifest 
Currently the layer array is initialized with the first layer then the first layer is appened to the layer list. Adding the first layer twice causes the layer to appear twice in the manifest, making a duplicate push and pull attempt occur.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-07-06 17:31:06 -07:00
David Calavera 2905fe4806 Merge pull request #14414 from jfrazelle/fix-rpms 
fix rpms
 2015-07-06 17:12:38 -07:00
moxiegirl 6ffce0131c Merge pull request #14154 from chrismckinnel/master 
Fix a broken link to .dockerignore
 2015-07-06 15:48:25 -07:00
Ankush Agarwal 274c838ced Add Docker stats to runtime metrics article 
Fixes #13170

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-07-06 15:40:26 -07:00
Michael Crosby 691b2851f7 Always attach STDIN if -i,--interactive is specified 
There is no reason to error out or not do what the user expects when -i
is specified on the cli.  We should always attach to the stdin of the
container in this situation.

Closes #14390

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-07-06 15:24:23 -07:00
Sebastiaan van Stijn 4f69609ac2 Merge pull request #14411 from duglin/Issue14407 
Add some missing events to the API docs
 2015-07-06 23:29:56 +02:00
root e7fb38410d RunOOM test should check to see if Oom Control is enabled 
closes #13766
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-06 21:15:55 +00:00
Jessica Frazelle 76a853de6e fix rpms 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-06 14:14:26 -07:00
Vincent Demeester 6e4c6da819 Fix integration tests with testRequires(c, Network) 
It seems http://hub.docker.com is not accessible anymore, so switching
to https://hub.docker.com for testRequires(c, Network).

Adds a Timeout check on the TestRequirement to *panic* if there is a
timeout (fail fast).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-07-06 22:08:35 +02:00
Doug Davis 4bb3c253e8 Add some missing events to the API docs 
Closes #14407

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-06 11:39:37 -07:00
Vincent Batts c7492126ef Merge pull request #14127 from vbatts/vbatts-dm-active-external 
pkg/devicemapper: external device activation
 2015-07-06 14:07:33 -04:00
Ankush Agarwal b0f7a1c62c Removing .idea from .gitignore 
The project cannot include every editor's
ignore files. Contributers can use a local
global gitignore : https://help.github.com/articles/ignoring-files

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-07-06 10:41:38 -07:00
Lars Kellogg-Stedman a974789537 Update docker commit man page re: volumes 
Update the man page for 'docker commit' to make explicit the fact that
'commit' does not save data in volumes.

Addresses comments in #7583

Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
 2015-07-06 10:16:21 -04:00
Doug Davis 26a35dd09b Merge pull request #14344 from Mashimiao/add-json-check-for-execcreate 
api/server: Add missing json check
 2015-07-05 19:04:12 -04:00
Sebastiaan van Stijn 7fde07ea16 Merge pull request #14394 from moxiegirl/carry-pr-13361 
Carries and closes 13361
 2015-07-05 11:30:17 +02:00
Mary Anthony 2c5e044b59 Carries and closes 13361 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-04 18:12:52 -07:00
moxiegirl 7aa554c444 Merge pull request #14392 from moxiegirl/fix-fedora-table 
Table formatting was broken
 2015-07-04 16:30:17 -07:00
Sebastiaan van Stijn 57286aad25 Merge pull request #14235 from mlarcher/mlarcher-patch-2 
Add workaround in docs for git bash usage issue
 2015-07-04 21:00:53 +02:00
James Turnbull f240bb5e94 Merge pull request #14309 from Tenk42/14287-wheezy-link-broken-on-debian-page 
Fixing Wheezy link on debian installation page
 2015-07-04 14:57:00 -04:00
Mary Anthony 762214ccc8 Table formatting was broken 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-04 07:32:58 -07:00
Antonio Murdaca 36958ba49b Merge pull request #14374 from Mashimiao/clinent-load-tiny-typo-fix 
client/load: tiny typo fix
 2015-07-04 00:24:21 +02:00
Antonio Murdaca 19e6de2654 Fix combined image events filters 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-04 00:19:08 +02:00
Alexander Morozov 90bc5513a9 Merge pull request #14383 from runcom/runconfig-merge-cleanup 
add break after key is found in for loop
 2015-07-03 15:18:09 -07:00
Antonio Murdaca a5be803458 Add break after key is found in for loop 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-03 20:37:34 +02:00
Sebastiaan van Stijn bca32648f4 Merge pull request #14195 from ch3lo/master 
update in Kitematic OS support
 2015-07-03 18:05:27 +02:00
Marcelo Salazar 1b3bde47ef update in Kitematic OS support 
Kitematic now support Windows

Signed-off-by: Marcelo Salazar R <chelosalazar@gmail.com>
 2015-07-03 12:32:00 -03:00
Yuan Sun 230179c8dc add TestRunCapAddCHOWN test case 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-07-03 23:25:52 +08:00
Sebastiaan van Stijn a89f4e36ab Merge pull request #14159 from tristan0x/patch-1 
docker-hub Admin right gives access to build logs
 2015-07-03 16:56:04 +02:00
Tristan Carel 515df52f19 Rewrite DockerHub group permissions documentation 
On behalf of @moxiegirl
    https://gist.github.com/moxiegirl/1c34957b9edc0f6d528c#file-gistfile1-md

Signed-off-by: Tristan Carel <tristan.carel@gmail.com>
 2015-07-03 16:29:30 +02:00
Doug Davis 0dedadd4d6 Merge pull request #14377 from coolljt0725/validate_restart_policy 
Validate restart policy. Fixes #14351
 2015-07-03 07:01:44 -05:00
Lei Jitang f3faf59925 Validate restart policy. Fixes #14351 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-07-03 17:33:33 +08:00
mlarcher 33be2c5d2e Add workaround in docs for git bash usage issue 
When using boot2docker through git bash, there is a nasty issue when trying to share a folder, due to how git bash parses the URIs. The issue is explained in [issue #12751](https://github.com/docker/docker/issues/12751) but needs more visibility in the docs.

Signed-off-by: Matthieu Larcher <github@ringabell.org>
 2015-07-03 09:07:44 +02:00
Sebastiaan van Stijn 7b0666f568 Merge pull request #14378 from airandfingers/patch-2 
Edit "Working with Containers" page for readability
 2015-07-03 08:43:50 +02:00
ayoshitake 0ed7fd46b6 Edit "Working with Containers" page for readability 
Signed-off-by: ayoshitake <airandfingers@gmail.com>
 2015-07-02 23:10:36 -07:00
Ma Shimiao 801a7fed19 api/server: Add missing json check 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-07-03 08:52:32 +08:00
Ma Shimiao 87cfc2bc58 client/load: tiny typo fix 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-07-03 08:37:27 +08:00
James Turnbull d7326bd787 Merge pull request #14190 from ankushagarwal/experimentalDownloadLink 
Document the location of experimental binary
 2015-07-02 20:14:15 -04:00
James Turnbull 7dc8e77cc7 Merge pull request #14295 from Lennie/patch-1 
Fix for broken link
 2015-07-02 19:24:57 -04:00
Maxim Kulkin 8630ad1530 Fix dockerize-disk.sh working in non-en locale 
One part of script relies on messages that are
output by some system tool. In non-en locale
those messages get localized which breaks the
script.
This patch enforces en locale for that system
tool.

Signed-off-by: Maxim Kulkin <maxim.kulkin@gmail.com>
 2015-07-02 16:08:12 -07:00
Sebastiaan van Stijn a45576ab40 Merge pull request #14104 from mariusGundersen/patch-1 
Spelling
 2015-07-03 01:03:58 +02:00
Ankush Agarwal 01cfb70b0a Document the location of experimental binary 
Some devs might want to download the binary directly,
especially for systems where the install script does not
work.

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-07-02 15:59:13 -07:00
David Calavera 5b2d14fbbf Merge pull request #14349 from hqhq/hq_error_for_todisk 
Show error message when todisk failed
 2015-07-02 15:56:56 -07:00
Jessie Frazelle 9356c76d9f Merge pull request #14064 from jfrazelle/no-cache-for-experimental 
add no cache for experimental builds bc cloudfront
 2015-07-02 17:24:29 -04:00
Jessica Frazelle 0cc664fae3 add no cache for experimental builds bc cloudfront 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-02 13:50:11 -07:00
David Calavera 71f8ca30ce Merge pull request #14359 from cpuguy83/14354_events_send_resp_immediately 
Send resp immediately on GET /events
 2015-07-02 12:00:45 -07:00
Arnaud Porterie f0ed68f852 Merge pull request #14292 from calavera/fix_driver_detection 
Fix implicit DeviceMapper selection
 2015-07-02 11:33:55 -07:00
Phil Estes e3d488e280 Merge pull request #13851 from ewindisch/no-allow-rc4 
Remove RC4 from the list of registry cipher suites
 2015-07-02 13:11:40 -04:00
Alexander Morozov 36f6b7331e Merge pull request #14350 from moysesb/fixdoc 
Fixed outdated comment.
 2015-07-02 10:06:31 -07:00
David Calavera 0a376291b2 Fix implicit DeviceMapper selection 
DeviceMapper must be explicitly selected because the Docker binary might not be linked to the right devmapper library.

With this change, Docker fails fast if the driver detection finds the devicemapper directory but the driver is not the default option.
The option `override_udev_sync_check` doesn't make sense anymore, since the user must be explicit to select devicemapper, so it's being removed.
Docker fails to use devicemapper only if Docker has been built statically unless the option was explicit.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-07-02 09:21:27 -07:00
Brian Goff d0a299c027 Send resp immediately on GET /events 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-07-02 11:45:24 -04:00