1
0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Commit Graph

164 Commits

Author SHA1 Message Date
Vincent Demeester
a6fa28fbfa Merge pull request #21634 from cpuguy83/add_beter_logging_for_TestDaemonNoSpaceleftOnDeviceError
More logs for `TestDaemonNoSpaceleftOnDeviceError`
Upstream-commit: 8011228b53ead375cf7645bf4e7f686324e6e9d6
Component: engine
2016-04-14 22:06:49 +02:00
Zhang Wei
c018129666 Fix ShouldRestart for on-failure handle
Currently if you restart docker daemon, all the containers with restart
policy `on-failure` regardless of its `RestartCount` will be started,
this will make daemon cost more extra time for restart.

This commit will stop these containers to do unnecessary start on
daemon's restart.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 51e42e6ee01eb4b5c8c7678e2fc7be0f13ef6a68
Component: engine
2016-04-10 15:44:47 +08:00
Anusha Ragunathan
1cb03c4630 Add non-experimental daemon as a test requirement.
For test that should be exclusively run only in regular daemon builds
and not in the experimental version, add a requirement.

Verified using TestCleanupMountsAfterDaemonKill.
- On regular daemon, the test ran.
- On experimental daemon, the test skipped.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: c7076d26709f3fa277bd11e1dffdc8fc7833d38e
Component: engine
2016-04-07 14:46:32 -07:00
Sebastiaan van Stijn
2a5d48b968 Merge pull request #21372 from anusha-ragunathan/ctrd-rebase
Update mount state of live containers after a daemon crash.
Upstream-commit: ffee5588cd9be4c67c73476998af1ecbc61250b6
Component: engine
2016-03-30 23:10:04 -07:00
Brian Goff
deef73bda4 More logs for TestDaemonNoSpaceleftOnDeviceError
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5106c51666ce3452454d63141b259aa7d3713e90
Component: engine
2016-03-29 15:24:05 -07:00
Anusha Ragunathan
ad9621a58c Update mount state of live containers after a daemon crash.
Fix unmount issues in the daemon crash and restart lifecycle, w.r.t
graph drivers. This change sets a live container RWLayer's activity
count to 1, so that the RWLayer is aware of the mount. Note that
containerd has experimental support for restore live containers.

Added/updated corresponding tests.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 511a70583fbb901f57acb44d501cca8e6dcbce2c
Component: engine
2016-03-29 14:42:43 -07:00
Vincent Demeester
9f98018db6 Merge pull request #21529 from LK4D4/test_exit_early
integration-cli: exit early if daemon immedately crashed
Upstream-commit: 6eb38359954269103f2a3094283c4cb0a1cb63f9
Component: engine
2016-03-29 09:34:17 +02:00
allencloud
64bbcab7a5 upper case docker info details
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 276a20dd426524c254e8b2a4cc9047bcc62fd321
Component: engine
2016-03-28 18:47:04 +08:00
Alexander Morozov
7665d0c146 integration-cli: exit early if daemon immedately crashed
this reduces execution of TestInfoDiscoveryInvalidAdvertise from 11s to 0.2s

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 0f217cead8260ab45f9749074d954e5e9e76187b
Component: engine
2016-03-27 21:57:32 -07:00
Tibor Vass
ce07920e99 Add docker- prefix to runc and containerd binaries
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 009399dc8ed8a4b635b0e229bf07b685e286d8d9
Component: engine
2016-03-23 00:52:16 -04:00
Tonis Tiigi
8ba16d91c8 Replace execdrivers with containerd implementation
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 9c4570a958df42d1ad19364b1a8da55b891d850a
Component: engine
2016-03-18 13:38:32 -07:00
Tibor Vass
19d229cc30 Merge pull request #20476 from wenchma/19425-TestDaemonStartWithDaemonCommand
Optimize slow bottleneck tests of TestDaemonStartWithDaemonCommand
Upstream-commit: 1c0474ed63ac08a3e280ecf7eebcb9e53ae92c8d
Component: engine
2016-03-11 10:54:48 -05:00
Christopher Jones
4e7a6032dd Properly close and remove file in daemon test
Fixes a bug where a file would be created and not deleted in
DockerSuite.TestDaemonDiscoveryBackendConfigReload

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 66e558c16c7505750dc4941980521fc382dbe454
Component: engine
2016-03-04 14:22:30 -05:00
Wen Cheng Ma
7d7a36d3ff Optimize slow bottleneck tests of TestDaemonStartWithDaemonCommand
* Remvoe integration test of TestDaemonStartWithDaemonCommand
* Rewrite as unit test

