toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,116 Commits 3 Branches 295 Tags
cd586bd31edb4bd82641e372058b00688d4c050d
Commit Graph

9314 Commits

Author SHA1 Message Date
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
dragon788
3228a8d12a Add link to Ubuntu notes about LTSEnablementStack 
When running Ubuntu with a graphical environment, the kernel version MUST match the Xorg version. Only installing the suggested packages above breaks Unity for anything other than 2D mode (in VMware and probably native).
Signed-off-by: Ethan Spoelstra <ewspoelstra@computerphreaks.com>
Upstream-commit: 27f44b9bb162dce988913b981f1f21eb149d875f
Component: engine
 2014-08-20 22:23:34 -05:00
Victor Vieux
e1c4c1ad6b Merge pull request #7608 from LK4D4/remove_internet_dep 
Remove internet dependency from TestBuildCacheADD
Upstream-commit: d4c2d0c57f18a7b09be95ba62d7476f3c3c81ede
Component: engine
 2014-08-19 14:13:52 -05:00
Vincent Batts
86ad3b1104 Merge pull request #7602 from unclejack/tarsum_garbage_reduction 
pkg/tarsum: avoid buf2 allocation in Read
Upstream-commit: 487af281bf39417f95d51c70557e9e5ca3e90f8d
Component: engine
 2014-08-19 13:50:15 -04:00
Michael Crosby
f789bbd122 Merge pull request #7613 from VojtechVitek/godoc_travis 
Add GoDoc and Travis build link/images to README
Upstream-commit: 7db55a1807d3fb2771026a1016c50cdd94d6b039
Component: engine
 2014-08-19 12:21:05 -05:00
Fred Lifton
03f9c00b29 Merge pull request #7604 from SvenDowideit/docs-update 
update the cli / man page docs based on what is in master right now
Upstream-commit: abc134677740803ea2e854ae0e87cfa4cfbd202a
Component: engine
 2014-08-19 10:12:50 -07:00
Michael Crosby
d9d0f62578 Fix search test for busybox image 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: dad2fcb1993d9cd7c513db10965aa37d7f9a542d
Component: engine
 2014-08-19 09:52:46 -07:00
Vojtech Vitek (V-Teq)
f481aa1f06 Add GoDoc and Travis build link/images to README 
Signed-off-by: Vojtech Vitek (V-Teq) <vvitek@redhat.com>
Upstream-commit: 7cb68713552d2b153ed18bc6dcdcee5b69ef0a5f
Component: engine
 2014-08-19 01:08:47 +02:00
Remi Rampin
b71571fd04 Fixes "note" blockquote too long [doc, minor] 
A "note" block includes too much text, so if you skip over it the next paragraph makes zero sense.
Upstream-commit: 99082de9ada13a5898e769c176a88488d310b1a4
Component: engine
 2014-08-18 15:31:37 -04:00
Alexandr Morozov
b18ccc6846 Remove internet dependency from TestBuildCacheADD 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 075e1bc1c35b5f130f6ae7961782ff9af79817bc
Component: engine
 2014-08-18 14:13:43 +04:00
SvenDowideit
43acaaf00e update the cli / man page docs based on what is in master right now 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 018e75a6e4ef955cd802267818b6a6c81a600c9a
Component: engine
 2014-08-18 09:31:58 +10:00
unclejack
e56ddc1f46 pkg/tarsum: avoid buf2 allocation in Read 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 55533693be0f268d7d7a2d339369ce8617398542
Component: engine
 2014-08-17 14:45:11 +03:00
Michael Crosby
693c6c8fed Update libcontainer to 29363e2d2d7b8f62a5f353be333 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: a67d06fd4343024ed25c3faf40e58c9a1935c28a
Component: engine
 2014-08-15 15:41:05 -07:00
Victor Vieux
746910e315 remove empty builder folder 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 57564d91a4128f7ee2952e7bdbda54463deac03b
Component: engine
 2014-08-15 17:52:44 +00:00
Victor Vieux
ef4beedfeb Merge pull request #7589 from shykes/cleanup-img-depth 
Cleanup: move image depth checks in image/
Upstream-commit: 101c749b6533ab309eccea6b6c6173a0c25f787d
Component: engine
 2014-08-15 10:47:36 -07:00
