p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,873 Commits 2 Branches 295 Tags
975b04d785758cfb5b779a65543dfd668e6e683f
Commit Graph

404 Commits

Author SHA1 Message Date
Jessica Frazelle
29fa44dc8c add test-integration-cli specifics for userns 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: ea3afdad612448fc6eefcc4bdd63563be8f16946
Component: engine
 2015-10-09 20:50:27 -04:00
Madhu Venugopal
45997573a5 Network UX and integration tests 
* Exiting experimental network UX
* removed experimental service UX
* integrated with the new network remote API

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 22a9ba090eb3cc1bc6c851785a876b064df7341a
Component: engine
 2015-10-07 03:54:27 -07:00
Madhu Venugopal
8623fdfb48 Network remote APIs using new router, --net=<user-defined-network> changes 
* Moving Network Remote APIs out of experimental
* --net can now accept user created networks using network drivers/plugins
* Removed the experimental services concept and --default-network option
* Neccessary backend changes to accomodate multiple networks per container
* Integration Tests

Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2ab94e11a2a8499088a72ab27fd09e897d8c810a
Component: engine
 2015-10-07 03:54:19 -07:00
Brian Goff
56b56acf38 Merge pull request #16708 from jfrazelle/fix-shm-mqueue-when-mounted-from-host 
do not mount /dev/shm or /dev/mqueue if we are mounting from the host
Upstream-commit: 662f55d11d2f278daf5b9be215608540af35be4d
Component: engine
 2015-10-02 15:13:59 -04:00
Jess Frazelle
f14e695085 Merge pull request #16159 from runcom/validate-cpuset-cpus 
Validate --cpuset-cpus, --cpuset-mems
Upstream-commit: 698e14902a06af0613b697d88935ae0200659bff
Component: engine
 2015-10-02 11:30:46 -07:00
Jessica Frazelle
0cd51b7f83 add regression test for mounting /dev/shm from host 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 934d9d632313acd338608ca1ad25c5270463e9c0
Component: engine
 2015-10-02 11:14:08 -07:00
Alexander Morozov
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
John Howard
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
John Howard
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
Antonio Murdaca
360eb92f7d Validate --cpuset-cpus, --cpuset-mems 
Before this patch libcontainer badly errored out with `invalid
argument` or `numerical result out of range` while trying to write
to cpuset.cpus or cpuset.mems with an invalid value provided.
This patch adds validation to --cpuset-cpus and --cpuset-mems flag along with
validation based on system's available cpus/mems before starting a container.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 94464e3a5e1dce0f6b3e821f79fe193278f67dba
Component: engine
 2015-09-27 16:38:58 +02:00
Jess Frazelle
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
Jess Frazelle
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
John Howard
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
David Calavera
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
John Howard
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
Darren Stahl
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
Jess Frazelle
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
Arnaud Porterie
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
Arnaud Porterie
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
John Howard
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
Brian Goff
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
Jess Frazelle
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
Doug Davis
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
Tim Hockin
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
Srini Brahmaroutu
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
Mrunal Patel
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
Antonio Murdaca
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
John Howard
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
Alessandro Boch
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
John Howard
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
John Howard
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
Sebastiaan van Stijn
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
Brian Goff
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
David Calavera
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
Jessie Frazelle
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
Alexander Morozov
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
Brian Goff
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
Qiang Huang
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
David Calavera
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
Lei Jitang
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
Brian Goff
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
Mrunal Patel
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
Soshi Katsuta
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
Vincent Demeester
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
Zhang Kun
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
Eric Windisch
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
Arnaud Porterie
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
David Calavera
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
Veres Lajos
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
Stefan Berger
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