Related issue #19425

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: b9ef2682b905bf0403fd03d697a6d7a93d91a587
Component: engine
2016-03-01 14:05:39 +08:00
Brian Goff
60a83559ef Merge pull request #20692 from coolljt0725/add_brnf_test_request
Add bridgeNfIptables and bridgeNfIp6tables test request
Upstream-commit: ea6d2708e2f115b9637ee11521f5f570b2819808
Component: engine
2016-02-29 15:16:27 -05:00
Antonio Murdaca
f444846f4e integration-cli: remove not necessary -d again
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: e44689139d2ffd08c147ffe940a15a8e8616786a
Component: engine
2016-02-28 13:48:15 +01:00
Antonio Murdaca
d0b8a125f5 integration-cli: remove not necessary -d
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: faf4604dac41b4fdb88b3e6552d24d5ea5e3f16c
Component: engine
2016-02-27 18:27:25 +01:00
Lei Jitang
f7369d4578 Add bridgeNfIptables and bridgeNfIp6tables test request
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 79843b727fca8502d5463851a1238708240622d8
Component: engine
2016-02-26 19:53:35 -05:00
Arnaud Porterie
d9c028ed66 Merge pull request #20419 from aboch/cr
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
Upstream-commit: 117a982d2e805d3279ff75fcec071635e5191ef6
Component: engine
2016-02-18 17:39:46 -08:00
Madhu Venugopal
10c9ca900c Config-reload IT
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: c9bec2be2af62571e49b4992d5a2fd8806049a07
Component: engine
2016-02-18 12:22:56 -08:00
Brian Goff
93243f693c Fix net=none w/ TestDaemonNoSpaceleftOnDeviceError
Broken by bcb9adf49e6726eccc1ee1ed41fbe21789c2367f

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 8e0e9e0f24e5802709508b7c7fe61cb5171ec414
Component: engine
2016-02-18 11:34:34 -05:00
Arnaud Porterie
47f5776cce Improve remote integration-cli tests
Progress toward being able to run integration-cli campaign using a
client hitting a remote host.

Most of these fixes imply flagging tests that assume they are running on
the same host than the Daemon. Also fixes the `contrib/httpserver` image
that couldn't run because of a dynamically linked Go binary inside the
busybox image.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: a943c401509e7994ae5c574a4b7e23354e44a105
Component: engine
2016-02-11 07:31:49 -08:00
Brian Goff
403bf945a4 Merge pull request #20174 from tophj-ibm/remove-power-from-logrus-tests
PPC64LE: Remove testing logrus output from ppc64le
Upstream-commit: cfa806378eafd159fce4b1158b215564419680d0
Component: engine
2016-02-10 09:07:47 -05:00
Christopher Jones
7d5beb3fd8 Remove testing logrus output from ppc64le
This removes two tests on ppc64le.

There is an old bug with a syscall on power #8653, that causes
logrus to default to using logfmt. These two tests look for
logrus format specific strings, and fail if they don't see it.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 736e93a468fe8b8530ec5d00b9be7bbd53e306fc
Component: engine
2016-02-09 18:02:18 -05:00
Shishir Mahajan
cac10ff771 Tests for PR # 19123: daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 07184599f71af0ef5b29d025bf1eae6432ae37f3
Component: engine
2016-02-09 10:47:31 -05:00
David Calavera
46e42d4581 Add regression tests for client debug flag.
- Add client debug info to the `docker info` command.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9f315dd328a33b51133a41067a508a8b59166a39
Component: engine
2016-02-02 16:57:36 -05:00
David Calavera
fd11be5874 Add test to make sure raw logs are properly activated.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 898599171e2f36a1cf36a2eea31d82a226acd802
Component: engine
2016-02-01 16:52:31 -05:00
Wen Cheng Ma
ef8c1f3bc2 Optimize slow bottleneck tests of TestDaemonCorruptedLogDriverAddress
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 07d2c31810feca8d0c9a04e0da71fa9322bce37e
Component: engine
2016-01-26 14:53:10 +08:00
Brian Goff
51c4939d36 Merge pull request #19658 from wenchma/19425-daemon_ipv6
Optimize slow bottleneck tests of TestDaemonIPv6FixedCIDR
Upstream-commit: 997e61add95c26987f56c9b096f6b5ed93641184
Component: engine
2016-01-25 14:04:54 -05:00
Shijiang Wei
eb32283c48 speed up DockerDaemonSuite.TestDaemonRestartWithContainerRunning
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: c983996e0bdc3becd3c7bf79329ad367b9f1a8b1
Component: engine
2016-01-25 23:45:13 +08:00
Wen Cheng Ma
328772ec19 Optimize slow bottleneck tests of TestDaemonIPv6FixedCIDR and TestDaemonIPv6FixedCIDRAndMac
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 73849a5c82ed816348179bd0ea6461ec8941cc04
Component: engine
2016-01-25 23:43:49 +08:00
Morgan Bauer
42641a496b check the output, not the errcode
- errcode of 1 can be returned for cases other than the 'no space left' case

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: bcb9adf49e6726eccc1ee1ed41fbe21789c2367f
Component: engine
2016-01-21 15:23:20 -08:00
David Calavera
7237c4ead6 Add test to verify that response hijacking always works over TLS.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: db1d5f7ea37c2a3b0bedc9dbcbf5bd3b32258219
Component: engine
2016-01-13 20:18:06 -05:00
Brian Goff
20a5900d4d Build names and links at runtime
Don't rely on sqlite db for name registration and linking.
Instead register names and links when the daemon starts to an in-memory
store.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 0f9f99500c40f2a46682967ca358cd2346fd5e13
Component: engine
2016-01-07 14:10:42 -05:00
Brian Goff
db1910a30c Move responsibility of ls/inspect to volume driver
Makes `docker volume ls` and `docker volume inspect` ask the volume
drivers rather than only using what is cached locally.