Tianon Gravi
ae82a3441b Remove crashTest.go since the use case is covered by docker-stress 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 3a70ca3c671053f599d4f3b226c2a787b369e752
Component: engine
 2014-08-15 11:28:58 -06:00
Fred Lifton
397a4ab41c Merge pull request #7581 from samuel-phan/patch-1 
Update docker-attach.1.md
Upstream-commit: d1fc32e265c57d78dcbfd1ddf2d272c1ebd27c8b
Component: engine
 2014-08-14 18:36:23 -07:00
Fred Lifton
1aae74c809 Merge pull request #7562 from jperrin/master 
Updated CentOS documentation to reflect CentOS 7 install.
Upstream-commit: 31bd4a19c9e88ac450495c0cb4dd594b7cc4be9f
Component: engine
 2014-08-14 18:32:05 -07:00
Fred Lifton
399d98c0d7 Merge pull request #7546 from hollietealok/master 
Added fredlf's suggested changes.
Upstream-commit: 4bcc7e283f4191d2505bc87c2eaa5a38cb15b356
Component: engine
 2014-08-14 18:27:50 -07:00
Solomon Hykes
ef058f588f Cleanup: move image depth checks in image/ 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 2a39635d30a5ecbf3f8020dcb272cd8ae939fe06
Component: engine
 2014-08-15 00:43:12 +00:00
Alexandr Morozov
0b9e4ed61e Cleanup: Make channels unbuffered 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 0d4d7e4a2851c60f768f71a79a78c068fd9dffe8
Component: engine
 2014-08-14 21:51:25 +04:00
Alexandr Morozov
c26305d808 Fix race on state serialization 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: f1975cbc7c5b551e5a206c15f32aef3d51904408
Component: engine
 2014-08-14 21:51:15 +04:00
Alexandr Morozov
1b8bad68b3 Fix race between container cleanup and inspect/ps 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 93d6adf8a19855edf118d27d0239222f572d8292
Component: engine
 2014-08-14 21:51:06 +04:00
Alexandr Morozov
f4db7d15dc Fix race condition in sending started signal from monitor 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 1480168e9f6178e4015aa4dcc035a6963c59f431
Component: engine
 2014-08-14 21:50:56 +04:00
James Turnbull
c395d23539 Merge pull request #7126 from ostezer/update-certificates 
Docs: articles/certificates.md rewrite.
Upstream-commit: 17112704b99405aa642df37d5c8b7e369dd0b4ab
Component: engine
 2014-08-14 08:52:08 -04:00
Samuel PHAN
974ae2755d Update docker-attach.1.md 
Upstream-commit: 5073554ca67f7f1f3f21d87cab766708556486c2
Component: engine
 2014-08-14 14:20:38 +02:00
Victor Vieux
5144e74fe1 Merge pull request #7573 from vieux/remove_double_newline 
remove double newline
Upstream-commit: a7d116f1b0e81a739e7451e6f852805c479c68d6
Component: engine
 2014-08-13 23:24:30 -07:00
Andy Rothfusz
1ca8702dce Merge pull request #7544 from metalivedev/fixmailmap 
Fix my email entry. FIxing email entry.
Upstream-commit: 31a9c97d7d1abeb8ef544c3a3da7e3307a96a323
Component: engine
 2014-08-13 20:05:56 -07:00
Sven Dowideit
d5f518ec2f Merge pull request #7532 from ChristopherBiscardi/shiftWindow 
Remove Old shiftWindow()
Upstream-commit: f945edb3e0ae42645f1f52026edbf0869044379d
Component: engine
 2014-08-14 12:48:19 +10:00
Victor Vieux
9df494bb71 another commit to do like @crosbymichael 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: a0392324f194f4f92e3205f0c0ed8b71dc2fc93f
Component: engine
 2014-08-14 01:36:26 +00:00
Victor Vieux
0bb709c134 remove double newline 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: fcf37be2b1efa11da1958658da0e04755a225c89
Component: engine
 2014-08-14 01:08:27 +00:00
Jim Perrin
7b00009aba Updated CentOS documentation to reflect CentOS 7 install. 
Added reference to CentOS Dockerfiles on github.

