1bdb03b312
Merge pull request #16635 from Microsoft/10662-fixtestrununknowncommand
...
TestRunUnknownCommand 30s, not 30ns
Upstream-commit: d6e7350b961d856dcc39db5accd898279d1be3da
Component: engine
2015-09-28 14:31:48 -07:00
e1405c129c
Windows: Fix TestRunStdinBlockedAfterContainerExit
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4d301f0059c4e2e4ecea1ed41f2c1588b8db6990
Component: engine
2015-09-28 14:08:26 -07:00
2e16748341
TestRunUnknownCommand 30s, not 30ns
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 74aeb0350e8a3cd73646bbfe45cfee8901f0cf28
Component: engine
2015-09-28 13:40:17 -07:00
3f746aee10
Merge pull request #16559 from Microsoft/10662-fix16556
...
Fixes 16556 CI failures
Upstream-commit: 7daeecd42d7bb112bfe01532c8c9a962bb0c7967
Component: engine
2015-09-24 12:31:36 -07:00
65bd47ac3a
Merge pull request #15862 from calavera/share_shm_and_mqueue
...
Share shm and mqueue between containers.
Upstream-commit: 23750fb80280e6770590b0ea30781c43f42e430d
Component: engine
2015-09-24 11:23:59 -07:00
60a1c405c1
Fixes 16556 CI failures
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e65a7dabb9632b30df9c67ca5783d6dd55e91a7b
Component: engine
2015-09-24 11:19:00 -07:00
ea22c47211
Merge pull request #16538 from Microsoft/10662-escapeargs
...
Windows: Fixed escaping of command line arguments
Upstream-commit: c8bc02ea35775b048cc84a9c10d6284675f3b297
Component: engine
2015-09-24 11:18:29 -07:00
b5fd27f53c
TestRandomUnixTmpDirPath platform agnostic
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5d630abbab734d60cc3078fd1e94862a67e0d8fd
Component: engine
2015-09-24 09:37:07 -07:00
d675aaa69f
Windows: Fixed escaping of command line arguments
...
This fixes some tests that were failing on windows
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: ca5cc770b9f0d473b285f55eb78d507a8669ee41
Component: engine
2015-09-23 16:35:44 -07:00
4429613429
Merge pull request #16289 from cpuguy83/11957_fix_stdin_block_after_container_exit
...
Ensure stdin does not block after container stop
Upstream-commit: c0c941627a2a516ce540aac2d9e3d579baa3efde
Component: engine
2015-09-23 15:29:48 -07:00
90fabf5056
Skip TestAppArmorDeniesChmodProc
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 04e1015aa06785210dc6a3e4d4ad66700a8d51b0
Component: engine
2015-09-23 13:23:15 -07:00
64940b5f4a
Skip TestRunUnshareProc
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 03dce24137c82caa04c215d983eac06a3edc084c
Component: engine
2015-09-23 13:23:08 -07:00
5a36e78a10
Windows: First part of CI tests (docker run)
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8a5ab83df8c029723d92a8b3a602b0d799753807
Component: engine
2015-09-22 10:24:03 -07:00
3194323cdb
Ensure stdin does not block after container stop
...
Fixes #11957
Fixes #12319
Also removes check for Darwin when the stdin reader is closed as it
doesn't appear to block any more.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 3dbfb3d38c4dcfb602e12ed2828d22d155897518
Component: engine
2015-09-18 13:48:07 -04:00
2d5e18cda2
Merge pull request #16355 from duglin/DaemonErrors
...
Convert some "daemon" static error strings to the new errocode package format
Upstream-commit: 828e4ac45a5b4954997949570b9b032c57137849
Component: engine
2015-09-17 11:48:37 -07:00
6295202aba
Convert some "daemon" static error strings to the new errocode package format
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: f7d4b4fe2b130a522dee847a657218806180fa52
Component: engine
2015-09-16 16:16:42 -07:00
655513db24
Add support for DNS options
...
Signed-off-by: Tim Hockin <thockin@google.com >
Upstream-commit: 3d4685e258a7729bd0f8cc411b5a73980a9faa20
Component: engine
2015-09-16 14:06:45 -07:00
6ad0539e3d
adding a Dockerfile.gccgo to use gccgo compiler instead of go compiler.
...
temporarily disabling registry builds as crypto package is broken with gccgo.
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 2c53643b33fbba5851afcc7067117a7b75cc5dbb
Component: engine
2015-09-16 18:56:01 +00:00
23e2c1d950
Modify test to include /dev/shm sharing
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
(cherry picked from commit 457aeaa2e1bdbb75c5b3bcedacde460920965c2f)
Upstream-commit: 3f631b0d94d57e6dc677a8cd86ecc9233c30e98f
Component: engine
2015-09-11 14:02:11 -04:00
4bdf1be246
integration-cli: add missing err check in TestRunNetworkNotInitializedNoneMode
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: d5a705b60036b1a914486bf700546e26e75e9e9d
Component: engine
2015-09-08 23:05:54 +02:00
c03ccb6893
Windows: Get Integration CLI running
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f9a3558a9d75ed6a2f9f1b2d80800226afaa74a5
Component: engine
2015-09-04 12:32:40 -07:00
357660a251
Docker changes for libnetwork Sandbox
...
- Ground-work for integrating with user namespace support
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 56fdb05258d1ab2153fec268ed22cf9d1227c356
Component: engine
2015-09-02 17:24:56 -07:00
e3bcc2a340
Move run tests out of unix files
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d7eb85bb1f0076ccffbec7c9291cc27d2cc4cc03
Component: engine
2015-09-01 09:42:19 -07:00
8216c91a01
Fix typo in test title
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3c2b128582bc8ea786b5486578c43d97167805fe
Component: engine
2015-08-31 15:28:40 -07:00
05f2bb7d8b
Merge pull request #14242 from cpuguy83/add_volume_api
...
Add volume api
Upstream-commit: fa13f7cde81d1d92c17740efb05823e7f9cc5468
Component: engine
2015-08-26 21:57:12 +02:00
bfe1bbc7d2
Add volume API/CLI
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b3b7eb2723461b1eb4be692f4bced0ae8ea9cb58
Component: engine
2015-08-26 13:37:52 -04:00
9f31b0028d
Revert "Modify test to include /dev/shm sharing"
...
This reverts commit 457aeaa2e1bdbb75c5b3bcedacde460920965c2f.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: a9378a0ab56ec50c7b3f14942ac1b54e6ea42f59
Component: engine
2015-08-26 05:22:46 -04:00
322a07231d
Merge pull request #12159 from mrunalp/feature/ipc_share_dev
...
ipc: Share /dev/shm and /dev/mqueue when --ipc container:<id/name> is used
Upstream-commit: 903cd2b9e3e2cea8b5ee7c0b74d52ff4a3beafb5
Component: engine
2015-08-24 17:55:03 -07:00
a5560b01cb
Merge pull request #15766 from hqhq/hq_fix_device
...
Add mode check for device
Upstream-commit: 6b21e98432ef3c4c9b7da42cdb94749b9181b654
Component: engine
2015-08-24 10:58:49 -07:00
d98907dbfe
Merge pull request #15444 from coolljt0725/add_test_require_for_test_blkio
...
Add test require for TestRunWithBlkioInvalidWeight and TestRunWithBlkio
Upstream-commit: 2b174d3d9d6f6308a8092c93ff74461f2a946fee
Component: engine
2015-08-24 08:33:17 -04:00
fdb06e387e
Add mode check for device
...
This fixes two problems:
1. docker run --device /dev/sda:rw ubuntu bash doesn't work
2. --device /dev/zero:/dev/noro:ro doesn't show clear error message,
but fail when writing to cgroup file.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 429423624c61b38efeaeda95792077a0da65c4ef
Component: engine
2015-08-24 17:57:12 +08:00
7143030753
Merge pull request #15571 from ewindisch/apparmor_denywproc
...
AppArmor: Deny w to /proc/* files
Upstream-commit: 9bac520c129c9fd5c9415b5170a66567d85247b4
Component: engine
2015-08-24 11:03:41 +02:00
bfcda62bd6
Add some missing cgroup test require and refactor the require check.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: c340ca4f5db9ab526532f26718a140654ff45458
Component: engine
2015-08-24 11:37:11 +08:00
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
83fa43c4c9
Modify test to include /dev/shm sharing
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: 457aeaa2e1bdbb75c5b3bcedacde460920965c2f
Component: engine
2015-08-19 12:36:57 -04: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
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
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
9aef8f471d
AppArmor: Deny w to /proc/* files
...
Introduce a write denial for files at the root of /proc.
This prohibits root users from performing a chmod of those
files. The rules for denials in proc are also cleaned up,
making the rules better match their targets.
Locally tested on:
- Ubuntu precise (12.04) with AppArmor 2.7
- Ubuntu trusty (14.04) with AppArmor 2.8.95
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 7342d59114fe443ae8d59474abb59280f014c493
Component: engine
2015-08-13 15:39:25 -04: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
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
9e93b28f16
skipping test TestRunCapAddSYSTIME on lxc
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
Upstream-commit: 84c9a6684ff159081850a60dd9cfa1f4d50ee6b8
Component: engine
2015-07-31 22:07:40 -04:00
f8cb968c76
Merge pull request #14463 from sunyuan3/TestRunCapAddSYSTIME
...
Add TestRunCapAddSYSTIME test case.
Upstream-commit: 5276655b694bec1125c4c119adb941a2b7531433
Component: engine
2015-07-31 09:40:12 -04:00
e9bd79ecdf
Add TestRunCapAddSYSTIME test case.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: a5e2fa2b2e30cf515d22dee532ae33d5ab695008
Component: engine
2015-07-31 12:53:46 +08:00
4d212c22a0
fix lxc test machine
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: f12e18d7ef9b1a354c10038874f0e7be0a8bb66f
Component: engine
2015-07-30 21:30:47 -07:00
76f950f781
Merge pull request #15163 from crosbymichael/proc-ro
...
Don't mount /proc as ro
Upstream-commit: a687448c4dec200336ed28c5ef26c8198cc0505b
Component: engine
2015-07-30 15:12:29 -04:00
114011a355
Only explicitly deny ptrace for container-originated procs
...
The 'deny ptrace' statement was supposed to only ignore
ptrace failures in the AUDIT log. However, ptrace was implicitly
allowed from unconfined processes (such as the docker daemon and
its integration tests) due to the abstractions/base include.
This rule narrows the definition such that it will only ignore
the failures originating inside of the container and will not
cause denials when the daemon or its tests ptrace inside processes.
Introduces positive and negative tests for ptrace /w apparmor.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: f5c388b35a9ddd699b3dbbe85b80fa02234f8355
Component: engine
2015-07-30 14:40:28 -04:00
8461105dc9
Don't mount /proc as ro
...
This caused a regression with LSM labeling.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: bfc51cf6605ebcf7a4ec791fb0f3b5ae7b05c6fd
Component: engine
2015-07-30 10:57:50 -07:00
