p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
10,202 Commits 2 Branches 295 Tags
d3b31ca9dcb76f736ca770eff142d2202ac31a54
Commit Graph

10202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Turnbull
d3b31ca9dc Added Syntax highlighting file for the KDE Kate Editor 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 7458a82e0bbf4353729cfac3e1d7159b9d466161
Component: engine
 2014-08-27 11:16:51 -07:00
Michael Crosby
0f8e8a7de5 Merge pull request #7740 from LK4D4/registry_style 
Style fixes for registry/registry.go
Upstream-commit: 1385b2d2935c0d20e6406a80c62615a8c4cdbcc9
Component: engine
 2014-08-26 18:02:11 -07:00
James Turnbull
16bdc5c32b Merge pull request #7741 from LK4D4/bump_docs_to_1.15 
Bump docs and api to 1.15
Upstream-commit: 4fe6115fb125d5acddec328e2dcfb23b6fe61ffa
Component: engine
 2014-08-26 13:44:05 -07:00
James Turnbull
133de3a18a Merge pull request #7735 from SvenDowideit/lxcconf-api-docs 
Lxcconf api docs
Upstream-commit: 5b6c25f75192a75ff597470b3f6ba0981f6d3011
Component: engine
 2014-08-26 13:43:48 -07:00
Michael Crosby
48ffeaab82 Merge pull request #7745 from LK4D4/fix_docker_host_panic 
Fix panic for DOCKER_HOST without ://
Upstream-commit: b458dd1dfb9a105d65d1d5853408b200316b7275
Component: engine
 2014-08-26 11:23:30 -07:00
Tibor Vass
b00ca614f6 Merge pull request #7744 from LK4D4/fix_race_cleanup_start_#6904 
Fix race condition between cleanup and Start
Upstream-commit: c4a190db0c7020ee39672421d1bbca3678f86683
Component: engine
 2014-08-26 14:17:11 -04:00
Michael Crosby
f5f64f68ea Merge pull request #7642 from LK4D4/style_fixes 
Style fixes for daemon package
Upstream-commit: 55f7dd8198549b704089a51662e3c511d028706c
Component: engine
 2014-08-26 10:59:05 -07:00
Michael Crosby
ff69012bd1 Merge pull request #7702 from LK4D4/fix_panic_on_bad_device_#7701 
Handle error from GetDevice early
Upstream-commit: 89f64712faecddbfd92c7bfe6612dd5890c966dd
Component: engine
 2014-08-26 10:53:40 -07:00
Alexandr Morozov
62eb5165d1 Fix race condition between cleanup and Start 
There was problem when Start might be before cleanup

Fixes #6904

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 12ff89a3901cd2debf13e7ccc3a1a780380e4dd9
Component: engine
 2014-08-26 20:57:12 +04:00
Alexandr Morozov
fef7b9ee0d Fix panic for DOCKER_HOST without :// 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 660cc4a2675d34695406b2506344a2a18f2a59e9
Component: engine
 2014-08-26 20:32:10 +04:00
Tibor Vass
b029406e18 Merge pull request #7615 from crosbymichael/fix-utils-panic 
Fix panic in validate context for build
Upstream-commit: 63ed18ad11a0ae563a3b75af4c6660e63667f896
Component: engine
 2014-08-26 10:30:42 -04:00
Alexandr Morozov
b22bbbc6cc Bump docs and api to 1.15 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: e261618b24b6837c820dccd8fa734eafc8b7f399
Component: engine
 2014-08-26 13:08:50 +04:00
Alexandr Morozov
b5fb241c16 Style fixes for registry/registry.go 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 45a2923874a9b1f70674e627d0d112851d5982a8
Component: engine
 2014-08-26 12:28:40 +04:00
Alexandr Morozov
6eedef59d9 Remove redundant elses 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 698392cb512ba0c85e69a669f115d67c1d50cb98
Component: engine
 2014-08-26 09:28:54 +04:00
Alexandr Morozov
71bf8c685a Use ++ instead of += 1 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 1ba15b8acaf8625db23ccd7d0ba7d3acf7d2f69e
Component: engine
 2014-08-26 09:27:07 +04:00
SvenDowideit
73e4ee940c Fix the other API docs to use an array of key/values 
as per #7706

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: b0edced87f2a9bd2e85b0a59f6a6c83aff36e445
Component: engine
 2014-08-26 11:36:25 +10:00
getvictor
db566d8d04 Updating LxcConf to match Docker command line 
I've changed LxcConf on a previous API document. Not sure why it keeps getting changed back. I'm seeing Docker 1.2.0 command-line calls are still using the array of key/values.

