1da671b499
Merge pull request #24229 from anusha-ragunathan/shutdown-plugins
...
Shutdown plugins during daemon shutdown.
Upstream-commit: b91e2dd9942f4c34b62de37c3862b9febd270b22
Component: engine
2016-07-11 22:14:50 -04:00
9557e1e984
Merge pull request #24501 from hqhq/remove_exec_driver
...
Remove execution driver
Upstream-commit: 880484992c360881dc57a3317b84d75300c358af
Component: engine
2016-07-11 16:54:36 -07:00
495149133d
Shutdown plugins during daemon shutdown.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 863ab9ab134d0baef3c7e5d745eded891e87e734
Component: engine
2016-07-11 14:21:27 -07:00
399c37eb85
Merge pull request #24051 from allencloud/return-err-when-stack-name-nonexist
...
output some details when stack name does not exist
Upstream-commit: 46649755f8771e38b2c74352327a226f1c995843
Component: engine
2016-07-11 20:43:09 +02:00
04c06a5318
return err when stack name does not exist
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 416613f2e54581c62d3efa1c4f0288b6e7d58365
Component: engine
2016-07-12 00:59:30 +08:00
abbe69120e
Remove execution driver
...
We use containerd and there is no execution driver anymore.
Addresses: https://github.com/docker/docker/issues/24461
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 1fb1136fecfd761300a38f64ac9178979cc0b270
Component: engine
2016-07-11 14:52:27 +08:00
dd59a5931c
integration-cli: fix --net=none tests
...
Example:
21:28:01 [d68573521] waiting for daemon to start
21:28:01 [d68573521] daemon started
21:28:01 docker_api_swarm_test.go:163:
21:28:01 c.Assert(d1.Init(map[string]bool{"worker": true}, ""),
checker.IsNil)
21:28:01 ... value *errors.errorString =
&errors.errorString{s:"initializing swarm: invalid statuscode 500,
\"{\\\"message\\\":\\\"could not determine local IP address: dial udp
8.8.8.8:53: connect: network is unreachable\\\"}\\n\"} ("initializing
swarm: invalid statuscode 500, \"{\\\"message\\\":\\\"could not
determine local IP address: dial udp 8.8.8.8:53: connect: network is
unreachable\\\"}\\n\"")
21:28:01
21:28:01 [d68573521] exiting daemon"}
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 9fadb8fd6a09c8982dc8a44125f4d21c33c8c394
Component: engine
2016-07-10 15:56:02 +02:00
727d754fd1
Add more complicated demotion testcases
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: a3f1577365f7b2ed99d1801c909bfaa69c048c92
Component: engine
2016-07-08 13:33:40 -07:00
1f5dadc0e0
Merge pull request #24389 from Microsoft/jjh/silentsecurity
...
Windows: No security warning on quiet
Upstream-commit: db435560b38e4489ff3b0a8031d7b5110961fd32
Component: engine
2016-07-08 11:06:33 -07:00
e4b8c6fd9c
Merge pull request #23312 from justincormack/proxy
...
Make the docker proxy a standalone binary not a re-exec
Upstream-commit: 07dd69df8d6c5f4da0059d49e128fef9277fcb5d
Component: engine
2016-07-07 17:14:40 -07:00
d206128458
Windows: No security warning on quiet
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a9b3c1d7207e8c4b46b6f7efb3bf5bc3b5160c83
Component: engine
2016-07-07 16:00:08 -07:00
d93f3c954e
Fix test case for docker_api_swarm_test.go
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 6dfba780cc490ef7579e95169b5c71617f8e5a47
Component: engine
2016-07-07 21:01:55 +01:00
a5fef9cf19
Merge pull request #24349 from aaronlehmann/swarm-secrets-by-default
...
Generate a swarm joining secret if none is specified
Upstream-commit: db67db98d837517123abf7f3efbb04d0bec3708b
Component: engine
2016-07-07 11:43:08 -07:00
f7a6ca3323
Merge pull request #22868 from Microsoft/jjh/dockerfilecmd
...
Windows: CMD not honouring arg escaping
Upstream-commit: 6167a9ab166ce1e6fd0ffa653b9476d33983f15b
Component: engine
2016-07-07 09:21:26 -07:00
c60ffac88e
Merge pull request #24383 from anusha-ragunathan/not-plugin
...
Detect non-plugin content during install and error out.
Upstream-commit: 656c66dd50d5c5b1f4f40eb4f3134e84e5b80fbc
Component: engine
2016-07-07 11:18:27 +02:00
7ac01fb32e
Use newer default values for mounts CLI
...
In the API:
`Writable` changed to `ReadOnly`
`Populate` changed to `NoCopy`
Corresponding CLI options updated to:
`volume-writable` changed to `volume-readonly`
`volume-populate` changed to `volume-nocopy`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 56f3422468a0b43da7bae7a01762ce4f0a92d9ff
Component: engine
2016-07-06 22:34:39 -04:00
8d49a670d8
Detect non-plugin content during install and error out.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: d32df6d934875052232bbbc49fa473bd283af6e4
Component: engine
2016-07-06 18:49:39 -07:00
08bcf7365f
Generate a swarm joining secret if none is specified
...
The current behavior of `docker swarm init` is to set up a swarm that
has no secret for joining, and does not require manual acceptance for
workers. Since workers may sometimes receive sensitive data such as pull
credentials, it makes sense to harden the defaults.
This change makes `docker swarm init` generate a random secret if none
is provided, and print it to the terminal. This secret will be needed to
join workers or managers to the swarm. In addition to improving access
control to the cluster, this setup removes an avenue for
denial-of-service attacks, since the secret is necessary to even create
an entry in the node list.
`docker swarm init --secret ""` will set up a swarm without a secret,
matching the old behavior. `docker swarm update --secret ""` removes the
automatically generated secret after `docker swarm init`.
Closes #23785
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 7342e42fcecbc243bcb8723b8422879662452017
Component: engine
2016-07-06 13:04:50 -07:00
9ff9ce64f9
Merge pull request #24133 from cpuguy83/hacky_swarm_integration_tests
...
Implement service integration tests
Upstream-commit: 6f052edcc0c6558ca5b3d547109d9be72fe0176a
Component: engine
2016-07-06 11:49:27 -07:00
cf21f8491a
integration-cli: ensure digest is the same after cross-repo push
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: a0c8970df1f013a51684f82dd86815dcf773a250
Component: engine
2016-07-06 13:12:42 +02:00
4b7a3b82ea
Implement service integration tests
...
This is done in a hacky way as currently there is no better way.
Uses known implementation details about how tasks are scheduled to be
able to operate on the underlying container.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e5ec575b32d6979914dce576f1b8bb71f3057cea
Component: engine
2016-07-05 21:39:42 -04:00
eff3f9141a
Merge pull request #23996 from dmcgowan/always-store-image-digest-update
...
[carry 23503] Always store the image digest when pulling and pushing an image.
Upstream-commit: ee0283c97a44fd8e67f2df81d076eb4b1858b3d2
Component: engine
2016-07-05 16:18:20 +00:00
7db75cd617
Merge pull request #24300 from coolljt0725/arm64_test
...
Add NoArm64 testRequires and skip Schema1RegistrySuite on arm64
Upstream-commit: 98fa9ef7d313d2b3da0d9f7826b5d47e2488973c
Component: engine
2016-07-05 12:13:30 +02:00
ad6ea85075
Add fchmod and fchmodat to TestRunSeccompProfileDenyChmod
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 8c179348c31392559d95481b47625769a7620a21
Component: engine
2016-07-04 11:06:48 +00:00
3f6199071c
Add NoArm64 testRequires and skip Schema1RegistrySuite on arm64
...
schema1 manifests is not working on ARM64, we should skip integration-cli
tests for schema1 manifests on ARM64.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 9c1566a1dfa3eccd12e09a3e2cbda60503600d44
Component: engine
2016-07-04 10:09:46 +00:00
0bdbf282f3
Fix spelling in comments, strings and documentation
...
Signed-off-by: Otto Kekäläinen <otto@seravo.fi >
Upstream-commit: 644a7426cc31c338fedb6574d2b88d1cc2f43a08
Component: engine
2016-07-03 20:58:11 +03:00
34ed0e262c
Merge pull request #24060 from Microsoft/jjh/skipruncidfilecleanupifemptyrs1
...
Windows: Skip RunCidFileCleanupIfEmpty on RS1
Upstream-commit: a0d068e7c643b489395bb3d4d2f24997cb735a03
Component: engine
2016-06-30 16:36:41 -07:00
cba178dcd2
Merge pull request #24056 from Microsoft/jjh/skiptestbuildemptycmdrs1
...
Windows: Skip TestBuildEmptyCmd on RS1
Upstream-commit: 9828960ade14a49de15d0fbe189a79dd2403dfa4
Component: engine
2016-06-30 16:34:55 -07:00
77d5dd2b46
Treat digest only images as dangling
...
Add test for dangling digest images
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 8906f8307c86ce59f51d2f1b750f5e698f3cf8a5
Component: engine
2016-06-30 11:32:49 -07:00
8038d9fddd
Use HOSTNAME in the output of docker node ls
...
This fix tries to address an issue raised in #24090 where
the title field of `docker node ls` use NAME instead of
HOSTNAME. Yet the content of this field is actually
hostname.
The fix makes needed changes for the output of
`docker node ls`.
An additional test has been added to cover the change in
this fix.
This fix fixes #24090 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 4bc91ceeb750db6a6270b2f1821cb0b2f30117fc
Component: engine
2016-06-29 19:54:16 -07:00
29d2889a79
Merge pull request #23789 from tonistiigi/swarm-integration-tests
...
Update swarm integration tests and shutdown synchronization
Upstream-commit: 9162011680efa714788377651e51872bb852e2e3
Component: engine
2016-06-29 14:09:57 -07:00
7dfc0b0c86
Merge pull request #24050 from ncoolz/issue-cluster-store-config
...
Fix check code for --cluster-store and --cluster-advertise in config_…
Upstream-commit: 2f9d20288c7b1ebf6f0a9888e6af9b5262d49484
Component: engine
2016-06-29 19:15:23 +02:00
c760355112
Fix daemon tests.
...
Fix two test issues:
- pidof is not available in PATH on some Jenkins systems (rhel, centos)
Use kill -0 instead.
- Cleanup after plugin test. This is a stop gap fix. The right way to
fix this, is to shutdown the plugin on daemon shutdown path (except
for the live-restore case). This will be done in a follow up PR.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 6d36431e2395867d7bb101dbfd4340e132fd5438
Component: engine
2016-06-28 15:29:49 -07:00
0660142527
Add integration tests for swarm incompatible
...
Signed-off-by: Wonjun Kim <wonjun.kim@navercorp.com >
Upstream-commit: d71789828f5c8d2e0f5757f1c003325c4b8a871d
Component: engine
2016-06-29 06:21:02 +09:00
e89f357b69
Windows: Skip RunCidFileCleanupIfEmpty on RS1
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 20424fccdd1ba874277eca7d9644b1ef98ac4b2e
Component: engine
2016-06-28 13:04:42 -07:00
cf2790c1e0
Windows: Skip TestBuildEmptyCmd on RS1
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 45da1274421ba7484dcf2bf1a398f9e3683600d1
Component: engine
2016-06-28 12:22:16 -07:00
ab805f2a0c
Merge pull request #23677 from anusha-ragunathan/mv_test_stable
...
Move daemon restart tests from experimental to stable.
Upstream-commit: 48eba0bfe6fcdd4c90740831e6a8b5aff6e0a5c0
Component: engine
2016-06-27 13:07:55 -07:00
c0eb5739c1
Merge pull request #23775 from mlaventure/change-stock-runtime-alias
...
Use "runc" as alias for the default runtime
Upstream-commit: 91fa49071d7373ccdee4585b403b488e1fce2efa
Component: engine
2016-06-27 11:55:46 -07:00
fc151282e4
Always store the image digest when pulling and pushing an image.
...
Always attempt to add digest even when tag already exists.
Ensure digest does not currently exist.
When image id is mismatched, output an error log.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 33984f256b1a281b1130ac7e8edb7bc311750ccf
Component: engine
2016-06-27 10:09:57 -07:00
56369a363d
Merge pull request #23801 from inercia/fix_docker_cli_by_digest
...
Make sure some integration tests check for the right return code
Upstream-commit: 1cfd37f432743b54f79d99064bfd8acf9ebd608c
Component: engine
2016-06-27 15:37:59 +02:00
39780ea801
Change the comments in TestPullFailsWithAlteredLayer and TestPullFailsWithAlteredLayer
...
Signed-off-by: Alvaro Saurin <alvaro.saurin@gmail.com >
Upstream-commit: b5f51e5281ddf677622d7d5e50048071e4cfcbc1
Component: engine
2016-06-27 11:06:32 +02:00
2e3267c27b
Disable iptables in swarm test daemons
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: caaf92f7b4b947c5d226fb66a355b60fac683979
Component: engine
2016-06-24 15:47:37 -07:00
c644a729dc
Add test for force-new-cluster
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 1acb8ef82572c52994b1ff00fe5c86aac53be4b8
Component: engine
2016-06-24 13:57:11 -07:00
76181c2413
Switch node management tests to api types
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 22b34d64496c9b6ebae5e2b4a98ecd9a172cc557
Component: engine
2016-06-24 11:51:43 -07:00
299779b4ac
Merge pull request #23360 from sainath14/rename_error
...
docker rename fix to address the issue of renaming with the same name
Upstream-commit: 88d1ee6c112d980a63c625389524047fea32e6d9
Component: engine
2016-06-24 19:54:09 +02:00
dda81cb1a9
Merge pull request #23921 from tonistiigi/test-timeouts
...
Increase test timeouts for node state changes
Upstream-commit: 23696e82658e8be1d428c63c52b52a51476d4248
Component: engine
2016-06-24 19:21:56 +02:00
1518772054
Merge pull request #23802 from inercia/fix_docker_cli_run_test
...
Make sure we compare string with the same capitalization
Upstream-commit: f6326d307667ea92ce6931985616d85d4e3248ed
Component: engine
2016-06-24 10:27:29 -04:00
4bcb0e068c
Increase test timeouts for node state changes
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 2e5da4434126309f2395cc3d5b2013674155ae5c
Component: engine
2016-06-23 17:30:42 -07:00
fbf0465b15
Merge pull request #23790 from tonistiigi/skip-pull
...
Skip always pulling images on integration tests
Upstream-commit: 487931902c1177352e4eceec1b5ef558a5ba24cc
Component: engine
2016-06-23 11:47:33 -07:00
89230aa7b1
Add plugin restore tests.
...
Also live restore is stable now. So move experimental tests out to stable.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 006d58d7e6756848058bd69a12c698c44e64efd1
Component: engine
2016-06-22 19:04:26 -07:00
