Commit Graph

252 Commits

Author SHA1 Message Date
87fcb82bfa Merge pull request #5448 from crosbymichael/selinux-defaults
Add selinux label support for processes and mount
Upstream-commit: 2a711d16e05b69328f2636f88f8eac035477f7e4
Component: engine
2014-04-30 14:14:39 -07:00
bde45636d6 Fix various MAINTAINERS format inconsistencies
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: defecac2799ca0c72532b7e6ed6005cc54ee2e25
Component: engine
2014-04-30 11:22:11 -06:00
2acb87c29f Initial work on selinux patch
This has every container using the docker daemon's pid for the processes
label so it does not work correctly.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f0e6e135a8d733af173bf0b8732c704c9ec716d7
Component: engine
2014-04-29 03:40:05 -07:00
cb6c5cfbb8 Fixes permissions on volumes when dir in container is empty
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: ff7b52abd3f26d9650c2e674400d58fbe8157ad8
Component: engine
2014-04-28 16:57:28 -04:00
62e9a76b63 Freeze ./integration and explain where to contribute new tests
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: e83fc70d362bf0035811bbcc5566020c6cc9893f
Component: engine
2014-04-26 18:55:39 -07:00
d8eb119f29 Remove error from engine.New()
Without creating a root there is no way for the engine to return an
error from the new function.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7100ace42bda2660d1eaecb2ec096ba6753688ea
Component: engine
2014-04-23 11:54:35 -07:00
e886c73325 Update tests with engine root removal
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 87e8d7754e218d93b480b94537d07793f6680515
Component: engine
2014-04-22 19:24:47 -07:00
5c5b3c1ca6 Remove the concept of a root dir out of engine
This makes the engine more general purpose so that we can
use it and the job routing functionality for reexec'ing our binary
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)

Conflicts:
	integration/runtime_test.go