Signed-off-by: Jim Perrin <jperrin@centos.org> (github: jperrin)
Upstream-commit: d939fe758affe15f5054216f6e594eae386adca3
Component: engine
 2014-08-13 19:06:53 -05:00
Michael Crosby
9b55fc0736 Deprecate --restart on the daemon 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 25c519e829640ebb23061b82c6ace88c5983b63d
Component: engine
 2014-08-13 16:08:50 -07:00
Michael Crosby
db45de23ad Update based on comments from the code review 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 73ced636800c150640e2f0d307842b0f9259b611
Component: engine
 2014-08-13 15:58:55 -07:00
Michael Crosby
02f3d4abed Rebased changes to return on first start's error 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 2ec1b697c1a7c0ecc534b9ebffd7ba40ea285ff7
Component: engine
 2014-08-13 15:58:55 -07:00
Michael Crosby
10b2364f13 Reguardless of success reset time increment 
Reset the time increment if the container's execution time is greater
than 10s or else as a container runs and is restarted the time will grow
overtime.

Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: ebf5d4657d14c7b57a5ca1c7b8689077b18b33dc
Component: engine
 2014-08-13 15:58:54 -07:00
Michael Crosby
9726fa5fb8 Improve wait during restart 
We need to do this so that when a user asks docker to stop the container
and it is currently in the restart loop we don't want to have to wait
for the duration of the restart time increment before ack. the stop.

Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 972c89493148f930388097816663d453bf3e8c2c
Component: engine
 2014-08-13 15:58:54 -07:00
Michael Crosby
5ac7ecfbf7 Honor the restarting state in Stop 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: c4a00d549d0b895bb990491cbdf58aabe2891842
Component: engine
 2014-08-13 15:58:54 -07:00
Michael Crosby
73d4ecfe93 Add Restarting state when docker is handling the restart of containers 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: a2afb2b1e37e72cab0d68cfe8dd0ec830b7a54e5
Component: engine
 2014-08-13 15:58:54 -07:00
Michael Crosby
6ce3708a40 Add additional comments for vague lines 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: be22d7ac2db6396becd63ec2dd28b9731011c9b9
Component: engine
 2014-08-13 15:58:54 -07:00
Michael Crosby
1f88a5f013 Move container start event into monitor 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 6ae05936e1f343a2ecc51b8f642bdc8b93325d81
Component: engine
 2014-08-13 15:58:54 -07:00
Michael Crosby
4dadb32ece Fix rebase around log event 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: b7550cd456e29874279499a546b07bb062a12096
Component: engine
 2014-08-13 15:58:54 -07:00
Michael Crosby
1c96d24788 Restart conatiner with on-failure policy if exit code != 0 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: feda8fbb21489f64aa3b7340c94473a08502bd6b
Component: engine
 2014-08-13 15:58:54 -07:00
Michael Crosby
91b1d9394b Only restart containers on daemon load with policy of always 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 41870a42bee9c394c61aba4bd81f782dbd38da12
Component: engine
 2014-08-13 15:58:54 -07:00
Michael Crosby
623a65a209 Update docs based on feedback from review for --restart 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 617edd89f48a7082bf4ec1d28ec12eefd1057a2f
Component: engine
 2014-08-13 15:57:37 -07:00
Michael Crosby
ed9f19284d Add documentation and update restart rules. 
Implement time backed backoff for restarting and fix failure count when
the maximum is 0

Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 860c13b788944410a98a6ad5b5cfb74de0a8405b
Component: engine
 2014-08-13 15:57:37 -07:00
Michael Crosby
b614c77a54 Refactor container monitor into type 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 2b0776c883c41cda0b86808fe86e4df6e1aa1cd5
Component: engine
 2014-08-13 15:56:53 -07:00
Michael Crosby
a9837fc603 Add typed RestartPolicy 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: d9753ba20d5e602b0980687353d76c874b563042
Component: engine
 2014-08-13 15:56:34 -07:00
Michael Crosby
b662f7de79 Cleanup restart logic in monitor 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: e0a076d486ea49529dc3aeef2179eb0c406d0773
Component: engine
 2014-08-13 15:56:34 -07:00
Michael Crosby
49eb58207e Restart containers based on restart policy 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: bd8c9dc2395032a893e959e48f9a8536858d67e0
Component: engine
 2014-08-13 15:56:34 -07:00