toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,930 Commits 3 Branches 295 Tags
2ee6cd28f5f0c4cc098d3f7c16cdd3485a80fa04
Commit Graph
14930 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Goff 2ee6cd28f5 Merge pull request #12604 from runcom/remove-job-image-tarlayer 
Remove job image_tarlayer
Upstream-commit: 6f82613ded38eb39025aebfbc1d6846c087474e5
Component: engine
 2015-04-21 14:53:54 -04:00
Antonio Murdaca 16933141bf Remove job image_tarlayer 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: ba0017595ed9ac30273832b93365b0cb1cf60c05
Component: engine
 2015-04-21 19:59:45 +02:00
Alexander Morozov 17f801b987 Merge pull request #12598 from runcom/remove-writeJSONEnv 
Remove writeJSONEnv, fixes #12597
Upstream-commit: 371b39c26f3770af8c63162b927b07207764f4b5
Component: engine
 2015-04-21 09:54:55 -07:00
Antonio Murdaca e46db750a1 Remove writeJSONEnv 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 27811355bd15dd2d0f102dd3b02512c677d5da44
Component: engine
 2015-04-21 18:14:39 +02:00
James Turnbull 420c9f4038 Merge pull request #12563 from kentoj/patch-1 
Clarify data volume init with existing data
Upstream-commit: afd56364618c8c638769a8e9fceeaa5376e46ff5
Component: engine
 2015-04-21 08:57:22 -07:00
Jessie Frazelle cff18dc122 Merge pull request #10736 from coolljt0725/add_cpu_limit 
Add support cpu cfs_quota
Upstream-commit: 17d5450bc31e81c22e8ccba806294e4d744af275
Component: engine
 2015-04-20 17:55:01 -07:00
Tianon Gravi c4f89f8977 Merge pull request #12181 from inatatsu/enable-netgo-with-gccgo 
Enable "netgo" library when we build with gccgo
Upstream-commit: e562495d56bf0fb329bc1f28445faad6934149e8
Component: engine
 2015-04-20 17:31:49 -07:00
Jessie Frazelle 23af23a14a Merge pull request #12430 from icecrime/11551_carry 
Add -H|--human command-line flag to `docker history`
Upstream-commit: 47b703593efa10489f39b2396081fa65d12ccae4
Component: engine
 2015-04-20 17:28:24 -07:00
Jessie Frazelle bf5cc9f8c8 Merge pull request #12457 from calavera/remove_engine_job_builder 
Remove engine.Job from Builder.
Upstream-commit: 82f75df9e9faceabd9a2653ac57ad17aeab5e44b
Component: engine
 2015-04-20 17:27:17 -07:00
Jessie Frazelle 40cdee7b30 Merge pull request #12517 from mavenugo/master 
Enhanced port integration-cli tests
Upstream-commit: 874d64e690338a7aba3e8e4ecff793f1893bdb9d
Component: engine
 2015-04-20 17:26:48 -07:00
Jessie Frazelle 27af7aa804 Merge pull request #12539 from WeiZhang555/httpError 
change httpError logic
Upstream-commit: 4bb8924b52a4d8a25ccfcd39a43e7ba22b393424
Component: engine
 2015-04-20 17:26:09 -07:00
Jessie Frazelle a2ec388af9 Merge pull request #12533 from ankushagarwal/gofmt-directory 
gofmt 1.4.2  src directory
Upstream-commit: 4a25c5d25bad693f9e79a810d87f9103769f918c
Component: engine
 2015-04-20 17:02:43 -07:00
Jessie Frazelle df94aca214 Merge pull request #12566 from fntlnz/remove-go1.3.3-support 
Removed go1.3.3 support
Upstream-commit: e1fd7e25de4574b78cce41becd8ee50bdff23f0c
Component: engine
 2015-04-20 17:01:57 -07:00
Jessie Frazelle 6f3bec0db9 Merge pull request #12471 from coolljt0725/fix_weird_output_format 
Fix weird terminal output format
Upstream-commit: df217120cdc2336181eb3c97fea5acd18ede4ed0
Component: engine
 2015-04-20 17:01:02 -07:00
Jessie Frazelle 5bf4abe6b6 Merge pull request #12568 from duglin/TweakConfigPerms 
Make .docker dir have 0700 perms not 0600
Upstream-commit: fcacb1793e54fd30055efc940737ee2ba1fb49f1
Component: engine
 2015-04-20 16:33:10 -07:00
Jessie Frazelle 5a2fc18d12 Merge pull request #12556 from icecrime/update_release_checklist 
Update release checklist
Upstream-commit: 23ec4cab60c749bef7222beb131fa54aed1d9ad4
Component: engine
 2015-04-20 16:31:40 -07:00