Upstream-commit: 672edfe807c597a1c245bce996a150dfdf273a3c
Component: engine
2014-04-22 19:04:03 -07:00
5ba9282149 Merge pull request #5304 from vieux/convert_rm_tests
convert so rm tests to integration-cli
Upstream-commit: 2931979a5d6abb544fbbfdc359c5f6c131a58c41
Component: engine
2014-04-18 21:11:18 +03:00
86a52f5d6b convert so rm tests to integration-cli
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: fcbc717f9aa11dae75d7418482f51cb61c0bf001
Component: engine
2014-04-18 17:40:12 +00:00
4078a75e3a Remove worthless iptables test
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 58e011595e4c518a38ec27716585177faa969f72
Component: engine
2014-04-18 03:22:53 +00:00
42d84ccd4c Port privileged tests
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 296fcf331f2886d2aba3cfb929887dfbb603643d
Component: engine
2014-04-18 03:20:17 +00:00
a871063b21 Port networking tests
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: caad45d0edd9c1e48eac6e0ae0889039ca6844fc
Component: engine
2014-04-18 03:12:27 +00:00
1437557de2 Port environment test
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 47510bd6eb83c43450ba53cb3db13aa340e8226c
Component: engine
2014-04-18 02:53:08 +00:00
e3eecbd979 Port user tests and concurrent tests
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e2ed4b9077a46adbe3e4388166bb41969f7fb425
Component: engine
2014-04-18 02:47:39 +00:00
a4830050bf Port volumes and exit code tests
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 03993eb5340f1d520e23eac3dfe01d604fe7297f
Component: engine
2014-04-18 02:34:10 +00:00
94560a8cac Update commit test in cli
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 6beb858fb0290137c787c9728d84436461c352a0
Component: engine
2014-04-18 02:24:19 +00:00
77c1ab46b6 Port multiple attach test to cli tests
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 72f49e554f4d4345238b983d0c820e1e3320f9e5
Component: engine
2014-04-18 02:14:00 +00:00
fa56c6f0d6 Add test verify container ID
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 76a19bb3a95ef788cd889b36b0af3b79327ff431
Component: engine
2014-04-18 01:58:20 +00:00
f7be50364d Rename runtime/* to daemon/*
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 359b7df5d2af5733b8a1ea6746d062053053b23e
Component: engine
2014-04-17 14:43:01 -07:00
f3aecbde7d refactor build job to know only configFile
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: b9731bccf2b2cc8c06ef8bdb41f72ca4791e63db
Component: engine
2014-04-10 22:29:03 +00:00
ecfa4893ce Move volumesfrom to hostconfig
This also migrates the volumes from integration tests into the new cli
integration test framework.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: af9746412b6070063f105ae97eba1f8fbd56bd22
Component: engine
2014-04-08 21:45:06 +00:00
e940d2f8fa Remove restart ghost test
We do not allow ghosts anymore and this test does not add any value
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 77a04357a1b66b9e5b2bae2efc0192b927f926fe
Component: engine
2014-04-08 20:56:30 +00:00
42a6758106 Convert a legacy integration test to a clean v2 CLI integration test.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 30f22ee9e3ea1012ca663a0383c8c9c2330c52cc
Component: engine
2014-04-07 20:34:21 +00:00
bc3cbf9f38 Merge pull request #5005 from shykes/deprecate-insert
Deprecate 'docker insert'
Upstream-commit: 09aa28eca049320f53300f9d7ba9bc28c1033d3b
Component: engine
2014-04-03 17:16:25 -07:00
8e7c545689 api/server: convert TestGetInfo from an integration test to a unit test.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 2cb560988b111ee736c4ab22588d2091cb04075e
Component: engine
2014-04-04 00:02:44 +00:00
2948228586 api/server: replace an integration test with a unit test using engine mocking.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: c8f437aee0d90d4955a6aaa35f8e0b74e7ac99a3
Component: engine
2014-04-03 23:53:39 +00:00
96808698c3 Deprecate 'docker insert'
'docker insert' is an old command which predates 'docker build'. We no
longer recommend using it, it is not actively maintained, and can be
replaced with the combination of 'docker build' and 'ADD'.

This removes the command from usage and documentation, and prints a
warning when it is called.

The command still works but it will be removed in a future version.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 615ac8feb27b2b3db0c06b37ecd87b710eabffef
Component: engine
2014-04-03 23:52:09 +00:00
dd40df5fd3 Skip login tests because of external dependency to a hosted service.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 887eeb2b022a4c6d3de8c9bfc586ee82855d3cb9
Component: engine
2014-04-03 21:55:33 +00:00
42964a36b7 Allow non-privileged containers to create device nodes.
Such nodes could already be created by importing a tarball to a container; now
they can be created from within the container itself.

This gives non-privileged containers the mknod kernel capability, and modifies
their cgroup settings to allow creation of *any* node, not just whitelisted
ones.  Use of such nodes is still controlled by the existing cgroup whitelist.

Docker-DCO-1.1-Signed-off-by: Kevin Wallace <kevin@pentabarf.net> (github: kevinwallace)
Upstream-commit: c94111b61988ad32d87f99d4421cbcde018c3fb4
Component: engine
2014-04-03 18:44:13 +00:00
bf0258224f Merge pull request #4947 from tianon/sig
Allow "SIG" prefix on signal names in `docker kill` ("SIGKILL", etc)
Upstream-commit: 7ab66fa694c4be384588cfc2e6c975d325977024
Component: engine
2014-04-01 11:59:44 -07:00
a2ee3725a5 Update test to be consistent
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 7a50f03fa69fb81c27d361333fadbc9cccdd8948
Component: engine
2014-04-01 10:27:10 -07:00
e80bf0c7c4 Allow "SIG" prefix on signal names in docker kill ("SIGKILL", etc)
This way, we can use both `docker kill -s INT some_container` and `docker kill -s SIGINT some_container` and both will do nice things for us. :)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 4cb602afa0a905ceb0cccf49fe142c1c7b62087b
Component: engine
2014-04-01 11:01:07 -06:00
9772d36088 fix tests
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 185b040e49aa9ab74f8d9254c7ff86b2891e3708
Component: engine
2014-03-31 18:11:53 +00:00
8972e580e1 Merge pull request #4759 from crosbymichael/comments-in-buildfile
Strip comments before parsing line continuations
Upstream-commit: 5b9c8607d90c20282eb65b75112f09634bcba277
Component: engine
2014-03-28 11:16:32 +02:00
1861c25cbb Merge pull request #4880 from tianon/ignore-down-interfaces
Adjust TestOnlyLoopbackExistsWhenUsingDisableNetworkOption to ignore "DOWN" interfaces
Upstream-commit: 10b7ae39b95d3b4455616e35b407895ebdd55e06
Component: engine
2014-03-28 10:54:11 +02:00
85082e995b Merge pull request #4873 from crosbymichael/add-internal-symlinks
Follow symlinks inside container root for build's ADD
Upstream-commit: 45b43d85ecbffb7aa626c47ef086f09463d8f8f6
Component: engine
2014-03-27 15:46:48 -07:00
f731a44bb1 Merge pull request #4818 from viirya/fix_working_dir_not_dir
fix the problem when setting existing file as working dir
Upstream-commit: ba9f9b3c9268a1b201bcb10045da77b135d869d1
Component: engine
2014-03-27 11:41:18 -07:00
ad6fffc689 Adjust TestOnlyLoopbackExistsWhenUsingDisableNetworkOption to ignore "DOWN" interfaces
This fixes the following, which I've been seeing on all my machines for as long as I can remember:

--- FAIL: TestOnlyLoopbackExistsWhenUsingDisableNetworkOption (0.36 seconds)
	container_test.go:1597: Wrong interface count in test container: expected [*: lo], got [1: lo 2: sit0]

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: ad3e71d5c7e01dca229d4077cf8b019d8085c33a
Component: engine
2014-03-27 11:06:32 -06:00
6fd95365ed Strip comments before parsing line continuations
Fixes #3898
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 67af7b3fb0b5e40a435b434c57291cb2989275ce
Component: engine
2014-03-27 02:41:08 +00:00
1c550a00a4 Follow symlinks inside container root for build's ADD
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0fb01fd8fe376a3518b1050ab62f2b3370d62535
Component: engine
2014-03-27 02:07:35 +00:00
2ce68073b6 check if working dir is a directory and raise corresponding errors when making dir.
Docker-DCO-1.1-Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com> (github: viirya)
Upstream-commit: 293157b8b38dd5ea5fa49d90501cc3c86717da40
Component: engine
2014-03-25 17:47:08 +08:00
a7b2642223 Revert "fix failing test to use kill instead of stop"
This reverts commit 4434dcee89f7d0d0239f6b492b24e940cdbafb21.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f1bd79ec97c125148c690d66ebd3ac5ab3f388b2
Component: engine
2014-03-24 12:03:41 +00:00
c2f15d709c Merge pull request #4782 from unclejack/fix_TestCreateStartRestartStopStartKillRm
fix failing test to use kill instead of stop
Upstream-commit: 56c156190ad61765086f30367d3c362a7673ad5c
Component: engine
2014-03-20 09:10:32 -07:00
d6e39e4b66 Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 12687b7c10b6bb7e2a278ba6d1a323fe5e5f81d7
Component: engine
2014-03-19 22:03:11 +00:00
f7bce0a8cc fix failing test to use kill instead of stop
TestCreateStartRestartStopStartKillRm was failing because stop has been
changed to not kill containers.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 4434dcee89f7d0d0239f6b492b24e940cdbafb21
Component: engine
2014-03-19 23:23:45 +02:00
b5c2e757ec Merge pull request #4691 from tianon/relative-workdir
Add proper support for relative WORKDIR instructions
Upstream-commit: 47470d299da4ade08bad4338c4dba4ceffacdce7
Component: engine
2014-03-19 09:57:23 -07:00
1cf125633c Improve WORKDIR test to cover more edge cases
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c1f492755b8774005b3627da8ee001ee0b2df4eb
Component: engine
2014-03-17 19:42:13 -06:00
3865d7d383 Merge pull request #4661 from vieux/add_no_prune
Add no prune
Upstream-commit: 68dc1896804de92b8c39cfc6bd4f7c96d4abe09e
Component: engine
2014-03-17 16:07:55 -07:00
73c73fe476 Add failing test case for issue #4681
Add a failing test case for an issue where docker is not creating a loopback device if networking is dissabled.

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
Upstream-commit: 53c5b1856d91093fed1c2d3f038d227f5fdef4b8
Component: engine
2014-03-17 22:01:24 +01:00