Commit Graph

104 Commits

Author SHA1 Message Date
5e4f415366 Refactor HostConfig and escape apparmor confinement
Upstream-commit: 31638ab2ad2a5380d447780f05f7aa078c9421f5
Component: engine
2013-11-01 13:55:19 -07:00
7ce1e20657 Add -name for docker run
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
Upstream-commit: 0d2924408bad7aa797bfaf0610e836d82928296f
Component: engine
2013-10-28 18:09:08 -07:00
952ac8a789 Add links for container relationships and introspection
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
74017d1538 swap cat by top to prevent 2 warnings
Upstream-commit: 0e021ed470a1014bb924ad7067d85540f8f1e71a
Component: engine
2013-10-24 15:06:10 -07:00
fbbaaa37c7 Fix attach race condition, improve unit tests, make sure the container is started before unblocking Start
Upstream-commit: 3e014aa6624bdc3411bb6f5bc2c297e45a47ad68
Component: engine
2013-10-18 16:26:16 -07:00
b3613b29c9 Fix issue killing container while sending signal
Fix rebase issue
Update docs
Upstream-commit: 333bc23f21e8423d3085632db99a6d1df227c5f1
Component: engine
2013-10-18 16:19:27 -07:00
21aae43f3a Increase readbility of unit tests by using mkRuntime everywhere
Upstream-commit: 07d9e4353bc199db7abb52b4b4bba1c2feb75c1a
Component: engine
2013-10-18 07:20:39 +00:00
06ac81c4b1 Hack: don't run integration tests in /var/lib/docker/unit-tests; add missing cleanups in a few tests
Upstream-commit: 240d5b3fa1b66f099b71c20ff8dc4ed1ecffc1d3
Component: engine
2013-10-18 02:13:36 +00:00
410e5fb77b api.go:108 Error parsing media type: error: mime: no media type
fix
Upstream-commit: 104a86936ab2611d6e8e54f5ef686f2e9d231bcf
Component: engine
2013-10-16 19:32:03 +00:00
593a4ad4b2 use httpError in a separate test
Upstream-commit: df697b4318f533556a2e9351d5995b2d1991ae5a
Component: engine
2013-10-16 19:23:47 +00:00
f9de2ea5c3 Merge pull request #1842 from dotcloud/split_stdout_stderr
* Runtime: Split stdout stderr
Upstream-commit: f435970695e896ae8532cd0850700ae56d0b0516
Component: engine
2013-09-26 18:05:24 -07:00
c6a1c7cdae Update docs + fix endian issue
Upstream-commit: cb18a6e1b934b7f5c63f8931ee8fe51e2789c597
Component: engine
2013-09-26 17:36:21 -07:00
eac5eb816d Make StdCopy works with huge amount of data
Upstream-commit: e854b7b2e6666d8b47f2c9714ac3bef2320fc40b
Component: engine
2013-09-11 14:49:33 -07:00
72e85e9acd Add stderr unit test
Upstream-commit: 289350e63397bf918fbd75726a6e06f0fe49b81b
Component: engine
2013-09-11 14:48:22 -07:00
66b0c6b946 Split stdout stderr for non-tty commands
Upstream-commit: 8ae5348a51ab6026db29009f109bb3724908f0aa
Component: engine
2013-09-11 14:48:22 -07:00
97c0d31d6a Merge pull request #1838 from jmcvetta/multiline_dockerfile
Implementation of multiline syntax for Dockerfile
Upstream-commit: bd0e4fde9a2a1fb1f676e7ea19e111be46cb87c8
Component: engine
2013-09-10 14:22:34 -07:00
0d8ea16762 Merge pull request #1759 from bdon/graph-map
Minor refactor of Graph; replace uses of Graph.All (slice) with Graph.Map (map)
Upstream-commit: ad152efbed6ddb74a352c39147bae9b0e8c87435
Component: engine
2013-09-10 08:49:11 -07:00
cebebc8343 gofmt
Upstream-commit: 6678a26d1c94e7838c055a3da3b91ae3de8c3e3c
Component: engine
2013-09-09 15:11:30 -07:00
aa0ad01db6 Merge builder.go into runtime.go
Upstream-commit: 24e02043a2672320abebc3bd5fa6a592e2ebd082
Component: engine
2013-09-06 17:33:05 -07:00
a096f499a1 testing, issue #1802: Temporarily skip TestGetContainersTop
Upstream-commit: bf6e241d977f36db57c66a5b8dd056b36c0d8695
Component: engine
2013-09-04 18:20:49 -07:00
c7e2ec175d Replace Graph.All with Graph.Map
Upstream-commit: 1fca99ad908c530fcd03158a56767b55500a8521
Component: engine
2013-08-31 20:44:42 -07:00
cff1278317 Add imagename to LogEvent tests
Upstream-commit: 7f9ba14b18e171589a82e8dd3bd084ece3405f83
Component: engine
2013-08-14 23:43:43 +00:00
efc4a51c0c Fixed typos
Upstream-commit: 9b2a5964fc2067014f24e26bd2f99873751ebdc3
Component: engine
2013-08-12 18:53:06 +01:00
1ea26ff1ae Improve TestGetContainersTop so it does not rely on sleep
Upstream-commit: ceb33818cdce434281889b75c278e43b85aec647
Component: engine
2013-08-08 11:51:31 -07:00
073f998d1d Strip leading forward slash from resource
Upstream-commit: d94b1860806e11038086e91c693d86a009dcd3b0
Component: engine
2013-08-06 16:09:54 +00:00
3ea6442a29 Add cp command and copy api endpoint
The cp command and copy api endpoint allows users
to copy files and or folders from a containers filesystem.

