0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
27905 commits 14 branches 412 tags 338 MiB
Commit graph

210 commits

Author SHA1 Message Date
Jessie Frazelle
92c869cd12 Merge pull request #12437 from fmzhen/remove-regex-replace 
Removal of the regex to replace ips
 2015-05-19 22:59:17 +02:00
Alexander Morozov
3916561619 Fix Put without Get in overlay 
It is called for example on daemon start after crash

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-19 09:32:23 -07:00
Mingzhen Feng
3ab7ceb5d7 Removal of the regex to replace ips 
Signed-off-by: Mingzhen Feng <fmzhen@zju.edu.cn>
 2015-05-19 10:15:18 +08:00
Doug Davis
a85ca8b7c4 add link between -D and --log-level=debug back in 
Due to popular demand :-)
See #11965

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-14 10:29:49 -07:00
Antonio Murdaca
56847ec4d4 Merge pull request #13106 from duglin/HumanizeCliErrors 
Use stderr instead of logrus for CLI error messages
 2015-05-13 05:23:56 +02:00
Jessie Frazelle
36d995a291 Merge pull request #11965 from duglin/DEBUG 
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
 2015-05-12 18:24:04 -07:00
Doug Davis
0024935f64 Use stderr instead of logrus for CLI error messages 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-12 17:22:41 -07:00
Alexander Morozov
08230703fd Fix api servers creation and daemon start order 
* daemon creation wasn't parallel to request buffering
* it was possible that empty volume will be created in
  /var/run/docker.sock by some container

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-07 15:38:02 -07:00
Tibor Vass
0d0b42547e Merge pull request #12771 from runcom/say-bye-to-engine 
Remove engine
 2015-04-30 12:18:16 -04:00
Antonio Murdaca
f7e417ea5e Remove integration tests and port them to integration-cli 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-30 01:35:16 +02:00
Madhu Venugopal
1c073ec176 Moved explicit cleanups into defered action 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 11:41:13 -07:00
Madhu Venugopal
dd0666e64f Integration Tests for --icc=false & container Linking using --expose 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 10:16:31 -07:00
Madhu Venugopal
ba11929ebd Integration tests for --ip daemon option 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:49 -07:00
Madhu Venugopal
0e254411b1 Integration tests for --fixed-cidr daemon config 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:42 -07:00
Madhu Venugopal
9c325c3f54 Integration tests for --bip daemon flag 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:34 -07:00
Madhu Venugopal
f3f5ff9d83 Integration tests for --bridge daemon flag 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:25 -07:00
Doug Davis
534ed8c2d4 Remove use of "DEBUG" env var from CLI and decouple DEBUG from --log-level 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-29 06:20:33 -07:00
Alexander Morozov
57464c32b9 Implement daemon suite for integration-cli 
For creating and stopping test daemons automatically.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-27 15:48:29 -07:00
David Mackey
3941623fbc trivial: typo cleanup 
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
 2015-04-27 13:35:08 -07:00
Srini Brahmaroutu
05013f1250 Move https integration tests as unit tests under client 
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-04-23 15:40:46 +00:00
Alexander Morozov
dc944ea7e4 Use suite for integration-cli 
It prints test name and duration for each test.
Also performs deleteAllContainers after each test.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-21 10:28:52 -07:00
Alexander Morozov
181fea24aa 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>
 2015-04-20 08:13:39 -07:00
Jessica Frazelle
9a87553e4f cleanup test wrong key.json leading to other failures 
wait for container to be running before trying to kill it in daemon tests

Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-13 16:58:44 -07:00
Evan Hazlett
6b40377c18 Merge pull request #12262 from YanFeng-Adam/daemon 
A wrong key.json would remain if the TestDaemonwithwrongkey case fails. The issue would lead to failure of other cases.
 2015-04-13 16:00:20 -04:00
Antonio Murdaca
db0ffba3b9 Remove job from wait 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-10 20:17:02 +02:00
Yan Feng
bfc68d10ed A wrong key.json would remain if the TestDaemonwithwrongkey case fails. The issue would lead to failure of other cases. 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
 2015-04-10 11:10:26 -04:00
