clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,764 Commits 9 Branches 112 Tags
2f0f04e8fa32a7f8d02b4a9078537f52887d8ab7
Commit Graph
14764 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Estes 2f0f04e8fa Merge pull request #12292 from cpuguy83/remove_commands_integration 
Remove commands integration
 2015-04-14 16:17:25 -04:00
Jessie Frazelle 74f4a88305 Merge pull request #11999 from vbatts/vbatts-decide_storage 
graphdriver: prefer prior driver state
 2015-04-14 13:04:21 -07:00
James Turnbull 62e8621095 Merge pull request #12357 from draghuram/prdoc 
Improve the git instructions to update a PR.
 2015-04-14 15:46:10 -04:00
Brian Goff 63331abbca remove integration/utils setRaw funcs 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-14 15:17:17 -04:00
Raghuram Devarakonda 18a8bcf072 Improve the git instructions to update a PR. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-04-14 15:11:35 -04:00
Alexander Morozov 676bf4afa5 Merge pull request #12282 from cpuguy83/remove_some_integration_tests 
Move integration/server_test tests to integration-cli
 2015-04-14 11:55:05 -07:00
moxiegirl a3d871220c Merge pull request #12375 from moxiegirl/12366-change-fix 
Fixing changed pushed without edit
 2015-04-14 11:06:41 -07:00
Alexander Morozov 5be5749d54 Merge pull request #12370 from buddhamagnet/11593-api-client-docs 
add docs for DockerCli and NewDockerCli fixes #11593
 2015-04-14 11:00:19 -07:00
buddhamagnet 69747b3c1e add docs for DockerCli and NewDockerCli 
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com>
 2015-04-14 18:33:11 +01:00
Mary Anthony 4dd4bd00aa Fixing changed pushed without edit 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-14 10:25:07 -07:00
Brian Goff 040176f6e1 Merge pull request #12214 from ahmetalpbalkan/namesgenerator/localrand 
names-generator: use local random instance
 2015-04-14 13:10:26 -04:00
Alexander Morozov 7b29a88146 Merge pull request #12374 from kostickm/12343-fix-vet-warning-archive 
Fix vet warning in archive.go
 2015-04-14 10:06:04 -07:00
Alexander Morozov 3748def343 Merge pull request #12366 from bboreham/12337-force-push 
Add -f option and explanation to push after rebase
 2015-04-14 09:59:48 -07:00
Brian Goff 392fd243bc Merge pull request #12365 from HuKeping/list 
Use local variable err instead of a outer one
 2015-04-14 12:49:15 -04:00
Alexander Morozov 398220f5ff Merge pull request #12368 from ZJU-SEL/fix-memory-stats-doc 
fix memory stats display document
 2015-04-14 09:44:44 -07:00