Closes #382
Upstream-commit: 5b8cfbe15c29efd3e72ea97ba87867590aeeba25
Component: engine
2013-08-06 16:09:54 +00:00
6ad1290069 Use mime types to parse Content-Type
Upstream-commit: 754ed9043d6e1fed98160c7fb443bed0a9464acf
Component: engine
2013-08-06 15:57:13 +00:00
d8352677c8 Merge branch 'master' into 1237-improve_docker_top-feature
Upstream-commit: 0b57e4483a13a3c4ddf0c74d531d714f199e191d
Component: engine
2013-07-30 11:51:16 +00:00
4350e3145d Fixes #505 - Make sure all output is send on the network before closing
Upstream-commit: fd9ad1a19469d07944ca9b417861d63ecec2ef42
Component: engine
2013-07-24 15:48:51 -07:00
211bbde153 Add tests for the api
Upstream-commit: ed7a4236b32f3f711c183dff8b70fbef17bae2d7
Component: engine
2013-07-23 15:42:34 +00:00
37e3d486fa add ps args to docker top
Upstream-commit: cfec1c3e1b88ceeca73144198df7a210ed3dc421
Component: engine
2013-07-19 10:06:32 +00:00
3cd7f4b75d Merge pull request #1195 from dotcloud/tests-cleanup
* Hack: tests cleanup
Upstream-commit: 2cbf2200ac7ba7e3ae79ed8a85a3cfcdf1026efd
Component: engine
2013-07-12 14:51:59 -07:00
ac70e7d7db fix tests regarding the new test image
Upstream-commit: a8a6848ce0c3c54d00cfcd85727546e54a4dcf7e
Component: engine
2013-07-12 11:54:53 +00:00
c22c23bfc2 Merge branch 'master' into list_container_processes-feature
Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c
Component: engine
2013-07-12 11:47:27 +00:00
6c9e32ae32 Simplify unit tests code with mkRuntime()
Upstream-commit: 6bdb6f226b13d5fdd47f3665c9fb753207bf473b
Component: engine
2013-07-11 17:59:25 -07:00
b91cb2c854 Don't leave broken, commented out tests lying around.
Upstream-commit: 2ac11419806ce39c57d5caf6b41a66e5ddf45bc8
Component: engine
2013-07-11 17:58:45 -07:00
32424f76bf Remove all network dependencies from the test suite
Upstream-commit: e43ef364cb99585d3285f51f7ab308f8a77fe09e
Component: engine
2013-07-08 15:23:04 -07:00
5824d26e27 Fix error in rmi when conflict
Upstream-commit: dea29e7c999b7ef76a816867a2cb75c2da658fa2
Component: engine
2013-07-05 16:58:39 +00:00
1c71d0a65e Implement several golint suggestions, including:
* Removing type declarations where they're inferred
* Changing Url -> URL, Id -> ID in names
* Fixing snake-case names
Upstream-commit: 19121c16d9514b391ce8f15aeff3c47c1ea5a841
Component: engine
2013-07-03 14:36:04 -07:00
03f2d7e4a6 Typo correction: Excepted -> Expected'
Upstream-commit: dd1b9e38e95dc719a7aeadbdee67a5f3a4873dec
Component: engine
2013-07-03 14:35:18 -07:00
40f3d8b8b8 More unit test fixes
- Fix TestGetImagesJSON when there is more than one image in the test
  repository;
- Remove an hardcoded constant use in TestGetImagesByName;
- Wait in a loop in TestKillDifferentUser;
- Use env instead of /usr/bin/env in TestEnv;
- Create a daemon user in contrib/mkimage-unittest.sh.
Upstream-commit: f03c1b8eeb367beefa91046e2fa114af9a816aaa
Component: engine
2013-07-01 17:24:21 -07:00
18ad40a645 Fix TestGetInfo when there is more than one image in the test repository
See also #1089, #1072.
Upstream-commit: 6dacbb451f1134ca1c215bd86b74006934468922
Component: engine
2013-07-01 15:06:08 -07:00
4fd8f2839f Fix unit tests when there is more than one tag within the test image
Upstream-commit: b6f288a1cedbbff7dd24362f2fc2bce0040bfe10
Component: engine
2013-07-01 11:45:45 -07:00
ab729772a8 change to top
Upstream-commit: 11e28842ac74ad0b706d24ec639952f78e9a147c
Component: engine
2013-07-01 15:19:42 +00:00
074020ccdd Add test
Upstream-commit: 648c4f198b7215a35f31deb9cdf4d370049ef4b2
Component: engine
2013-06-28 16:27:00 +00:00
ad4f82e6d2 Merge pull request #1032 from andrewsmedina/govet
following the 'go vet' suggestions for the docker package.
Upstream-commit: a11fc9f067d898e3dd6a43e9841e2ea85842af2b
Component: engine
2013-06-28 05:27:53 -07:00
e593de79dc following the 'go vet' suggestions.
Upstream-commit: 3d5633a0a0eb98bbd833e760279720a15ced8b58
Component: engine
2013-06-27 01:33:55 -03:00
a223caa9e6 + Runtime: mount volumes from a host directory with 'docker run -b'
Upstream-commit: 4fdf11b2e62bf7d785a958afd4fc5b8cfc32f621
Component: engine
2013-06-26 15:07:31 -07:00
63220aff61 use strconv.ParseBool in getBoolParam
Upstream-commit: da199846d2813467ab8bae629336f3989f285ce9
Component: engine
2013-06-20 14:34:58 +00:00
4147a474f5 rebase master
Upstream-commit: c46382ba29c82eedab2b1601da5a81a047f078c2
Component: engine
2013-06-13 17:58:06 +00:00