Commit Graph

10112 Commits

Author SHA1 Message Date
Vincent Batts 487af281bf Merge pull request #7602 from unclejack/tarsum_garbage_reduction
pkg/tarsum: avoid buf2 allocation in Read
2014-08-19 13:50:15 -04:00
Michael Crosby 7db55a1807 Merge pull request #7613 from VojtechVitek/godoc_travis
Add GoDoc and Travis build link/images to README
2014-08-19 12:21:05 -05:00
Fred Lifton abc1346777 Merge pull request #7604 from SvenDowideit/docs-update
update the cli / man page docs based on what is in master right now
2014-08-19 10:12:50 -07:00
Tibor Vass 39bcc3a3e5 Merge pull request #7628 from crosbymichael/fix-search-test
Fix search test for busybox image
2014-08-19 12:11:29 -05:00
Michael Crosby dad2fcb199 Fix search test for busybox image
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-19 09:52:46 -07:00
Sven Dowideit 366fe67946 Merge pull request #7610 from remram44/patch-1
Fixes "note" blockquote too long [doc, minor]
2014-08-19 09:11:15 +10:00
Vojtech Vitek (V-Teq) 7cb6871355 Add GoDoc and Travis build link/images to README
Signed-off-by: Vojtech Vitek (V-Teq) <vvitek@redhat.com>
2014-08-19 01:08:47 +02:00
Remi Rampin 99082de9ad 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.
2014-08-18 15:31:37 -04:00
Michael Crosby 37db53bf7a Merge pull request #7597 from crosbymichael/update-libcontainer-aug4
Update libcontainer to 29363e2d2d7b8f62a5f353be333
2014-08-18 12:24:17 -05:00
SvenDowideit 018e75a6e4 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)
2014-08-18 09:31:58 +10:00
unclejack 55533693be pkg/tarsum: avoid buf2 allocation in Read
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-08-17 14:45:11 +03:00
Michael Crosby a67d06fd43 Update libcontainer to 29363e2d2d7b8f62a5f353be333
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-15 15:41:05 -07:00
Victor Vieux 7afb98ad5d Merge pull request #7594 from vieux/remove_empty_folder
remove empty builder folder
2014-08-15 10:57:14 -07:00
Victor Vieux 57564d91a4 remove empty builder folder
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-08-15 17:52:44 +00:00
Victor Vieux 101c749b65 Merge pull request #7589 from shykes/cleanup-img-depth
Cleanup: move image depth checks in image/
2014-08-15 10:47:36 -07:00
Tianon Gravi a20f4ce291 Merge pull request #7593 from tianon/remove-crashtest
Remove crashTest.go since the use case is covered by docker-stress
2014-08-15 10:43:45 -07:00
Tianon Gravi 3a70ca3c67 Remove crashTest.go since the use case is covered by docker-stress
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-08-15 11:28:58 -06:00
Fred Lifton d1fc32e265 Merge pull request #7581 from samuel-phan/patch-1
Update docker-attach.1.md
2014-08-14 18:36:23 -07:00
Fred Lifton 31bd4a19c9 Merge pull request #7562 from jperrin/master
Updated CentOS documentation to reflect CentOS 7 install.
2014-08-14 18:32:05 -07:00
Fred Lifton 4bcc7e283f Merge pull request #7546 from hollietealok/master
Added fredlf's suggested changes.
2014-08-14 18:27:50 -07:00
Solomon Hykes 2a39635d30 Cleanup: move image depth checks in image/
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-15 00:43:12 +00:00
Victor Vieux 5a1e4a1092 Merge pull request #7582 from LK4D4/fix_races
Fix some race conditions
2014-08-14 14:35:04 -07:00
Alexandr Morozov 0d4d7e4a28
Cleanup: Make channels unbuffered
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-14 21:51:25 +04:00
Alexandr Morozov f1975cbc7c
Fix race on state serialization
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-14 21:51:15 +04:00
Alexandr Morozov 93d6adf8a1
Fix race between container cleanup and inspect/ps
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-14 21:51:06 +04:00
Alexandr Morozov 1480168e9f
Fix race condition in sending started signal from monitor
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-14 21:50:56 +04:00
James Turnbull 17112704b9 Merge pull request #7126 from ostezer/update-certificates
Docs: articles/certificates.md rewrite.
2014-08-14 08:52:08 -04:00
Samuel PHAN 5073554ca6 Update docker-attach.1.md 2014-08-14 14:20:38 +02:00
Victor Vieux a7d116f1b0 Merge pull request #7573 from vieux/remove_double_newline
remove double newline
2014-08-13 23:24:30 -07:00
Andy Rothfusz 31a9c97d7d Merge pull request #7544 from metalivedev/fixmailmap
Fix my email entry. FIxing email entry.
2014-08-13 20:05:56 -07:00
Sven Dowideit f945edb3e0 Merge pull request #7532 from ChristopherBiscardi/shiftWindow
Remove Old shiftWindow()
2014-08-14 12:48:19 +10:00
Victor Vieux a0392324f1 another commit to do like @crosbymichael
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-08-14 01:36:26 +00:00
Victor Vieux fcf37be2b1 remove double newline
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-08-14 01:08:27 +00:00
Jim Perrin d939fe758a 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)
2014-08-13 19:06:53 -05:00
Michael Crosby b95f6c183b Merge pull request #7414 from crosbymichael/auto-restart
Auto restart containers based on restart policy
2014-08-13 16:17:51 -07:00
Michael Crosby 25c519e829 Deprecate --restart on the daemon
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 16:08:50 -07:00
Michael Crosby 73ced63680 Update based on comments from the code review
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:55 -07:00
Michael Crosby 2ec1b697c1 Rebased changes to return on first start's error
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:55 -07:00
Michael Crosby ebf5d4657d 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>
2014-08-13 15:58:54 -07:00
Michael Crosby 972c894931 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>
2014-08-13 15:58:54 -07:00
Michael Crosby c4a00d549d Honor the restarting state in Stop
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
Michael Crosby a2afb2b1e3 Add Restarting state when docker is handling the restart of containers
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
Michael Crosby be22d7ac2d Add additional comments for vague lines
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
Michael Crosby 6ae05936e1 Move container start event into monitor
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
Michael Crosby b7550cd456 Fix rebase around log event
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
Michael Crosby feda8fbb21 Restart conatiner with on-failure policy if exit code != 0
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
Michael Crosby 41870a42be Only restart containers on daemon load with policy of always
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:58:54 -07:00
Michael Crosby 617edd89f4 Update docs based on feedback from review for --restart
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:57:37 -07:00
Michael Crosby 860c13b788 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>
2014-08-13 15:57:37 -07:00
Michael Crosby 2b0776c883 Refactor container monitor into type
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-13 15:56:53 -07:00