Previously in order to use a volume from an external driver, one would
either have to use `docker volume create` or have a container that is
already using that volume for it to be visible to the other volume
API's.

For keeping uniqueness of volume names in the daemon, names are bound to
a driver on a first come first serve basis. If two drivers have a volume
with the same name, the first one is chosen, and a warning is logged
about the second one.

Adds 2 new methods to the plugin API, `List` and `Get`.
If a plugin does not implement these endpoints, a user will not be able
to find the specified volumes as well requests go through the drivers.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d3eca4451d264aac564594fe46b8c097bd85a5cc
Component: engine
2016-01-05 16:28:38 -05:00
Alexander Morozov
0c89fbf389 Add ability to set cgroup parent for all containers
Fix #18022

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2e3186ab065a7130a6e6267d86750848d5eb7d80
Component: engine
2016-01-04 15:16:25 -08:00
Michael Crosby
89d18d78c9 Merge pull request #18208 from cpuguy83/restart_links
Daemon Restart: attempt to wait for container deps
Upstream-commit: 04234bd16a463af3b5e093ef180351d7b54b6a35
Component: engine
2016-01-04 14:36:00 -08:00
Alessandro Boch
40fe4ff4d5 Properly initialize IpamConf structure in initBridgeDriver
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: aa97eee1a3cf5c932bdd31535b1e82ca53347ca5
Component: engine
2015-12-30 15:44:50 -08:00
Brian Goff
524c469eb3 Daemon Restart: attempt to wait for container deps
This provides a best effort on daemon restarts to restart containers
which have linked containers that are not up yet instead of failing.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 19762da67e40879be77b1b55c21a9754235fbb78
Component: engine
2015-12-28 11:00:16 -05:00
Brian Goff
7dc1436aeb Make TestDaemonNoSpaceleftOnDeviceError linux only
Adds SameHostDaemon and DaemonIsLinux req's to
TestDaemonNoSpaceleftOnDeviceError

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 44d3f2f71a9a522597655b7c8733422fe70c39a0
Component: engine
2015-11-20 12:44:49 -05:00
Alexander Morozov
ebcb6dad25 Merge pull request #17617 from askb/17168_pull_error_fix
Fix for #17168 issue
Upstream-commit: e2417e3e926d2b45049a663bc62828a70fbfab2a
Component: engine
2015-11-17 16:10:44 -08:00
Antonio Murdaca
2e538bcbf1 Remove deprecated cli flags
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 7929888214741c4ab194c44e0b14ac08aca06556
Component: engine
2015-11-15 10:40:01 +01:00
Anil Belur
d096521f7f Adding test for the fix #17168.
The test case creates a mount point, starts the daemon with the
graph dir pointing to the mount and initates a pull request. We should
be able to check for the error message when the mount point gets filled
during pull.

Signed-off-by: Anil Belur <askb23@gmail.com>
Upstream-commit: 4699ef8f87cc270fdf9e18bad5582b6696d56fe4
Component: engine
2015-11-14 16:24:45 +05:30
Tibor Vass
4fe87618a6 Merge pull request #17890 from aboch/b6
Restore deterministic IPv6 from MAC behavior on default bridge network
Upstream-commit: 7a985cfafc211c8cc302e4c1e14059fc513663ba
Component: engine
2015-11-11 12:42:08 -05:00
Alessandro Boch
621ef05af0 Restore IPv6 from MAC on default bridge network
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 095a8ac5451de25a91fc569a6633fdd8d4cabb3f
Component: engine
2015-11-11 08:36:04 -08:00
Vincent Demeester
9b1a025ea6 Merge pull request #17012 from fgimenez/9986-ipallocator-excludes-bridge-ip
Test to ensure that the bridge ip is excluded from the allocator pool
Upstream-commit: d6856db128212020e7d21f5121b3f0b4778910cb
Component: engine
2015-11-11 10:42:13 +01:00
Alessandro Boch
efb8f1f3fe Fix fixed-cidr daemon option
- Logic is broken when gateway ip falls in ip-range
  and ip-range is not the first block in the network

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: c7cd65962448888ceb1cec6a355fc7fd04f3be53
Component: engine
2015-11-09 15:51:46 -08:00
Alexander Morozov
0791fd443d Return nice client-side message for docker logs
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e37e329074517f48db8468affc62beb595ab090e
Component: engine
2015-11-06 11:40:48 -08:00
David Calavera
f427a47755 Remove exec-driver global daemon option.
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 157b66ad390902ef6f5b51b3f76d5177eacac81b
Component: engine
2015-11-05 17:09:58 -05:00
David Calavera
6c30abdc61 Extract network settings types for inspect.
Keeping backwards compatibility.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 25682577c9d29b325b4b615c4b88c132a4640082
Component: engine
2015-10-27 19:16:21 -04:00