Sebastiaan van Stijn
14015eedb1
Merge pull request #21750 from LK4D4/flaky_format_test
...
integration-cli: try to make TestEventsTimestampFormats less flaky
2016-04-07 13:42:17 -07:00
Vincent Demeester
07f5804899
Merge pull request #21806 from Microsoft/RemoveSymlinkTests
...
Stop running symlink-volume tests on Windows
2016-04-07 22:03:44 +02:00
Tonis Tiigi
0c0198a5e6
Fix flaky TestSaveLoadParents
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-04-06 21:58:47 -07:00
Alexander Morozov
3f358aeaca
integration-cli: try to make TestEventsTimestampFormats less flaky
...
Fix #21749
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2016-04-06 14:31:39 -07:00
Vincent Demeester
5709f8e422
Merge pull request #21092 from WeiZhang555/fix-21064-detach-keys
...
Client print error when specify wrong detach keys
2016-04-06 22:14:14 +02:00
Sebastiaan van Stijn
2bbe75cdb6
Merge pull request #21783 from vieux/fix_21772
...
do not trim one char from {{.Names}} each time it is used in --format
2016-04-06 13:01:22 -07:00
Victor Vieux
68ade49ada
do not trim one char from {{.Names}} each time it is used in --format
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2016-04-06 11:04:13 -07:00
mYmNeo
ce87de21a7
fix TestCreateShrinkRootfs and TestCreateShrinkRootfs
...
Signed-off-by: mYmNeo <thomassong@tencent.com >
2016-04-06 12:40:20 -04:00
mYmNeo
90f512427f
fix test requirement about devicemapper and not overlay
...
Signed-off-by: mYmNeo <thomassong@tencent.com >
2016-04-06 12:40:19 -04:00
Tibor Vass
c7cf245053
Merge pull request #21751 from tonistiigi/runc-maskedpaths
...
Define readonly/mask paths in spec
2016-04-06 12:16:28 -04:00
Brian Goff
e24673def2
Merge pull request #21795 from mountkin/refactor-init
...
refactor the init function in docker_utils.go
2016-04-06 10:39:55 -04:00
Shijiang Wei
50d5d55f56
refactor the init function in docker_utils.go
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2016-04-06 20:16:00 +08:00
John Howard
d6ab2ad36d
Windows: integration-cli don't delete nat
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-04-05 19:29:43 -07:00
Darren Stahl
80d6f672f5
Stop running symlink-volume tests on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
2016-04-05 16:37:00 -07:00
Tonis Tiigi
3f81b49352
Define readonly/mask paths in spec
...
This vendors in new spec/runc that supports
setting readonly and masked paths in the
configuration. Using this allows us to make an
exception for `—-privileged`.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-04-04 18:55:55 -07:00
Zhang Wei
91e5bb9541
Let client print error when speicify wrong detach keys
...
Fix #21064
Let client print error message explicitly when user specifies wrong
detach keys.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2016-04-04 15:35:55 +08:00
Yuan Sun
16dfb38fb8
Add pause status check for --kernel-memory
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2016-04-01 10:32:46 +08:00
Sebastiaan van Stijn
4a7bd7eaef
Merge pull request #20410 from tkopczynski/20236-info-insecure-registry
...
Add insecure registries to docker info
2016-03-31 16:39:25 -07:00
Aaron Lehmann
dd94c88376
Merge pull request #21698 from tonistiigi/fix-flaky-websocket-attach-test
...
Fix flaky TestGetContainersAttachWebsocket
2016-03-31 14:03:58 -07:00
Tonis Tiigi
85354fb77c
Fix flaky TestGetContainersAttachWebsocket
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-03-31 11:31:48 -07:00
Antonio Murdaca
eb0f9f6641
integration-cli: add info to fatal log
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2016-03-31 12:38:47 +02:00
Vincent Demeester
47fa54aea3
Merge pull request #21664 from calavera/label_one_layer_images
...
Apply build labels to images with only a FROM tag.
2016-03-31 11:52:18 +02:00
Antonio Murdaca
60821fe288
Merge pull request #21665 from cyphar/bump-runc
...
vendor: bump runc to 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
2016-03-31 11:38:57 +02:00
Tomasz Kopczynski
44a50abe7b
Add insecure registries to docker info
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
2016-03-31 08:27:24 +02:00
Sebastiaan van Stijn
ffee5588cd
Merge pull request #21372 from anusha-ragunathan/ctrd-rebase
...
Update mount state of live containers after a daemon crash.
2016-03-30 23:10:04 -07:00
Brian Goff
81d9eaa27e
Merge pull request #21600 from Microsoft/jstarks/escape_entrypoint
...
Windows: escape entrypoint before passing to libcontainerd
2016-03-30 18:00:32 -07:00
Aleksa Sarai
da38ac6c79
vendor: bump runc to 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
...
Also modify an integration test that hardcoded the error string so it
uses the exported error variable from libcontainer/user.
Signed-off-by: Aleksa Sarai <asarai@suse.de >
2016-03-31 11:20:38 +11:00
David Calavera
1a85c8ebbe
Apply build labels to images with only a FROM tag.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-03-30 17:28:13 -04:00
John Starks
86ab343c3e
Windows: fix tests depending on entrypoint split behavior
...
Existing tests assume that the entrypoint in a docker run command will be
split into multiple arguments, which is inconsistent with Linux. Fix the
tests depending on this behavior.
Signed-off-by: John Starks <jostarks@microsoft.com >
2016-03-30 12:59:50 -07:00
Sebastiaan van Stijn
eaf138af1f
Merge pull request #21598 from aaronlehmann/not-found-error
...
Change v1 pull 404 message to include tag
2016-03-29 17:28:12 -07:00
Anusha Ragunathan
511a70583f
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 >
2016-03-29 14:42:43 -07:00
Aaron Lehmann
745892a7b2
Change v1 pull 404 message to include tag
...
The current error message is "Error: image [name] not found". This makes
sense from the perspective of the v1 pull, since we found the repository
doesn't exist over the v1 protocol. However, in the vast majority of
cases, this error will be produced by fallback situations, where we
first try to pull the tag with the v2 protocol, and then fall back the
v1 protocol, which probably isn't even supported by the server.
Including the tag in the error message makes a lot more sense since the
actual repository may exist on v2, but not the tag.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2016-03-29 10:04:59 -07:00
Arnaud Porterie
1da40fb4ba
Merge pull request #21586 from calavera/remove_runconfig_from_routes
...
Remove runconfig package dependency from the API.
2016-03-29 08:40:49 -07:00
Alexander Morozov
d33480474f
Merge pull request #21599 from tonistiigi/separate-daemon-exec-root
...
Use separate exec-root for test daemons
2016-03-29 07:52:18 -07:00
Vincent Demeester
6eb3835995
Merge pull request #21529 from LK4D4/test_exit_early
...
integration-cli: exit early if daemon immedately crashed
2016-03-29 09:34:17 +02:00
Vincent Demeester
e6aa40a017
Merge pull request #19367 from shishir-a412ed/rootfs_size_configurable_cli
...
CLI flag for docker create(run) to change block device size.
2016-03-29 08:52:54 +02:00
Tonis Tiigi
0d9b94c4c5
Use separate exec-root for test daemons
...
Fixes #21545
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-03-28 17:38:14 -07:00
David Calavera
3ca29823d4
Remove runconfig dependency from network routes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-03-28 16:23:50 -04:00
David Calavera
dd7691423f
Merge pull request #21566 from allencloud/upper-case-docker-info-display
...
upper case docker info details
2016-03-28 11:37:23 -07:00
Shishir Mahajan
b16decfccf
CLI flag for docker create(run) to change block device size.
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
2016-03-28 10:05:18 -04:00
allencloud
276a20dd42
upper case docker info details
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
2016-03-28 18:47:04 +08:00
Alexander Morozov
0f217cead8
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 >
2016-03-27 21:57:32 -07:00
Liron Levin
3c157713b3
Extend Docker authorization with TLS user information
...
Currently Docker authorization framework does not use any user
information, which already available in the Docker context for TLS
connection.
The purpose of this CR is to complete the existing authz work by adding
the basic client certificate details (SUBJECT_NAME) and authentication
method (TLS) to the authz request.
We think this should be the default behavior when no extended
authorization module is specified (currently WIP under #20883 ).
Signed-off-by: Liron Levin <liron@twistlock.com >
2016-03-27 15:53:55 +03:00
Tonis Tiigi
f01e1c865f
Disable privileged test from in user namespace
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-03-25 09:31:36 -07:00
Alexander Morozov
d7b341bc06
Merge pull request #21477 from cpuguy83/better_logging_on_integration
...
Better logging for errors in some tests
2016-03-25 09:16:18 -07:00
Brian Goff
42df9edc4a
Better logging for errors in some tests
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-03-25 10:02:52 -04:00
Vincent Demeester
9fbe1d9917
Merge pull request #21465 from runcom/fix-test
...
integration-cli: fix wrong test and add log
2016-03-25 10:22:01 +01:00
Vincent Demeester
2de29fb9c2
Merge pull request #21361 from HackToday/addfilter
...
Add name/driver filter support for volume
2016-03-25 08:07:38 +01:00
Sebastiaan van Stijn
f3d824771a
Merge pull request #21487 from tonistiigi/fix-old-dind
...
Fix setting cgroup permission to user/privileged devices
2016-03-24 22:56:39 -07:00
Kai Qiang Wu(Kennan)
8e9305ef94
Add name/driver filter support for volume
...
This change include filter `name` and `driver`,
and also update related docs to reflect that filters usage.
Closes : #21243
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
2016-03-25 01:11:17 +00:00