Docker-DCO-1.1-Signed-off-by: getvictor <victor@victoreda.com> (github: SvenDowideit)
Upstream-commit: 216ab880f96125566f2816510ba9d396dcf103f0
Component: engine
 2014-08-26 11:36:25 +10:00
Sven Dowideit
f9e7d27fe5 Merge pull request #7733 from Djelibeybi/oraclelinux-docs 
Oracle Linux docs
Upstream-commit: a05d8d4f4ffd67be34738c80b862ef949dddef65
Component: engine
 2014-08-25 18:14:36 -07:00
Avi Miller
1dae3fa4de Add Oracle Linux specific documentation for installation of Docker from Oracle Linux repositories on Oracle Linux 6 and 7. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: fcad8ee83a2cf9192ba4f9ec7d5c1d0b03a6aa47
Component: engine
 2014-08-26 11:10:09 +10:00
Sven Dowideit
bd4553339f Merge pull request #7732 from SvenDowideit/ubuntu-backported-kernel 
Ubuntu backported kernel
Upstream-commit: 849086d3d965cea7d7e04b3559edc9c903e30ba6
Component: engine
 2014-08-25 17:16:34 -07:00
SvenDowideit
cd586bd31e small word change 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 93d574298da0f420c19db52b75ebf31ed3cb2ec9
Component: engine
 2014-08-26 10:15:12 +10:00
Sven Dowideit
a3c910b1d1 Merge pull request #7603 from kuon/centos7 
Added manual installation instruction for Centos7 and note about firewalld.
Upstream-commit: 97c7b0115b62a698123eec1b2548ff85937ba35a
Component: engine
 2014-08-25 16:49:09 -07:00
Michael Crosby
4d0ceee016 Merge pull request #7574 from crosbymichael/update-restart-docs 
Update flag usages and docs for max restart count
Upstream-commit: b0abd6de635e3bac9c6aa40aa98f53a5d9e15f98
Component: engine
 2014-08-25 16:26:06 -07:00
Michael Crosby
feacc1f671 Merge pull request #7622 from rajdeepd/master 
Added Test case for Engine shutdown
Upstream-commit: 2bdfbab23dc0b57fda9620a8a5a583da5e051e49
Component: engine
 2014-08-25 15:57:11 -07:00
Michael Crosby
601611b982 Merge pull request #7629 from LK4D4/fix_follow_hang_on_stop 
Fix logs -f hanging on stopped containers
Upstream-commit: 228eda4fd5a79dfe5eab1194f4133a71472fef0e
Component: engine
 2014-08-25 15:24:20 -07:00
Michael Crosby
6a5005c54d Merge pull request #7716 from coolljt0725/master 
Fix the bug of docker import command when import a image with a tag use format 'URL|- [REPOSITORY[:TAG]]'
Upstream-commit: 7556a4245364277f5747149c096a23ae6731fb4a
Component: engine
 2014-08-25 15:11:50 -07:00
Lei Jitang
a85c5401f4 add docker import test with a tag. Fixes #7714 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 7e72ed70f9cac871b845bebef0f96178c0f1a25c
Component: engine
 2014-08-26 15:51:22 +08:00
Lei Jitang
8270e6cad2 Fix the bug of docker import command when import a image with a tag use format 'URL|- [REPOSITORY[:TAG]]'.Fixes #7714 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 79cf8395277002011b7632e5a040d4f4a7a25d1f
Component: engine
 2014-08-26 15:51:22 +08:00
Michael Crosby
2b6c63642e Fix panic in validate context for build 
Fixes #7611

Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: cd776cdd77239353d8bd17d3e05d66665f381157
Component: engine
 2014-08-25 14:25:31 -07:00
Tibor Vass
ddfb7cb734 Merge pull request #7659 from somaopensource/soma 
daemon: rename from "delete" job to "rm"
Upstream-commit: 34438efffefdf4a2d93e5b2192dff4645828d745
Component: engine
 2014-08-25 15:54:14 -04:00
Michael Crosby
658ff140b7 Merge pull request #7649 from tianon/vendor-optional-go 
Optionalize the "hg clone" of Go, since it takes forever
Upstream-commit: 321df7fd6112776e5f9be3e6c950acd6895c4fd6
Component: engine
 2014-08-25 12:00:23 -07:00
Victor Vieux
534d06bd81 Merge pull request #7683 from LK4D4/fix_build_hang_pipe_#7680 
Skip permissions check on named pipes
Upstream-commit: d1544a09309afc637756bb1d69d0b2a65a90217a
Component: engine
 2014-08-25 12:00:11 -07:00
Alexandr Morozov
cb2b33e883 Skip permissions check on named pipes 
Fixes #7680

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 07f2e794867030c755901ae5479df03e3c4ce189
Component: engine
 2014-08-25 22:59:53 +04:00
