Commit Graph

1798 Commits

Author SHA1 Message Date
e2e0f70ccb Merge pull request #15412 from vdemeester/dont-sleep-too-much
time.Sleep in integration tests — comment and waitRun/waitInspect
Upstream-commit: 5929502b4e05ed82e78347169f3ba705cac8ad35
Component: engine
2015-08-21 20:43:55 -04:00
a372501fd6 Merge pull request #15750 from mountkin/fix-exec-panic
fix a panic when the exec fails to start
Upstream-commit: fefc9a3a6ae9ccb738a4e984ff90db70bb053484
Component: engine
2015-08-21 15:54:58 -07:00
26bf545a48 Merge pull request #14006 from hqhq/hq_add_kmem_limit
Add support for kernel memory limit
Upstream-commit: 9bd8a9b66bb493026599d22c7637909cb460d039
Component: engine
2015-08-21 14:34:27 -07:00
20b08ad6cb Merge pull request #15507 from clintonskitson/patch_issue_15467
added check for bind on create to determine local volume driver
Upstream-commit: 19f7bfcda9ea11806a39a6508d3961649ba8ba5d
Component: engine
2015-08-21 14:23:44 -07:00
589fca3f48 fix a panic when the exec fails to start
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: fcf9daad91d9be24ceddbc4add4d3a8179c9b32c
Component: engine
2015-08-22 00:01:44 +08:00
e87c28da2c added check for bind on create to determine local volume driver
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com>
Upstream-commit: 6b8129d1fe9b1428833e1c38e463a5a4cc204390
Component: engine
2015-08-20 01:40:04 -07:00
06cb17df38 Merge pull request #15664 from skatsuta/fix-parse-null
builder: avoid parsing null- string to nil slice (issue #15634)
Upstream-commit: ca795765859b8560ab3d1a0ff31338d84b3c69a5
Component: engine
2015-08-19 09:06:20 -07:00
3004521c7f Add support for kernel memory limit
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: b6f1b4ad350cbf1f540797eee44520694237d47c
Component: engine
2015-08-19 23:56:55 +08:00
3610e48336 Merge pull request #15691 from skatsuta/fix-printf-wrong-type
integration-cli: fix printf verbs of wrong types
Upstream-commit: 09cdd0524efe4804c8e5b772af87afbbb8c73cb8
Component: engine
2015-08-19 08:12:45 -07:00
68987b8336 Merge pull request #12927 from lindenlab/custom-host-port-ranges
Proposal: Change --publish=SPEC to allow binding to custom host port ranges
Upstream-commit: 59e49e1db0c4b59d8ca7334fdadade73755969b9
Component: engine
2015-08-19 17:04:23 +02:00
e87b5d1d77 integration-cli: fix printf verbs of wrong types
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
Upstream-commit: 5759b95e7e7c269af48a095773961ed8d13f8798
Component: engine
2015-08-19 17:47:33 +09:00
b5be5aca06 integration-cli: use c.Assert(err, check.IsNil) instead of if err != nil
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
Upstream-commit: a41f431d118291c47344b6f2599f0a8c5b272f5a
Component: engine
2015-08-19 15:23:11 +09:00
8e9c7e7df9 integration-cli: modify %s to %d in formatting an int
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
Upstream-commit: 5b870d7fa6d65895a4be601a1e09812a4962d03d
Component: engine
2015-08-19 12:06:05 +09:00
a9c24d4837 integration-cli: add a integration test to avoid parsing null string in ADD, COPY and VOLUME to nil slice
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
Upstream-commit: d45fcc6c80bd67ee6a06821fd64cad029d3a756f
Component: engine
2015-08-19 11:11:46 +09:00
22da8315f6 Remove/Comment time.Sleep in integration tests
Remove what seems unnecessary time.Sleep (1 second even) and comment the
ones that seemed necessary.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 799d9605d6d37a0f5c559b0325d924ad183ff4ee
Component: engine
2015-08-18 20:36:08 +02:00
57a4ccd575 Merge pull request #15649 from LK4D4/syslog_validation
Syslog validation
Upstream-commit: 8aa520b8c020dd78055fbf4423ca0c086f3e4bf4
Component: engine
2015-08-18 11:14:31 -07:00
a3521c2e7e fix in daemon side
Signed-off-by: Zhang Kun <zkazure@gmail.com>

goformat

Signed-off-by: Zhang Kun <zkazure@gmail.com>

fix small

Signed-off-by: Zhang Kun <zkazure@gmail.com>

change to rm

Signed-off-by: Zhang Kun <zkazure@gmail.com>

handler other error

Signed-off-by: Zhang Kun <zkazure@gmail.com>

unique ERR

Signed-off-by: Zhang Kun <zkazure@gmail.com>

setHostConfig_fail_test

Signed-off-by: Zhang Kun <zkazure@gmail.com>

format

Signed-off-by: Zhang Kun <zkazure@gmail.com>

err handle and modify test

Signed-off-by: Zhang Kun <zkazure@gmail.com>

golint error

Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: 1ed15550f57ae822bb30263ce81174cabeb794ec
Component: engine
2015-08-18 10:06:36 +08:00
f00550c0b6 Merge pull request #15599 from calavera/ps_format_q
Fix ignore `-q` flag in `docker ps` when there is a default format.
Upstream-commit: 29ced5d0c4d67b3609c95bc039589009086852b3
Component: engine
2015-08-17 15:44:28 -07:00
8deea878c7 Fix LogConfig.Config in inspect
Also add test for daemon-wide log-opt.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3f61002b05794eb5e4262a39e29f8a45c7260ba3
Component: engine
2015-08-17 15:27:44 -07:00
03328caba1 Check syslog config on daemon start
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 960791ba60621ef2b182379e7b237e681b602694
Component: engine
2015-08-17 14:29:45 -07:00
5bfc44e34c Merge pull request #15292 from mountkin/fix-exec-test
move the assertions outside of the goroutine
Upstream-commit: 5c88a6fdcaa264845e5ad07f57222f750e213520
Component: engine
2015-08-17 17:24:58 -04:00
4c6bab5f50 Fix ignore -q flag in docker ps when there is a default format.
Docker ps default format should not take precedence over cli flags.
This happens effectively for other flags except `-q`.
We need to let the cli to set the format as table to print the
expected output with `-q`.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: df46bfdd4d28dcab432b2fc6c36131ff95223148
Component: engine
2015-08-17 10:48:04 -07:00
f403372672 Fix inspect output when no log driver specified
Config options were being ignored in the inspect output when no driver
was specified.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2f2779b6a5c8f6efcd2ba55bf7cb0db54c259726
Component: engine
2015-08-17 11:35:34 -04:00
f2f5327a6e Merge pull request #14113 from dit4c/10348-exec-privileged
Remerge of `docker exec --privileged` with better tests
Upstream-commit: e1f3a5ad0aade527c1b00385652aec21d1cf09ac
Component: engine
2015-08-16 00:20:41 +02:00
28513048f1 Merge pull request #15598 from cpuguy83/15570_fix_exec_tty
Fix issue with exec TTY caused by 15446
Upstream-commit: bd9cc788d0245fe1fcd3370dd8a55eb94f781665
Component: engine
2015-08-14 19:43:04 -07:00
470c87b117 Adding support to publish on custom host port ranges
Signed-off-by: Don Kjer <don.kjer@gmail.com>

Changing vendor/src/github.com/docker/libnetwork to match lindenlab/libnetwork custom-host-port-ranges-1.7 branch
Upstream-commit: 47272f9cc563ea90d1f86df044f5429d15a37e4f
Component: engine
2015-08-15 02:41:29 +00:00
57a36297f7 Fix issue with exec TTY caused by 15446
The bool logic around setting up the TTY ended up getting flipped
accidentally.
Also added a test for exec with TTY.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5ffcecf130aea8c0b92d1be728e2c302cf2c6c70
Component: engine
2015-08-14 14:55:26 -07:00
809e0fd73f Merge pull request #14530 from Microsoft/10662-serversidevalidation
Windows: [TP3] Move netmode validation to server
Upstream-commit: 3e523ae015750be4893b9c5a4f77361fbb0e9849
Component: engine
2015-08-14 16:05:59 -04:00
da7258ee55 Move netmode validation to server
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f6ed590596cbf73764b40ff4f32f90b1cdb8b213
Component: engine
2015-08-14 12:17:41 -07:00
f1cc5568e9 Merge pull request #13501 from vdemeester/8048-image-repository-tag
Fix #8048 : make `docker images repository:tag` work
Upstream-commit: c6c195a465652e96b06e76b44a1df075cba9ad80
Component: engine
2015-08-13 21:36:21 +02:00
d024131050 Fix #8048 : make docker images repository:tag work
Make command like "docker images ubuntu:14.04" work and filter out the
image with the given tag.

Closes #8048.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4fb88d2e11f2f16c520b36e4c6e00db44ae26b8c
Component: engine
2015-08-13 08:50:09 +02:00
273be038ad Updated test to check for exec --privileged side-effects
Also improving documentation for same feature as part of
docker/docker#14113 docs review.

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
Upstream-commit: 90326939c8089dbd7b59423415bc67cae6208b08
Component: engine
2015-08-13 16:37:20 +10:00
337be087f4 Revert "Revert "Add docker exec run a command in privileged mode""
This reverts commit 40b71adee390e9c06471b89ed845132b4ec80177.

Original commit (for which this is effectively a rebased version) is
72a500e9e5929b038816d8bd18d462a19e571c99 and was provided by Lei Jitang
<leijitang@huawei.com>.

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
Upstream-commit: 03f65b3d0d66ccdc8b69a447b75508d594007600
Component: engine
2015-08-13 16:36:44 +10:00
f6cb9362d1 Update regression test
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 697cdb8e2f288190034b9f72bbd747d02d9643da
Component: engine
2015-08-12 18:46:55 -07:00
6585a8728e Revert #14884
This reverts commit 810d3b2642d4a82dc186d6eff8c2e487ee624bc5.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 4f3b0d0f4ad046a5180f524ba320990c67282dd0
Component: engine
2015-08-12 18:46:48 -07:00
755087c2f9 Merge pull request #15420 from vlajos/typofixes-vlajos-20150807
typofix - https://github.com/vlajos/misspell_fixer
Upstream-commit: bf892dcfcc002ee374057033a940ce2250181066
Component: engine
2015-08-08 01:08:49 -07:00
3cfa964774 Merge pull request #14965 from stefanberger/nohidevols2
Have network files mounted read-only when -v parameter has 'ro' passed
Upstream-commit: 196aa6d62d7084033a37f7085c2b2f55cd744d34
Component: engine
2015-08-07 19:10:59 -07:00
2c6e673ce7 typofix - https://github.com/vlajos/misspell_fixer
Signed-off-by: Veres Lajos <vlajos@gmail.com>
Upstream-commit: 514623272398574c8fd7ef3fe42c5b2ae161349a
Component: engine
2015-08-07 23:25:49 +01:00
502a6d4faf fix golint warnings/errors on package api/types/
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 3d6617ffe7d9242107ac09eab4f2d8ce87acb95c
Component: engine
2015-08-07 09:43:43 +08:00
70e2333c7e Have network files mounted read-only when -v parameter has 'ro' passed
Have network files mounted read-only when mounted using the -v
open and -v parameter has 'ro' passed.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 38295d4b48fed3d9569100543a25e46b21deba46
Component: engine
2015-08-06 20:37:28 -04:00
a1b4849c0d Merge pull request #15213 from Microsoft/10662-cliwindowsdaemon
Windows: Test infrastructure plumbing
Upstream-commit: 57c8f4244b6e6093ceeb58ac6ca53b2b95b26e2d
Component: engine
2015-08-06 11:25:22 -04:00
84f01a56ed Merge pull request #15353 from jlhawn/fixing-concurrency-trust
[graph] Use a pipe for downloads to write progress
Upstream-commit: af9dc3050bd17a4b2fa3e05835b39c865f6bdc31
Component: engine
2015-08-05 18:52:27 -07:00
a2702aceb2 Merge pull request #15352 from icecrime/fix_pause_tests
Use busybox in 'pause' tests
Upstream-commit: 6805241fe2a41dac88b45879eac9c013341f6f04
Component: engine
2015-08-06 03:14:44 +02:00
fc48931914 [graph] Use a pipe for downloads to write progress
The process of pulling an image spawns a new goroutine for each layer in the
image manifest. If any of these downloads fail we would stop everything and
return the error, even though other goroutines would still be running and
writing output through a progress reader which is attached to an http response
writer. Since the request handler had already returned from the first error,
the http server panics when one of these download goroutines makes a write to
the response writer buffer.

This patch prevents this crash in the daemon http server by waiting for all of
the download goroutines to complete, even if one of them fails. Only then does
it return, terminating the request handler.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: d80c4244d322fe0a9cbdd996d23e37fb5b089544
Component: engine
2015-08-05 18:13:39 -07:00
b8e884831a Use busybox in 'pause' tests
Don't assume that any random image will have 'top' and explicitely use
the busybox image for testing.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 3529e3dac78a18df46d4010a58c9f9d741b42fab
Component: engine
2015-08-05 17:35:20 -07:00
2bbb5f5c44 Windows: Test infrastructure plumbing
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: da44d0fccba3ace90face348a415632dee75d14e
Component: engine
2015-08-05 14:34:32 -07:00
9416fd6ce9 Windows: Workaround for CI
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ac120567e8015a6a98f0aa7ac71f3ce2d5f36031
Component: engine
2015-08-05 11:20:30 -07:00
89d565ea50 move the assertions outside of the goroutine
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: bb161b7789cf74541892282f18a4814ead4a34d2
Component: engine
2015-08-05 13:59:31 +08:00
b6bee43e0c Another try to fix InspectExecID
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: fe6a7c8e57c1cf7cf7cbc501fa2006c8eaf412f1
Component: engine
2015-08-04 09:21:41 -07:00
ef1e59f5e4 Merge pull request #15222 from jlhawn/error_on_v2pull_hash_mismatch
[Re]Enforce manifest/layer digest verification
Upstream-commit: e84a938f2ee700886fa05f9f4970ac0e9b8f6231
Component: engine
2015-08-03 13:02:52 -07:00