centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-04 18:28:58 +07:00
Code Issues Packages Projects Releases Wiki Activity
16,124 Commits 56 Branches 28 Tags
65d0670d65ecd79984a51ceeef3e25dd67bafa1c
Commit Graph

70 Commits

Author SHA1 Message Date
Michael Crosby
4750e1f77e Merge pull request #13784 from mrjana/cnm_integ 
libnetwork: Add garbage collection trigger
 2015-06-09 17:24:30 -07:00
Jana Radhakrishnan
c68e7f96f9 libnetwork: Add garbage collection trigger 
When the daemon is going down trigger immediate
garbage collection of libnetwork resources deleted
like namespace path since there will be no way to
remove them when the daemon restarts.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-06-07 21:33:51 -07:00
Eric-Olivier Lamey
5fa60149e2 Restore --default-gateway{,-v6} daemon options. 
This was added before the libnetwork merge, and then lost. Fixes #13755.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
 2015-06-05 06:21:22 +00:00
David Calavera
04c6f09fbd Merge pull request #12400 from coolljt0725/kill_all_containers_on_daemon_shutdown 
Ensure all the running containers are killed on daemon shutdown
 2015-05-29 16:45:57 -07:00
Jessica Frazelle
1392f99a97 skip test on lxc 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-28 14:54:12 -07:00
Lei Jitang
bdb77078b5 Ensure all the running containers are killed on daemon shutdown 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-27 09:09:25 +08:00
Alexander Morozov
3cb14df68c Fix network with -b none 
* Don't AllocateNetwork when network is disabled
* Don't createNetwork in execdriver when network is disabled

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-24 08:26:59 -07:00
David Calavera
81fa9feb0c Volumes refactor and external plugin implementation. 
Signed by all authors:

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Jeff Lindsay <progrium@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Signed-off-by: Luke Marsden <luke@clusterhq.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-21 20:34:17 -07:00
Jessie Frazelle
d29dc0b608 Merge pull request #13325 from LK4D4/cleanup_mounts 
Fix Put without Get in overlay
 2015-05-20 03:11:58 +02:00
Jana Radhakrishnan
d18919e304 Docker integration with libnetwork 
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
    - Reworked daemon to allocate network resources using libnetwork.
    - Reworked remove link code to also update network resources in libnetwork.
    - Adjusted the exec driver command population to reflect libnetwork design.
    - Adjusted the exec driver create command steps.
    - Updated a few test cases to reflect the change in design.
    - Removed the dns setup code from docker as resolv.conf is entirely managed
      in libnetwork.
    - Integrated with lxc exec driver.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-05-19 22:40:19 +00:00
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