Alexander Morozov
d6e7350b96
Merge pull request #16635 from Microsoft/10662-fixtestrununknowncommand
...
TestRunUnknownCommand 30s, not 30ns
2015-09-28 14:31:48 -07:00
John Howard
4d301f0059
Windows: Fix TestRunStdinBlockedAfterContainerExit
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-28 14:08:26 -07:00
John Howard
74aeb0350e
TestRunUnknownCommand 30s, not 30ns
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-28 13:40:17 -07:00
Jess Frazelle
7daeecd42d
Merge pull request #16559 from Microsoft/10662-fix16556
...
Fixes 16556 CI failures
2015-09-24 12:31:36 -07:00
Jess Frazelle
23750fb802
Merge pull request #15862 from calavera/share_shm_and_mqueue
...
Share shm and mqueue between containers.
2015-09-24 11:23:59 -07:00
John Howard
e65a7dabb9
Fixes 16556 CI failures
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-24 11:19:00 -07:00
David Calavera
c8bc02ea35
Merge pull request #16538 from Microsoft/10662-escapeargs
...
Windows: Fixed escaping of command line arguments
2015-09-24 11:18:29 -07:00
John Howard
5d630abbab
TestRandomUnixTmpDirPath platform agnostic
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-24 09:37:07 -07:00
Darren Stahl
ca5cc770b9
Windows: Fixed escaping of command line arguments
...
This fixes some tests that were failing on windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2015-09-23 16:35:44 -07:00
Jess Frazelle
c0c941627a
Merge pull request #16289 from cpuguy83/11957_fix_stdin_block_after_container_exit
...
Ensure stdin does not block after container stop
2015-09-23 15:29:48 -07:00
Arnaud Porterie
04e1015aa0
Skip TestAppArmorDeniesChmodProc
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-09-23 13:23:15 -07:00
Arnaud Porterie
03dce24137
Skip TestRunUnshareProc
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-09-23 13:23:08 -07:00
John Howard
8a5ab83df8
Windows: First part of CI tests (docker run)
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-22 10:24:03 -07:00
Brian Goff
3dbfb3d38c
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>
2015-09-18 13:48:07 -04:00
Jess Frazelle
828e4ac45a
Merge pull request #16355 from duglin/DaemonErrors
...
Convert some "daemon" static error strings to the new errocode package format
2015-09-17 11:48:37 -07:00
Doug Davis
f7d4b4fe2b
Convert some "daemon" static error strings to the new errocode package format
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-09-16 16:16:42 -07:00
Tim Hockin
3d4685e258
Add support for DNS options
...
Signed-off-by: Tim Hockin <thockin@google.com>
2015-09-16 14:06:45 -07:00
Srini Brahmaroutu
2c53643b33
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>
2015-09-16 18:56:01 +00:00
Mrunal Patel
3f631b0d94
Modify test to include /dev/shm sharing
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
(cherry picked from commit 457aeaa2e1
)
2015-09-11 14:02:11 -04:00
Antonio Murdaca
d5a705b600
integration-cli: add missing err check in TestRunNetworkNotInitializedNoneMode
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-08 23:05:54 +02:00
John Howard
f9a3558a9d
Windows: Get Integration CLI running
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-04 12:32:40 -07:00
Alessandro Boch
56fdb05258
Docker changes for libnetwork Sandbox
...
- Ground-work for integrating with user namespace support
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-09-02 17:24:56 -07:00
John Howard
d7eb85bb1f
Move run tests out of unix files
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-01 09:42:19 -07:00
John Howard
3c2b128582
Fix typo in test title
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-31 15:28:40 -07:00
Sebastiaan van Stijn
fa13f7cde8
Merge pull request #14242 from cpuguy83/add_volume_api
...
Add volume api
2015-08-26 21:57:12 +02:00
Brian Goff
b3b7eb2723
Add volume API/CLI
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-08-26 13:37:52 -04:00
David Calavera
a9378a0ab5
Revert "Modify test to include /dev/shm sharing"
...
This reverts commit 457aeaa2e1
.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-26 05:22:46 -04:00
Jessie Frazelle
903cd2b9e3
Merge pull request #12159 from mrunalp/feature/ipc_share_dev
...
ipc: Share /dev/shm and /dev/mqueue when --ipc container:<id/name> is used
2015-08-24 17:55:03 -07:00
Alexander Morozov
6b21e98432
Merge pull request #15766 from hqhq/hq_fix_device
...
Add mode check for device
2015-08-24 10:58:49 -07:00
Brian Goff
2b174d3d9d
Merge pull request #15444 from coolljt0725/add_test_require_for_test_blkio
...
Add test require for TestRunWithBlkioInvalidWeight and TestRunWithBlkio
2015-08-24 08:33:17 -04:00
Qiang Huang
429423624c
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>
2015-08-24 17:57:12 +08:00
David Calavera
9bac520c12
Merge pull request #15571 from ewindisch/apparmor_denywproc
...
AppArmor: Deny w to /proc/* files
2015-08-24 11:03:41 +02:00
Lei Jitang
c340ca4f5d
Add some missing cgroup test require and refactor the require check.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-24 11:37:11 +08:00
Brian Goff
5929502b4e
Merge pull request #15412 from vdemeester/dont-sleep-too-much
...
time.Sleep in integration tests — comment and waitRun/waitInspect
2015-08-21 20:43:55 -04:00
Mrunal Patel
457aeaa2e1
Modify test to include /dev/shm sharing
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-08-19 12:36:57 -04:00
Soshi Katsuta
5759b95e7e
integration-cli: fix printf verbs of wrong types
...
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
2015-08-19 17:47:33 +09:00
Vincent Demeester
799d9605d6
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>
2015-08-18 20:36:08 +02:00
Zhang Kun
1ed15550f5
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>
2015-08-18 10:06:36 +08:00
Eric Windisch
7342d59114
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>
2015-08-13 15:39:25 -04:00
Arnaud Porterie
bf892dcfcc
Merge pull request #15420 from vlajos/typofixes-vlajos-20150807
...
typofix - https://github.com/vlajos/misspell_fixer
2015-08-08 01:08:49 -07:00
David Calavera
196aa6d62d
Merge pull request #14965 from stefanberger/nohidevols2
...
Have network files mounted read-only when -v parameter has 'ro' passed
2015-08-07 19:10:59 -07:00
Veres Lajos
5146232723
typofix - https://github.com/vlajos/misspell_fixer
...
Signed-off-by: Veres Lajos <vlajos@gmail.com>
2015-08-07 23:25:49 +01:00
Stefan Berger
38295d4b48
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>
2015-08-06 20:37:28 -04:00
Mohammed Aaqib Ansari
84c9a6684f
skipping test TestRunCapAddSYSTIME on lxc
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
2015-07-31 22:07:40 -04:00
Brian Goff
5276655b69
Merge pull request #14463 from sunyuan3/TestRunCapAddSYSTIME
...
Add TestRunCapAddSYSTIME test case.
2015-07-31 09:40:12 -04:00
Yuan Sun
a5e2fa2b2e
Add TestRunCapAddSYSTIME test case.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-07-31 12:53:46 +08:00
Jessica Frazelle
f12e18d7ef
fix lxc test machine
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-07-30 21:30:47 -07:00
Tibor Vass
a687448c4d
Merge pull request #15163 from crosbymichael/proc-ro
...
Don't mount /proc as ro
2015-07-30 15:12:29 -04:00
Eric Windisch
f5c388b35a
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>
2015-07-30 14:40:28 -04:00
Michael Crosby
bfc51cf660
Don't mount /proc as ro
...
This caused a regression with LSM labeling.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-07-30 10:57:50 -07:00