Commit Graph

3139 Commits

Author SHA1 Message Date
Tibor Vass c7cf245053 Merge pull request from tonistiigi/runc-maskedpaths
Define readonly/mask paths in spec
2016-04-06 12:16:28 -04:00
Brian Goff e24673def2 Merge pull request 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
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
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 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 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 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 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 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 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 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 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 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 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 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 

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 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 ).

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 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 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 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 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: 

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-03-25 01:11:17 +00:00
Madhu Venugopal ec77c124de Add "--ipv6" flag in IT for network create when using ipv6 subnets
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-03-24 16:19:59 -07:00
Tonis Tiigi ee61235880 Fix setting cgroup permission to user/privileged devices
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-24 14:16:33 -07:00
Sebastiaan van Stijn f2847f8ab3 Merge pull request from hqhq/hq_check_quota
Add validation for cpu period and quota
2016-03-24 14:10:48 -07:00
Yong Tang fa44b4e81e More descriptive error when running a container with a too long hostname ()
This fix tries to fix issues encountered when running a container with a hostname
that is longer than HOST_NAME_MAX(64).

Previously, `could not synchronise with container process` was generated as the
length of the regex check was missing.

This fix covers the length check so that a hostname that is longer than
HOST_NAME_MAX(64) will be given a correct error message.

Several unit tests cases and additional integration test cases are added as well.

This fix closes .

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-03-24 17:42:28 +00:00
Brian Goff 57575a2695 Merge pull request from tonistiigi/exec-ulimits
Add ulimit support to libcontainerd addprocess
2016-03-24 09:38:21 -04:00
Vincent Demeester 2131558963 Merge pull request from estesp/reenable-shared-nstests-userns
Re-enable shared namespace tests for userns CI runs
2016-03-24 12:31:27 +01:00
Antonio Murdaca e73152bf27 integration-cli: fix wrong test and add log
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-24 11:10:41 +01:00
Tonis Tiigi 8891afd838 Add ulimit support to libcontainerd addprocess
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-23 19:54:32 -07:00
Brian Goff 55bbea3751 Merge pull request from anusha-ragunathan/fix_overlay
Move layer mount refcounts to mountedLayer
2016-03-23 22:39:38 -04:00
Brian Goff 68674f739f Merge pull request from calavera/fix_network_path_issue
Fix network path issue
2016-03-23 22:27:44 -04:00
Brian Goff 65d79e3e5e Move layer mount refcounts to mountedLayer
Instead of implementing refcounts at each graphdriver, implement this in
the layer package which is what the engine actually interacts with now.
This means interacting directly with the graphdriver is no longer
explicitly safe with regard to Get/Put calls being refcounted.

In addition, with the containerd, layers may still be mounted after
a daemon restart since we will no longer explicitly kill containers when
we shutdown or startup engine.
Because of this ref counts would need to be repopulated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-03-23 14:42:52 -07:00