Arnaud Porterie 77ca39f0a0 Early API version bump 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: a8253ec7e7ec13c81d5195ddfe3cf2571ce6afff
Component: engine
 2015-04-20 15:52:26 -07:00
Arnaud Porterie 9d30ecdb29 Merge pull request #9381 from lebauce/default-gateway 
Proposal: Allow specifying a default gateway for bridge networking
Upstream-commit: 9838242db1890ae82dd63a6aae134147c74933ef
Component: engine
 2015-04-20 15:50:35 -07:00
Jessie Frazelle d19796473e Merge pull request #12416 from ya7ya/patch-1 
adding elementary OS to install script
Upstream-commit: d5dc565432424eaf301687f9409a984246456e79
Component: engine
 2015-04-20 14:50:16 -07:00
Phil Estes e0b5db7169 Merge pull request #12450 from brahmaroutu/integration_test3_12255 
Port test from integration tests - test low memory on create
Upstream-commit: 435643545c4b2c90e2a0a264527f6cc190d925cb
Component: engine
 2015-04-20 17:27:17 -04:00
David Calavera 1edadd0f1c Add flusher check to utils.WriteFlusher. 
That way we can know when the stream has been flushed.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3b05005a1262e53d042512e88c52a6dae0f2e93d
Component: engine
 2015-04-20 14:25:45 -07:00
moxiegirl d92e1d8ce7 Merge pull request #12559 from moxiegirl/fix-12555-rnotes 
Adding in 1.60 release notes
Upstream-commit: 27fc39fdc07db415478f4478a3681b8f1fbff27b
Component: engine
 2015-04-20 14:18:48 -07:00
Doug Davis 988e520cc7 Make .docker dir have 0700 perms not 0600 
Thanks to @dmcgowan for noticing.

Added a testcase to make sure Save() can create the dir and then
read from it.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: bfeb98a23607c835c1d9241e282b84acd8dc3606
Component: engine
 2015-04-20 14:16:50 -07:00
Lorenzo Fontana 88e80730cf Removed go1.3.3 support 
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
Upstream-commit: 92849fdcce257dfd61a5c95f57cde085ff22b431
Component: engine
 2015-04-20 23:09:08 +02:00
David Calavera 16569396d9 Remove engine.Job from builder.CmdBuildConfig. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: ae4063585e7936780154101f7fe416a080c6ff7c
Component: engine
 2015-04-20 13:37:06 -07:00
David Calavera a618f11507 Remove engine.Job references from builder.CmdBuild 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9a2c00975123c17033ac7b50762af82051ec73db
Component: engine
 2015-04-20 13:37:04 -07:00
Mary Anthony 3d767d2ff0 Adding in 1.60 release notes 
Updating with thaJetzah's comments
Adding in Fred's copy edits

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 1f4ef5192c05723e231acc47813c4c8455a0166b
Component: engine
 2015-04-20 13:31:22 -07:00
Kent Johnson f6f7e91ca2 Clarify data volume init with existing data 
Though I am not clear on the intent of the sentence if it means that existing data in the base image is copied into the new volume then the additions I propose make that more clear than the present language.

Signed-off-by: Kent Johnson <kentoj@gmail.com>
Upstream-commit: ff9f0134aefbee1d3d757454f42e8dd99afb528e
Component: engine
 2015-04-20 14:24:40 -06:00
moxiegirl 9bc2d6ce93 Merge pull request #12414 from draghuram/projectdoc 
Improve documentation in "project" directory.
Upstream-commit: f85eb4baadd810b27ff9bff0d23361afc6d08153
Component: engine
 2015-04-20 13:16:20 -07:00
Alexander Morozov d6cf7ae01f Merge pull request #12009 from duglin/AddConfig 
Migrate .dockercfg to .docker/config.json and support for HTTP Headers
Upstream-commit: 08ef006d178b7a869c9dfc05c8b887316a856445
Component: engine
 2015-04-20 13:12:17 -07:00
Doug Davis 44c88b9112 Add .docker/config.json and support for HTTP Headers 
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
  but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
  top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
  which adds these http headers to all msgs from the cli

In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 18c9b6c6455f116ae59cde8544413b3d7d294a5e
Component: engine
 2015-04-20 13:05:24 -07:00
Alexander Morozov 9d60a63dde Merge pull request #12561 from sergeyevstifeev/12549-fix-test-requires-network 
Add missing testRequires(t, Network)
Upstream-commit: cfe7c9c1b24a965985eb54d10fa114e339a95e0b
Component: engine
 2015-04-20 12:58:30 -07:00
Sergey Evstifeev 3d762e6cee Add missing testRequires(t, Network) 
Fixes #12552