Yuan Sun
ef13dcd4dc add TestDaemonwithwrongkey test case 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-06 08:57:47 +08:00
Arnaud Porterie
02c2308e39 Properly stop test daemon in integration-cli 
Always stop the test daemon in an attempt to fix race conditions in
subsequent tests.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-02 08:53:31 -07:00
paul
c5bf2145f1 Fix vet warning 
Signed-off-by: Paul Mou <ppymou@gmail.com>
 2015-03-25 20:31:02 -07:00
Brian Goff
16309bef63 Add integration test for unix sock cleanup 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-03-20 12:34:35 -04:00
Phil Estes
9d5eab1873 Merge pull request #11453 from duglin/HideDaemonDots 
Hide dots on daemon startup when loglevel != info
 2015-03-19 10:10:18 -04:00
Jessie Frazelle
a5269223a7 Merge pull request #11320 from estesp/fix-daemon-startup 
Fix daemon shutdown on error after rework of daemon startup
 2015-03-17 19:04:25 -07:00
Doug Davis
88dc6cc2df Hide dots on daemon startup when loglevel != info 
When the deamon starts up with log level set to INFO it will show something
like this:
```
INFO[0000] Loading containers: start.
................................................................
INFO[0000] Loading containers: done.
```
where the dots represent containers in the system.
When you run with log level set to "error" it will still show the dots
w/o the "Loading..." lines before and after which looks really odd.
This PR will fix it so that the dots are only shown IFF the "Loading..."
lines are also shown

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-17 17:27:53 -07:00
Phil Estes
459e58ffc9 Fix daemon shutdown on error after rework of daemon startup 
Currently the daemon will not stop on error because the serve API job is
blocking the channel wait for daemon init.  A better way is to run the
blocking serve API job as a goroutine and make sure that error
notification gets back to the main daemon thread (using the already
existing channel) so that clean shutdown can occur on error.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-03-17 14:15:00 -04:00
Alexander Morozov
bdf3a0295d Fail docker logs on all logging drivers apart from 'json-file' 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-13 15:02:09 -07:00
Alexander Morozov
dd6d2cd660 Tests for --log-driver options 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-13 12:13:37 -07:00
Yuan Sun
906974b185 correct some daemon spelling mistakes 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-03-13 05:14:56 -04:00
Michael Crosby
5494432f91 Merge pull request #11331 from jfrazelle/update-logrus 
Update logrus to 0.6.6
 2015-03-11 16:18:22 -07:00
Brian Goff
c5c72cf151 Persist container to disk after rename 
Fixes #11315

After rename occured the graphdb was updated but the container struct
was never commited back to disk, so on daemon restart it loads the old
name again.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-03-11 12:39:31 -07:00
Jessica Frazelle
89e2e5fc55 Update logrus to 0.6.6 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-11 11:29:13 -07:00
Jessica Frazelle
80d585b0c7 Skip new ulimits test on lxc 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-04 08:28:32 -08:00
Brian Goff
3f39050637 Allow setting ulimits for containers 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-02-25 19:37:43 -05:00
Ahmet Alp Balkan
70407ce40c Better test cleanup with defer 
This fixes a few misuses of `deleteAllContainers()` cleanup
method in integration-cli suite by moving call to the
beginning of the method and guaranteeing their execution
(including panics) with `defer`s.

Also added some forgotten cleanup calls while I'm at it.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-02-20 14:04:36 -08:00
Derek McGowan
0eed1f4d8d Defer creation of trust key file until needed 
Fixes #10442

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-29 13:46:12 -08:00
Brian Goff
b54305ae23 Do not return err on symlink eval 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-01-26 15:22:32 -05:00
Derek McGowan
42612ff6db Add key migration integration test 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-22 10:51:04 -08:00
Derek McGowan
a34a7930b5 Add TODO lines for windows 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-22 10:29:15 -08:00
Derek McGowan
06af013f8b Fix daemon key file location 
Fixes #10233

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-21 16:28:19 -08:00
Brian Goff
e744b0dcba Fix volume ref restore process 
Fixes #9629 #9768

A couple of issues:

1) Volume config is not restored if we couldn't find it with the graph
driver, but bind-mounts would never be found by the graph driver since
they aren't in that dir

2) container volumes were only being restored if they were found in the
volumes repo, but volumes created by old daemons wouldn't be in the
repo until the container is at least started.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-01-20 15:54:56 -05:00
Arnaud Porterie
f3ed42286e Enable test-integration-cli for Windows platform 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2014-12-20 16:40:40 -08:00