Commit Graph

71 Commits

Author SHA1 Message Date
69ff11d75b Fix DOCKER_TLS_VERIFY being ignored
DOCEKR_TLS_VERIFY was being ignored because we were just checking if the
`-tlsverify` flag was set, not the actual value, which is defaulted to
the value of `os.Getenv("DOCKER_TLS_VERIFY") != ""`

The problem that this specifically fixes is where the client has set the
`DOCKER_TLS_VERIFY` env var but is connecting to a daemon that is not
verifed.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5a6a33f7acccc7394a5ac418e777d5a6e1d1b7ed
Component: engine
2015-06-16 12:04:00 -04:00
0ae1820eeb Merge pull request #13784 from mrjana/cnm_integ
libnetwork: Add garbage collection trigger
Upstream-commit: 4750e1f77ef1f42f8b826f7314ec4c2b3f7a4f34
Component: engine
2015-06-09 17:24:30 -07:00
2ee4e129d1 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>
Upstream-commit: c68e7f96f9636a9b2ab0c2c0dbf753161fa73fc2
Component: engine
2015-06-07 21:33:51 -07:00
9644714f56 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>
Upstream-commit: 5fa60149e27a8d8e50e6fc6210a2d2bea93c8ab2
Component: engine
2015-06-05 06:21:22 +00:00
4610cc7a2b Merge pull request #12400 from coolljt0725/kill_all_containers_on_daemon_shutdown
Ensure all the running containers are killed on daemon shutdown
Upstream-commit: 04c6f09fbdf60c7765cc4cb78883faaa9d971fa5
Component: engine
2015-05-29 16:45:57 -07:00
fefb50c37a skip test on lxc
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 1392f99a974bd03848b1080a263db2b7def2fc02
Component: engine
2015-05-28 14:54:12 -07:00
6aa7cf16be Ensure all the running containers are killed on daemon shutdown
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: bdb77078b5b93c3075aa258e1c04a5a5c893430f
Component: engine
2015-05-27 09:09:25 +08:00
7623ba5e39 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>
Upstream-commit: 3cb14df68c1a59981907fec3bccab80a1d0dda59
Component: engine
2015-05-24 08:26:59 -07:00
89782c55eb 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>
Upstream-commit: 81fa9feb0cdc0773eff99d7393c16271e84aac08
Component: engine
2015-05-21 20:34:17 -07:00
03f7a130a4 Merge pull request #13325 from LK4D4/cleanup_mounts
Fix Put without Get in overlay
Upstream-commit: d29dc0b608f106ed589d25117abbbba3f5157bfe
Component: engine
2015-05-20 03:11:58 +02:00
13426de5e6 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>
Upstream-commit: d18919e304c240df84502cdcc5ed655d92d12d4f
Component: engine
2015-05-19 22:40:19 +00:00
f0cacf3e79 Merge pull request #12437 from fmzhen/remove-regex-replace
Removal of the regex to replace ips
Upstream-commit: 92c869cd12313c8832584c1eb671577d070f8a5b
Component: engine
2015-05-19 22:59:17 +02:00
8911352f54 Fix Put without Get in overlay
It is called for example on daemon start after crash

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3916561619d45a3d8ca17dfa467149824111023a
Component: engine
2015-05-19 09:32:23 -07:00
2d7bfa2f2c Removal of the regex to replace ips
Signed-off-by: Mingzhen Feng <fmzhen@zju.edu.cn>
Upstream-commit: 3ab7ceb5d7aaa5fc04af98aae4115201ebae13ee
Component: engine
2015-05-19 10:15:18 +08:00
2095b80959 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>
Upstream-commit: a85ca8b7c40f05f2b6471cc30fb8d5271605c1d1
Component: engine
2015-05-14 10:29:49 -07:00
af27a9480d Merge pull request #13106 from duglin/HumanizeCliErrors
Use stderr instead of logrus for CLI error messages
Upstream-commit: 56847ec4d4c24535bd8f4763e895f609eec9e8cf
Component: engine
2015-05-13 05:23:56 +02:00
d58b604612 Merge pull request #11965 from duglin/DEBUG
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
Upstream-commit: 36d995a291c672205d1e8f93f19fb07de253c3d7
Component: engine
2015-05-12 18:24:04 -07:00
2e83148ffd Use stderr instead of logrus for CLI error messages
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 0024935f641ab596732f9162d3eab795bbc2ae06
Component: engine
2015-05-12 17:22:41 -07:00
6da49015e7 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>
Upstream-commit: 08230703fdd0f7bcd9a87a0d61d88fdf2b901e66
Component: engine
2015-05-07 15:38:02 -07:00
203abf3991 Merge pull request #12771 from runcom/say-bye-to-engine
Remove engine
Upstream-commit: 0d0b42547e74e183c7c459a13877bd27c21dba0c
Component: engine
2015-04-30 12:18:16 -04:00
0ec0dcde9e Remove integration tests and port them to integration-cli
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: f7e417ea5e26f11ec43dba64ee153765d2276f40
Component: engine
2015-04-30 01:35:16 +02:00
9d5c96c875 Moved explicit cleanups into defered action
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 1c073ec1766e0f3cfe28d8f9c2e9a9a37154ece6
Component: engine
2015-04-29 11:41:13 -07:00
0976611d84 Integration Tests for --icc=false & container Linking using --expose
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: dd0666e64f17329355c77aae1a2ac0fe2fe43402
Component: engine
2015-04-29 10:16:31 -07:00
febe54901d Integration tests for --ip daemon option
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: ba11929ebdf4cf7798cddc98c4dcfc000b154264
Component: engine
2015-04-29 09:55:49 -07:00
73bcda784f Integration tests for --fixed-cidr daemon config
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 0e254411b1fe0b5024d4a8e5ade7ce12f4545d8e
Component: engine
2015-04-29 09:55:42 -07:00
e04b055914 Integration tests for --bip daemon flag
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 9c325c3f54b24621b76dee530a855b37cb22abcc
Component: engine
2015-04-29 09:55:34 -07:00
2a71cc5aaf Integration tests for --bridge daemon flag
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: f3f5ff9d837eecb97eeeb878f0bd416b6ab57cf2
Component: engine
2015-04-29 09:55:25 -07:00
53d8f39607 Remove use of "DEBUG" env var from CLI and decouple DEBUG from --log-level
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 534ed8c2d4573e88fcb68b23341504f8949b34b5
Component: engine
2015-04-29 06:20:33 -07:00
5f37bbe0bd Implement daemon suite for integration-cli
For creating and stopping test daemons automatically.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 57464c32b99b36a2963fb37da86b9870c9a56145
Component: engine
2015-04-27 15:48:29 -07:00
ae74d9f34f trivial: typo cleanup
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
Upstream-commit: 3941623fbc3fa724d61f53121513ffd87d03b61c
Component: engine
2015-04-27 13:35:08 -07:00
ab3ddde4ab Move https integration tests as unit tests under client
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 05013f1250dc141ed43f987dd8b6a650d0e47ac9
Component: engine
2015-04-23 15:40:46 +00:00
1884ef3b9b 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>
Upstream-commit: dc944ea7e48d11a2906e751d3e61daf08faee054
Component: engine
2015-04-21 10:28:52 -07:00
932b7d41ce 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>
Upstream-commit: 181fea24aac7499a3d6dc0c8c9de67e6c0036140
Component: engine
2015-04-20 08:13:39 -07:00
ce3584d9d7 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>
Upstream-commit: 9a87553e4fc6c0abdd298893deefc44050208dda
Component: engine
2015-04-13 16:58:44 -07:00
64a92fd92c 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.
Upstream-commit: 6b40377c189e77bcaf688e2b6a6f628a6dfe6927
Component: engine
2015-04-13 16:00:20 -04:00
928371a2db Remove job from wait
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: db0ffba3b92aeda667501aaa10926943a7738f82
Component: engine
2015-04-10 20:17:02 +02:00
10d36e87f8 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>
Upstream-commit: bfc68d10ed778bc0c2e2caedb80b65bd961c76b0
Component: engine
2015-04-10 11:10:26 -04:00
5cd5d0bf57 add TestDaemonwithwrongkey test case
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: ef13dcd4dcbc613a9ea1e4a8af3d0220004ec0ab
Component: engine
2015-04-06 08:57:47 +08:00
c2b08878f0 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>
Upstream-commit: 02c2308e39930677a7f4bb7f4215331a4d87566f
Component: engine
2015-04-02 08:53:31 -07:00
8f2d65bf21 Fix vet warning
Signed-off-by: Paul Mou <ppymou@gmail.com>
Upstream-commit: c5bf2145f172a264d3d8fc63d6717826b95b5ee2
Component: engine
2015-03-25 20:31:02 -07:00
449ca606a0 Add integration test for unix sock cleanup
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 16309bef6395a50ee2871780b81caed8bc6c498e
Component: engine
2015-03-20 12:34:35 -04:00
1d92cf5680 Merge pull request #11453 from duglin/HideDaemonDots
Hide dots on daemon startup when loglevel != info
Upstream-commit: 9d5eab18737adc82e3191c7708e5df540d0b485e
Component: engine
2015-03-19 10:10:18 -04:00
883ebf04a4 Merge pull request #11320 from estesp/fix-daemon-startup
Fix daemon shutdown on error after rework of daemon startup
Upstream-commit: a5269223a78d963774b12359a1e505b10fa9ac81
Component: engine
2015-03-17 19:04:25 -07:00
934073fd57 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>
Upstream-commit: 88dc6cc2dfcc538f433c98c18652a5c84b0769d9
Component: engine
2015-03-17 17:27:53 -07:00
26ddd6db93 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)
Upstream-commit: 459e58ffc9bff8206a860fb63f973e4f07129756
Component: engine
2015-03-17 14:15:00 -04:00
9010aeaadf Fail docker logs on all logging drivers apart from 'json-file'
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: bdf3a0295d401624483d4103fdaacc2bea1c7d46
Component: engine
2015-03-13 15:02:09 -07:00
1f05c24e96 Tests for --log-driver options
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: dd6d2cd6603af51a49e41048511038ed8770d32b
Component: engine
2015-03-13 12:13:37 -07:00
e70ef80162 correct some daemon spelling mistakes
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 906974b185b431a8c493479f748677f3c0bc4ca3
Component: engine
2015-03-13 05:14:56 -04:00
282d3dadfd Merge pull request #11331 from jfrazelle/update-logrus
Update logrus to 0.6.6
Upstream-commit: 5494432f917eb0f6e4cf73deed366f6830ec64ec
Component: engine
2015-03-11 16:18:22 -07:00
e7e0b4ff1a 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>
Upstream-commit: c5c72cf151b21482b2f27417322342c6d781108c
Component: engine
2015-03-11 12:39:31 -07:00