Signed-off-by: Sergey Evstifeev <sergey.evstifeev@gmail.com>
Upstream-commit: 716e21be2b9780306cc1ffe02b2a784e2dece94e
Component: engine
 2015-04-20 21:19:50 +02:00
Alexander Morozov 6f3b598444 Merge pull request #12453 from runcom/style-minor-fixes 
Add minor stylistic fixes
Upstream-commit: a7690076c955d242b4590fcf557f15e1029d0c8b
Component: engine
 2015-04-20 11:51:04 -07:00
Phil Estes 8301d9df26 Merge pull request #12545 from coolljt0725/remove_rudundant_enter 
Remove redundant `\n` in daemon/daemon.go
Upstream-commit: 490a0bd697168997f21bd354a647df6eab2bd051
Component: engine
 2015-04-20 14:32:27 -04:00
Phil Estes bd79229dd5 Merge pull request #12554 from buddhamagnet/12553-cli-doc-correction 
12553 fix typo
Upstream-commit: 53edce79f16816a165b5be9cd4ee05501c103c6f
Component: engine
 2015-04-20 14:30:51 -04:00
Phil Estes fe6999471c Merge pull request #12495 from LK4D4/apiserver_refactoring 
Refactoring of api/server for reduce engine usage
Upstream-commit: f0016c5917a2f7baba20060aa4edfef5fb1e0a05
Component: engine
 2015-04-20 14:10:34 -04:00
Srini Brahmaroutu 97fb2745d9 Port test from integration tests 
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 1a35b16b08ef5a8b0764e5a383f36d5572f20dfe
Component: engine
 2015-04-20 17:57:53 +00:00
buddhamagnet e52ab0e055 fix typo 
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com>
Upstream-commit: cdd5d5e4c3fe241d178c09edb521ae91689b55df
Component: engine
 2015-04-20 18:56:21 +01:00
Raghuram Devarakonda cf21a7328b Improve documentation in "project" directory. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: fcdb1fbfa1e691bbdfb73a289ff84fbf6b26fad6
Component: engine
 2015-04-20 13:08:13 -04:00
Alexander Morozov 47e2254d8e Make all http handlers api.server.Server methods 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: da7bca449652396dd8a4a0ff2e303d3d3c7a58a2
Component: engine
 2015-04-20 09:45:31 -07:00
Zhang Wei 73aebaff91 change httpError logic 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Signed-off-by: Zhang Wei <zhangwei198900@gmail.com>
Upstream-commit: 66239ab5c914ce716c044b676ba1ad4757ce6f2b
Component: engine
 2015-04-20 23:26:56 +08:00
Lei Jitang f8f4bcdb38 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: dcc50e1d593fd7995189872791c6d7a013f16970
Component: engine
 2015-04-20 08:16:47 -07:00
Alexander Morozov 2e27fa9e39 Make API server datastructure 
Added daemon field to it, will use it later for acces to daemon from
handlers

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: d9ed3165228b60cb89c31d0d66b99e01ab83eb3e
Component: engine
 2015-04-20 08:13:39 -07:00
Alexander Morozov 932b7d41ce Make daemon initialization in main goroutine 
It is simplifies code and lead to next refactoring step, where daemon
will be incorporated to some structure which represents API.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 181fea24aac7499a3d6dc0c8c9de67e6c0036140
Component: engine
 2015-04-20 08:13:39 -07:00
Alexander Morozov 3ad142821c Merge pull request #12537 from hqhq/hq_remove_unused_function 
remove unused function in server_unit_test.go
Upstream-commit: b5584ec24a6c711a842605dd9fbf5535e77ae878
Component: engine
 2015-04-20 07:51:53 -07:00
Alexander Morozov 6d0917e016 Merge pull request #12534 from Mashimiao/delete-unused-function-from-drive 
clenaup: delete unused function getEnv
Upstream-commit: d2ce1076a453ac1c016e5637eabae1d8f26cda9e
Component: engine
 2015-04-20 07:50:06 -07:00
Lei Jitang 2f9e9a0229 Remove redundant '\n' in daemon.go and correct the warning messages for memory swap 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2d5ede67c098dd11803d502865ab546388f2a553
Component: engine
 2015-04-20 22:00:03 +08:00
Sylvain Baubeau 6f062d5e99 Allow specifying a default gateway for bridge networking 
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
Upstream-commit: acb6127c1a3f7054c25d1468b67f2eb269f4ecbf
Component: engine
 2015-04-20 15:13:30 +02:00
Brian Goff 5f9567a9e8 Merge pull request #12266 from HuKeping/rmjob-info 
Remove Job from Info API
Upstream-commit: dacc0507f08b54b506f832e100a1e27e389508e7
Component: engine
 2015-04-20 07:10:57 -04:00