Commit Graph

3139 Commits

Author SHA1 Message Date
3cc8db1e5f Merge pull request #21751 from tonistiigi/runc-maskedpaths
Define readonly/mask paths in spec
Upstream-commit: c7cf2450537cf5f5f6d24067447376402ddf2680
Component: engine
2016-04-06 12:16:28 -04:00
64b8205ed9 Merge pull request #21795 from mountkin/refactor-init
refactor the init function in docker_utils.go
Upstream-commit: e24673def241339303064aeac939d4f86c992915
Component: engine
2016-04-06 10:39:55 -04:00
855667c0f1 refactor the init function in docker_utils.go
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 50d5d55f566b65b506bf54ccf0d897a0cb95734e
Component: engine
2016-04-06 20:16:00 +08:00
c818e1117c Windows: integration-cli don't delete nat
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d6ab2ad36d8c184bd7ea140df8b4894eff42b02d
Component: engine
2016-04-05 19:29:43 -07:00
ac4137daba 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>
Upstream-commit: 3f81b4935292d5daedea9de4e2db0895986115da
Component: engine
2016-04-04 18:55:55 -07:00
377af3f678 Add pause status check for --kernel-memory
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 16dfb38fb89e4c57c53c54d3559b9fb388e367d4
Component: engine
2016-04-01 10:32:46 +08:00
0d08181d47 Merge pull request #20410 from tkopczynski/20236-info-insecure-registry
Add insecure registries to docker info
Upstream-commit: 4a7bd7eaef0038b006cf23adface84081e5aab3b
Component: engine
2016-03-31 16:39:25 -07:00
1857eeaad6 Merge pull request #21698 from tonistiigi/fix-flaky-websocket-attach-test
Fix flaky TestGetContainersAttachWebsocket
Upstream-commit: dd94c88376560e2690ac21058c566adae4251bb8
Component: engine
2016-03-31 14:03:58 -07:00
f7de49cf41 Fix flaky TestGetContainersAttachWebsocket
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 85354fb77c77aabe6ba1f53c90aa2395b4e81866
Component: engine
2016-03-31 11:31:48 -07:00
3bf882d79f integration-cli: add info to fatal log
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: eb0f9f664116ca28d844144929f4b578fe2d1dc8
Component: engine
2016-03-31 12:38:47 +02:00
33e31cb131 Merge pull request #21664 from calavera/label_one_layer_images
Apply build labels to images with only a FROM tag.
Upstream-commit: 47fa54aea39035515f45a4c98408e75c5085a2cb
Component: engine
2016-03-31 11:52:18 +02:00
09b74b88c4 Merge pull request #21665 from cyphar/bump-runc
vendor: bump runc to 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
Upstream-commit: 60821fe288ce1c53fdf5ab553b9f1d4571f1ec11
Component: engine
2016-03-31 11:38:57 +02:00
58855775ca Add insecure registries to docker info
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: 44a50abe7b16368bdc8b70e01cb095dc46cbbbaf
Component: engine
2016-03-31 08:27:24 +02:00
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
b52259e5cc Merge pull request #21600 from Microsoft/jstarks/escape_entrypoint
Windows: escape entrypoint before passing to libcontainerd
Upstream-commit: 81d9eaa27e4efb5cad52b57ca2e9d71a0c9b2272
Component: engine
2016-03-30 18:00:32 -07:00
b856d3bee3 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>
Upstream-commit: da38ac6c79fe902ed0687afc73d731c95c6d491a
Component: engine
2016-03-31 11:20:38 +11:00
783220b8bb Apply build labels to images with only a FROM tag.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1a85c8ebbe1ab508bcd47b883b9732c032509503
Component: engine
2016-03-30 17:28:13 -04:00
403cc82fb3 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>
Upstream-commit: 86ab343c3e98ded1ee1b12f04396ae011a0e6de6
Component: engine
2016-03-30 12:59:50 -07:00
9d7bcf25f6 Merge pull request #21598 from aaronlehmann/not-found-error
Change v1 pull 404 message to include tag
Upstream-commit: eaf138af1fba339d13bc4cccd75e61e37603a51a
Component: engine
2016-03-29 17:28:12 -07:00
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
eef44cf65d 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>
Upstream-commit: 745892a7b271cf0f1770a8ec3698aaf61573e5f2
Component: engine
2016-03-29 10:04:59 -07:00
922dd0a9e8 Merge pull request #21586 from calavera/remove_runconfig_from_routes
Remove runconfig package dependency from the API.
Upstream-commit: 1da40fb4badd116a7591dd2c19009146770c9a89
Component: engine
2016-03-29 08:40:49 -07:00
ff692d79a4 Merge pull request #21599 from tonistiigi/separate-daemon-exec-root
Use separate exec-root for test daemons
Upstream-commit: d33480474f33523743ae49c1b96737fbfbeb1a6f
Component: engine
2016-03-29 07:52:18 -07:00
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
57e1cc77d5 Merge pull request #19367 from shishir-a412ed/rootfs_size_configurable_cli
CLI flag for docker create(run) to change block device size.
Upstream-commit: e6aa40a017e0c11186fb9053b9e71e34b93ebe1c
Component: engine
2016-03-29 08:52:54 +02:00
40995de161 Use separate exec-root for test daemons
Fixes #21545

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 0d9b94c4c5d6b4f03a7a86e731e4110e9f27a51e
Component: engine
2016-03-28 17:38:14 -07:00
91e6a2df59 Remove runconfig dependency from network routes.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3ca29823d42ab1e2b1ea76981ccc9aa11e858cb2
Component: engine
2016-03-28 16:23:50 -04:00
4d49388b9b Merge pull request #21566 from allencloud/upper-case-docker-info-display
upper case docker info details
Upstream-commit: dd7691423f685bc4d724224913556c7e2cf4bc56
Component: engine
2016-03-28 11:37:23 -07:00
9ab7e4327f CLI flag for docker create(run) to change block device size.
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: b16decfccfdb0749c490be9272cb7b4789be87b4
Component: engine
2016-03-28 10:05:18 -04:00
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
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
ccb887dc36 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>
Upstream-commit: 3c157713b31f542a4180e31da4cae7d677330a6f
Component: engine
2016-03-27 15:53:55 +03:00
6ed9290033 Disable privileged test from in user namespace
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f01e1c865f35bd6578a2c0ef5b2d530538588ecb
Component: engine
2016-03-25 09:31:36 -07:00
1ac9493cd9 Merge pull request #21477 from cpuguy83/better_logging_on_integration
Better logging for errors in some tests
Upstream-commit: d7b341bc06c880efbc015b6cf75e69638800ff4b
Component: engine
2016-03-25 09:16:18 -07:00
44532d43ae Better logging for errors in some tests
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 42df9edc4a6ccfff6869fd14b2128ca3312e99db
Component: engine
2016-03-25 10:02:52 -04:00
d6e2929646 Merge pull request #21465 from runcom/fix-test
integration-cli: fix wrong test and add log
Upstream-commit: 9fbe1d9917f8c3993300b88a056f81522b9a28ab
Component: engine
2016-03-25 10:22:01 +01:00
cfeb820c82 Merge pull request #21361 from HackToday/addfilter
Add name/driver filter support for volume
Upstream-commit: 2de29fb9c2eaee803d69625a7105953da941356e
Component: engine
2016-03-25 08:07:38 +01:00
9a2a79217f Merge pull request #21487 from tonistiigi/fix-old-dind
Fix setting cgroup permission to user/privileged devices
Upstream-commit: f3d824771a10a8143ea97afb6864d0a587c7b7e3
Component: engine
2016-03-24 22:56:39 -07:00
553d05c397 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>
Upstream-commit: 8e9305ef946843ce2f8ef47909d6a866eab5dfa8
Component: engine
2016-03-25 01:11:17 +00:00
6d0a18169c Add "--ipv6" flag in IT for network create when using ipv6 subnets
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: ec77c124de3f57a18d3459ed75c8a286ce14fe32
Component: engine
2016-03-24 16:19:59 -07:00
5b031241b0 Fix setting cgroup permission to user/privileged devices
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ee6123588067eb067ec1c02cc340d7493c8cd9a6
Component: engine
2016-03-24 14:16:33 -07:00
ee44cd51fb Merge pull request #21315 from hqhq/hq_check_quota
Add validation for cpu period and quota
Upstream-commit: f2847f8ab3467b43eccf0a9580d4ea3e8abdf146
Component: engine
2016-03-24 14:10:48 -07:00
547c60d84c More descriptive error when running a container with a too long hostname (#21445)
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 #21445.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: fa44b4e81ee87f1c2b39ad335a22795415c8cdf2
Component: engine
2016-03-24 17:42:28 +00:00
51e700f816 Merge pull request #21460 from tonistiigi/exec-ulimits
Add ulimit support to libcontainerd addprocess
Upstream-commit: 57575a2695a822eb19bda555b1dbb9451d2c0881
Component: engine
2016-03-24 09:38:21 -04:00
791eed0ff8 Merge pull request #21428 from estesp/reenable-shared-nstests-userns
Re-enable shared namespace tests for userns CI runs
Upstream-commit: 21315589632fadb3a5460ee0a278f2511e6a7d13
Component: engine
2016-03-24 12:31:27 +01:00
068d11d990 integration-cli: fix wrong test and add log
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: e73152bf273418cbee3d5862dd2ccfbdf2d6e8fc
Component: engine
2016-03-24 11:10:41 +01:00
e716bd46e9 Add ulimit support to libcontainerd addprocess
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8891afd8385aeb490f8b7d9db8c3828bc7d24dc1
Component: engine
2016-03-23 19:54:32 -07:00
d35ea7bea5 Merge pull request #21454 from anusha-ragunathan/fix_overlay
Move layer mount refcounts to mountedLayer
Upstream-commit: 55bbea375100716ebc0ef16edab567b0627cff0d
Component: engine
2016-03-23 22:39:38 -04:00
b6d708cfd3 Merge pull request #21443 from calavera/fix_network_path_issue
Fix network path issue
Upstream-commit: 68674f739f218a45419c33a0c25cb6cbfbd0f4af
Component: engine
2016-03-23 22:27:44 -04:00
778611a207 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>
Upstream-commit: 65d79e3e5e537039b244afd7eda29e721a93d84f
Component: engine
2016-03-23 14:42:52 -07:00