Alexander Morozov 8f0b63925e Merge pull request #12363 from ahmetalpbalkan/integ-cli/use-sockRequest-statuscode 
integ-cli: Use status code from sockRequest (fix #12335)
 2015-04-14 09:38:10 -07:00
Hu Keping a0804e8e11 Use local variable err instead of a outer one 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-04-15 00:29:53 +08:00
Megan Kostick fc20658a01 Fix vet warning in archive.go 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-14 09:13:50 -07:00
Phil Estes fe53c27785 Merge pull request #11992 from runcom/11923-refactor-utils-utils 
Refactor utils/utils, fixes #11923
 2015-04-14 12:01:23 -04:00
Alexander Morozov 5019f35111 Merge pull request #11980 from sunyuan3/TestSearchCmdOptions 
add TestSearchCmdOptions case
 2015-04-14 08:34:40 -07:00
wonderflow d791f7e9f8 fix memory stats display document 
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
 2015-04-14 18:34:20 +08:00
Bryan Boreham c89ddb6d01 Add -f option and explanation to push after rebase 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2015-04-14 10:53:37 +01:00
Ahmet Alp Balkan 531433e765 integ-cli: Use status code from sockRequest (fix #12335) 
sockRequest now makes the status code available in the returned
values. This helps avoid string checking for non-HttpStatusOK(=200)
yet successful error messages.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-04-14 08:07:50 +00:00
Ahmet Alp Balkan 25fab69f7d names-generator: use local random instance 
Instead of seeding/polluting the global random instance,
creating a local `rand.Random` instance which provides the same
level of randomness.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-04-14 02:35:16 +00:00
Vincent Batts b68e161e5b graphdriver: prefer prior driver state 
Before this, a storage driver would be defaulted to based on the
priority list, and only print a warning if there is state from other
drivers.

This meant a reordering of priority list would "break" users in an
upgrade of docker, such that there images in the prior driver's state
were now invisible.

With this change, prior state is scanned, and if present that driver is
preferred.

As such, we can reorder the priority list, and after an upgrade,
existing installs with prior drivers can have a contiguous experience,
while fresh installs may default to a driver in the new priority list.

Ref: https://github.com/docker/docker/pull/11962#issuecomment-88274858

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-04-13 21:37:55 -04:00
Yuan Sun 77f2a4a0e3 add TestSearchCmdOptions case 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-14 09:23:26 +08:00
Arnaud Porterie 00eddf5e67 Merge pull request #12353 from sunyuan3/duplicate 
duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunni...
 2015-04-13 17:48:53 -07:00
Brian Goff 7d738e0b8c Move utils from commands_test.go into utils.go 
Everything else was gone from this file except these utils which are
being used in other files and can't yet be removed.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 20:48:26 -04:00
Brian Goff 125747e967 Remove TestRunAutoremove 
This test is already being skipped, and is also fully tested by
`TestRunContainerWithRmFlagExitCodeNotEqualToZero`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 20:48:26 -04:00
Brian Goff e4cfd9b392 MovetAttachDisconnect to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 20:48:26 -04:00
Brian Goff 28cda04838 Move TestAttachDetachTruncatedID to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 20:48:26 -04:00
Brian Goff ae0883ce00 Move TestAttachDetach to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 20:48:26 -04:00
Brian Goff f7538c77ef Move TestRunDetach to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 20:48:24 -04:00
Jessie Frazelle f68ad63496 Merge pull request #12345 from kostickm/12324-add-detection-f2fs-jfs-filesystem 
Add detection for F2Fs and JFS
 2015-04-13 17:32:47 -07:00
Yuan Sun b85ade79d5 duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunningContainer 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-14 08:32:25 +08:00
Brian Goff b93d3f8768 Merge pull request #12351 from jfrazelle/fix-test-daemon-with-wrong-key-messing-up-builds 
cleanup daemon tests
 2015-04-13 20:31:41 -04:00
Sven Dowideit e8a7e76283 Merge pull request #11920 from SvenDowideit/flesh-out-docker-hub-automated-builds-docs 
Researching Docker Hub account linking and automated builds details
 2015-04-14 10:31:21 +10:00
Sven Dowideit a55f8e1ce7 Researching Docker Hub account linking and automated builds details 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-04-14 10:29:55 +10:00
Megan Kostick 7e2d05b493 Add detection for F2Fs and JFS 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>

Alphabetize FSMagic list to make more human-readable.

Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-13 17:01:43 -07:00
Jessie Frazelle 24df333fa5 Merge pull request #12349 from calavera/patch-1 
Fix JSON format in the remote api configuration examples.
 2015-04-13 16:59:12 -07:00
Jessica Frazelle 9a87553e4f cleanup test wrong key.json leading to other failures 
wait for container to be running before trying to kill it in daemon tests

Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-13 16:58:44 -07:00
Antonio Murdaca c30a55f14d Refactor utils/utils, fixes #11923 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-14 01:37:36 +02:00
David Calavera d71c929d08 Fix JSON format in the remote api configuration examples. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-13 16:12:00 -07:00
Michael Crosby 7ecf4e5d4d Merge pull request #12166 from cpuguy83/remove_err_when_volume_exists 
Don't return error when adding existing volume
 2015-04-13 14:15:48 -07:00
Michael Crosby 12f7db1830 Merge pull request #12025 from coolljt0725/add_exec_with_user 
Add docker exec run command as a different user and in privileged mode
 2015-04-13 13:50:51 -07:00
Michael Crosby b5c3d01e6b Merge pull request #12044 from reteptilian/11721-remove-randomstring-3 
fixes 11721 replace stringutils.GenerateRandomString with stringid.GenerateRandomID
 2015-04-13 13:47:50 -07:00
Brian Goff 579c9ec1d0 Don't return error when adding existing volume 
Error wasn't really doing anything except for making a bunch of extra
debug logs.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 16:45:35 -04:00
Michael Crosby 8652ca5d5f Merge pull request #12111 from tianon/builder-deb 
Add "builder-deb" base images for building ".deb" packages properly
 2015-04-13 13:41:17 -07:00
Brian Goff 02706a40bb move TestImagesFilter to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 16:40:48 -04:00
Brian Goff 2c24a8a4ea Move TestCreateNumberHostname to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 16:40:48 -04:00