Victor Vieux
05788083a7 Merge pull request #7691 from carmstrong/patch-1 
Fix typo for --restart deprecation
Upstream-commit: e1defe71c39bd810f74159436abd508adcabbfc1
Component: engine
 2014-08-25 11:13:27 -07:00
Michael Crosby
bb629d20ef Merge pull request #7725 from erikh/fix_registry_test 
fix return values in registry mock service
Upstream-commit: 2c9789bbf78457ed5f76230bf5802802aa7e42a0
Component: engine
 2014-08-25 10:56:00 -07:00
Erik Hollensbe
579f334a23 fix return values in registry mock service 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: e81b68692408ef717c2228986cc74102cae55772
Component: engine
 2014-08-25 10:29:38 -07:00
James Turnbull
1feb361a73 Merge pull request #7700 from jamtur01/relnotes 
Removed deprecated release notes
Upstream-commit: bef33cf88a761592d27d554828451f131a53d601
Component: engine
 2014-08-25 07:13:11 -07:00
Nicolas Goy
3af44a7cdf Added manual installation instruction for Centos7. 
Added a note about firewalld.

Signed-off-by: Nicolas Goy <kuon@goyman.com>
Upstream-commit: d4a53a7bce0205ba0cb693b43091b78f6ce8702a
Component: engine
 2014-08-25 04:00:11 +02:00
Alexandr Morozov
81067d8cbd Handle error from GetDevice early 
Also more verbose error.

Fixes panic from #7701

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 17b95ecb08f1705bd74d6c94c8bcfd4c87ccfca6
Component: engine
 2014-08-24 14:09:30 +04:00
James Turnbull
be7fbe7b1d Removed deprecated release notes 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: df38eb4d43b03728253593622fe4285e99d0784f
Component: engine
 2014-08-23 20:01:41 -04:00
Chris Armstrong
21c698ffdf Fix typo for --restart deprecation 
Signed-off-by: Chris Armstrong <chris@opdemand.com>
Upstream-commit: ef9a5926e9af408d68b3c68638a69727e42079fa
Component: engine
 2014-08-22 12:56:43 -07:00
James Turnbull
ea03464517 Merge pull request #7684 from averagehuman/patch-1 
Update usingdocker.md
Upstream-commit: 6bc773b2c1cbce828dde3a5bee7d7d4dd893ec3b
Component: engine
 2014-08-22 13:16:33 -04:00
averagehuman
5b6d059957 Update usingdocker.md 
Minor rewording and removal of unnecessary apostrophe.
Upstream-commit: fe845c4da88ef15baf45fa600a077a75f3634c40
Component: engine
 2014-08-22 17:48:26 +01:00
Tianon Gravi
b702e29c5d Merge pull request #7632 from erikh/fix_check_config 
fix check-config.sh to check for CGROUP_PERF
Upstream-commit: 651f521e1772e64f267e448bf88f0be246248cc8
Component: engine
 2014-08-22 11:42:08 -05:00
Victor Vieux
f77d69a509 Merge pull request #7638 from vivekdasgupta/minor-fixes 
Fix data space reporting from Kb/Mb to KB/MB
Upstream-commit: 094cd7040b538910f6b4d1d362162185099eb5af
Component: engine
 2014-08-22 11:40:49 -05:00
Victor Vieux
453c13d851 Merge pull request #7668 from docker/merge_release_v1.2.0 
Merge release v1.2.0
Upstream-commit: bd7c7febb9b825a1480319a02bdbe7e77736f5c6
Component: engine
 2014-08-22 11:18:48 -05:00
Victor Vieux
2ba23b90dc Change version to 1.2.0-dev 
Upstream-commit: 61b309f0d280b3b05909f294a30d73317a9d6a4d
Component: engine
 2014-08-21 15:55:00 -04:00
Victor Vieux
49ee40153f Merge remote-tracking branch 'origin/release' 
Upstream-commit: 380aef2dc1d99ccb070f46d5fc57841ab5e17714
Component: engine
 2014-08-21 15:54:02 -04:00
Victor Vieux
ecf3f11605 Merge pull request #7644 from vieux/bump_v1.2.0 
Bump v1.2.0
Upstream-commit: 7649264eb89614ddaed331560622ea0eb92c299c
Component: engine
 2014-08-21 14:32:00 -05:00
Hollie Teal
b6a88dc489 Clean up typos in hub_registry_spec.md 
Couple of instances of incorrect articles (e.g. "an Docker Hub").
Upstream-commit: c87d9a1de62678743436887edecdbde2e5a67a1a
Component: engine
 2014-08-21 11:04:25 -07:00