e1191bf537
Merge pull request #17459 from brahmaroutu/Power_Z_CI
...
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Po…
Upstream-commit: 249b3a9479048bcec8da0666c2e224dddcfc3de8
Component: engine
2015-11-19 15:50:07 -08:00
5ba2d283e5
Merge pull request #18046 from LK4D4/carry_16822
...
Revert AppArmor skip tests
Upstream-commit: 7179c89943d0447066bdac30d06e8a8054d2f6d3
Component: engine
2015-11-18 10:37:53 +01:00
265a183ad6
Skip apparmor tests on User Namespace
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 70ce2d9b10e7119218ccf10a9b83d86acd2b1ed6
Component: engine
2015-11-17 11:49:31 -08:00
99449052ad
Revert "Skip TestAppArmorDeniesChmodProc"
...
This reverts commit 04e1015aa06785210dc6a3e4d4ad66700a8d51b0.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 0df0b6b44300896d82127fac628a1021c25ef861
Component: engine
2015-11-17 11:46:42 -08:00
5b2291ae91
Revert "Skip TestRunUnshareProc"
...
This reverts commit 03dce24137c82caa04c215d983eac06a3edc084c.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 1bf5fcd911a7f773a1f6c7511e977d87cca5b391
Component: engine
2015-11-17 11:46:42 -08:00
c9e22f7865
Merge pull request #18027 from tpounds/fix-err-message-typo
...
Fix error typo when --expose and --net are specified
Upstream-commit: 19debeb255c0676148a0efeb2cd7f0f3f38e9edd
Component: engine
2015-11-17 11:34:40 -08:00
b68e94a11d
Fix typo when --expose and --net are specified.
...
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com >
Upstream-commit: a25988cf760b96c855b3e1442547ea9d763c7cd1
Component: engine
2015-11-16 22:01:20 -08:00
2e538bcbf1
Remove deprecated cli flags
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 7929888214741c4ab194c44e0b14ac08aca06556
Component: engine
2015-11-15 10:40:01 +01:00
cf05bcf15c
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Power and Z.
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: b1cc78b8f5d0c85c80c04a15fa791025ae7d22e6
Component: engine
2015-11-14 03:16:45 +00:00
c7ef5afd48
Windows: Remove check for volume support
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 820957198299a9fa7cbb019b2b0d3dc8c3b375d0
Component: engine
2015-11-13 13:02:30 -08:00
920a8605ab
Merge pull request #17383 from Microsoft/10662-volumeerrors
...
Fix volume error messages
Upstream-commit: f1834153de196361e14c86b12c98d6b118cd4f56
Component: engine
2015-11-05 21:58:03 -05:00
13125ff6b4
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
Upstream-commit: 2519f465501657c24ecd13b8e53964b6c2f1a78d
Component: engine
2015-11-05 15:22:37 -08:00
f427a47755
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 157b66ad390902ef6f5b51b3f76d5177eacac81b
Component: engine
2015-11-05 17:09:58 -05:00
ef88e7ace2
Remove LXC support.
...
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3b5fac462d21ca164b3778647420016315289034
Component: engine
2015-11-05 17:09:57 -05:00
f66555fbae
Change 'docker run' exit codes to distinguish docker/contained errors
...
The purpose of this PR is for users to distinguish Docker errors from
contained command errors.
This PR modifies 'docker run' exit codes to follow the chroot standard
for exit codes.
Exit status:
125 if 'docker run' itself fails
126 if contained command cannot be invoked
127 if contained command cannot be found
the exit status otherwise
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: 41de7a18d8f231568977e66bb58a6a02545d49d9
Component: engine
2015-11-04 15:18:50 -05:00
7fc5a670bb
cant run volume on windows
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 1a6a860c143487b96b8a6221768a73ed4cef6d7b
Component: engine
2015-10-29 08:55:48 -07:00
dd17d17d3e
Fix volume error messages
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5f4cb33a5186c7822dc718ba915f59979c598c28
Component: engine
2015-10-28 09:23:43 -07:00
fbb5f4e19f
Merge pull request #17393 from tiborvass/carry-17360
...
Carry Fix docker inspect container only reports last assigned information
Upstream-commit: 9ab71b68af5b340373411e26e679c6e7506ce167
Component: engine
2015-10-27 17:00:41 -07:00
6c30abdc61
Extract network settings types for inspect.
...
Keeping backwards compatibility.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 25682577c9d29b325b4b615c4b88c132a4640082
Component: engine
2015-10-27 19:16:21 -04:00
14116a686a
Windows: Volume integration tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2af5034ce8faa1f93d81864aa25ec64527fac76b
Component: engine
2015-10-26 14:33:28 -07:00
27d55a1112
Merge pull request #16433 from Microsoft/10662-volumes5
...
Windows: [TP4] Add volume support
Upstream-commit: e74cf8acad799aff39bf1b8ceffdef471aa0d242
Component: engine
2015-10-23 18:43:07 -04:00
f7f7ce4926
Windows: Add volume support
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a7e686a779523100a092acb2683b849126953931
Component: engine
2015-10-22 10:42:53 -07:00
e3fa9b6aba
Skipping two tests when running with GCCGO (CI)
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: dc813c7d137d3e673b68ad4a2996f254d195f1d9
Component: engine
2015-10-21 17:53:59 +00:00
ccde1983ec
Update Dockerfile to use the correct busybox:latest identifier
...
Also requires some tests to be updated which relied on behavior
of a busybox image that wasn't actually "busybox:latest"; meaning these
tests were unable to be verified/run against a real busybox:latest image
on a daemon.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 414cfe946719a0ba811c95486d523e003d44fcc1
Component: engine
2015-10-20 12:03:11 -04:00
332d97bdef
update tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 28ad7c588f5ebaf5a41950b42a61759cf47c8de7
Component: engine
2015-10-13 15:52:14 -07:00
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
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
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
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
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
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
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
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
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
