bc706dc232
Enable docker search on private docker registry.
...
The cli interface works similar to other registry related commands:
docker search foo
... searches for foo on the official hub
docker search localhost:5000/foo
... does the same for the private reg at localhost:5000
Signed-off-by: Daniel Menet <membership@sontags.ch >
Upstream-commit: 3231033a80451adff73b53554e27fbabfebb4a4f
Component: engine
2014-08-16 14:24:32 +02:00
81204a3417
Merge pull request #7594 from vieux/remove_empty_folder
...
remove empty builder folder
Upstream-commit: 7afb98ad5d50c9c8e606826684663df1b158cb02
Component: engine
2014-08-15 10:57:14 -07:00
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
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
3c73976245
Merge pull request #7593 from tianon/remove-crashtest
...
Remove crashTest.go since the use case is covered by docker-stress
Upstream-commit: a20f4ce291589bc909d961893db2efd621f3af48
Component: engine
2014-08-15 10:43:45 -07:00
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
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
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
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
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
ae69b5776a
Merge pull request #7582 from LK4D4/fix_races
...
Fix some race conditions
Upstream-commit: 5a1e4a1092fca71d886c74ac8d6c59c56f1efaec
Component: engine
2014-08-14 14:35:04 -07:00
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
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
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
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
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
974ae2755d
Update docker-attach.1.md
...
Upstream-commit: 5073554ca67f7f1f3f21d87cab766708556486c2
Component: engine
2014-08-14 14:20:38 +02:00
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
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
d5f518ec2f
Merge pull request #7532 from ChristopherBiscardi/shiftWindow
...
Remove Old shiftWindow()
Upstream-commit: f945edb3e0ae42645f1f52026edbf0869044379d
Component: engine
2014-08-14 12:48:19 +10:00
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
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
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
1a2cf739e4
Merge pull request #7414 from crosbymichael/auto-restart
...
Auto restart containers based on restart policy
Upstream-commit: b95f6c183bca45e8f38d3c8abc5dcb2d0eee2ad6
Component: engine
2014-08-13 16:17:51 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
ba241d3034
Merge pull request #7569 from erikh/pkg_log
...
Cleanup: Extract log utils into pkg/log
Upstream-commit: 0d70706b4b6bf9d5a5daf46dd147ca71270d0ab7
Component: engine
2014-08-13 18:43:08 -04:00
171ec8cb7a
Merge pull request #7572 from shykes/workaround-api-shutdown
...
Workaround to avoid 5 second delay on graceful daemon restart
Upstream-commit: 6b363b81dec924f4a281b624313475f4d5dc9dea
Component: engine
2014-08-13 15:41:33 -07:00
b8d5783511
move utils.Fataler to pkg/log.Fataler
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: ac63d925d2618e700d117c5d9e402ccc0c5cecc8
Component: engine
2014-08-13 15:32:41 -07:00
4737f7cea5
Extract log utils into pkg/log
...
Docker-DCO-1.1-Signed-off-by: Josiah Kiehl <josiah@capoferro.net > (github: capoferro)
Upstream-commit: a02f67be5b17da63d475e6f35956c1e72c3b2e7b
Component: engine
2014-08-13 15:18:15 -07:00
1a6b687cce
Merge pull request #7506 from shykes/cleanup-daemonconfig
...
Cleanup: refactor parsing and handling of Daemon config
Upstream-commit: 13eb477b62b51d906fa88f508d2c560a2b4946aa
Component: engine
2014-08-13 15:07:13 -07:00
230d6c3581
Workaround to avoid 5 second delay on graceful daemon restart
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: 6aecdb4f8e73031f0deeac88a88ffc3fad9d5377
Component: engine
2014-08-13 21:40:25 +00:00
fdd5ed90fc
Merge pull request #7548 from crosbymichael/proxy-exec
...
Move userland proxies out of daemon process
Upstream-commit: fd1b563b4faede0a1d3fc91d4243442ab2ebe1a6
Component: engine
2014-08-13 14:03:40 -07:00
985ab960df
Merge pull request #7570 from erikh/remove_fixme
...
Remove FIXME file
Upstream-commit: 2837a36bd73081b314004a9afcf4b2beada4821f
Component: engine
2014-08-13 13:55:20 -07:00