Michael Crosby
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
Michael Crosby
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
Jason McVetta
cebebc8343
gofmt
...
Upstream-commit: 6678a26d1c94e7838c055a3da3b91ae3de8c3e3c
Component: engine
2013-09-09 15:11:30 -07:00
Solomon Hykes
aa0ad01db6
Merge builder.go into runtime.go
...
Upstream-commit: 24e02043a2672320abebc3bd5fa6a592e2ebd082
Component: engine
2013-09-06 17:33:05 -07:00
Daniel Mizyrycki
a096f499a1
testing, issue #1802 : Temporarily skip TestGetContainersTop
...
Upstream-commit: bf6e241d977f36db57c66a5b8dd056b36c0d8695
Component: engine
2013-09-04 18:20:49 -07:00
Brandon Liu
c7e2ec175d
Replace Graph.All with Graph.Map
...
Upstream-commit: 1fca99ad908c530fcd03158a56767b55500a8521
Component: engine
2013-08-31 20:44:42 -07:00
Michael Crosby
cff1278317
Add imagename to LogEvent tests
...
Upstream-commit: 7f9ba14b18e171589a82e8dd3bd084ece3405f83
Component: engine
2013-08-14 23:43:43 +00:00
Pascal Borreli
efc4a51c0c
Fixed typos
...
Upstream-commit: 9b2a5964fc2067014f24e26bd2f99873751ebdc3
Component: engine
2013-08-12 18:53:06 +01:00
Guillaume J. Charmes
1ea26ff1ae
Improve TestGetContainersTop so it does not rely on sleep
...
Upstream-commit: ceb33818cdce434281889b75c278e43b85aec647
Component: engine
2013-08-08 11:51:31 -07:00
Michael Crosby
073f998d1d
Strip leading forward slash from resource
...
Upstream-commit: d94b1860806e11038086e91c693d86a009dcd3b0
Component: engine
2013-08-06 16:09:54 +00:00
Michael Crosby
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
Michael Crosby
6ad1290069
Use mime types to parse Content-Type
...
Upstream-commit: 754ed9043d6e1fed98160c7fb443bed0a9464acf
Component: engine
2013-08-06 15:57:13 +00:00
Victor Vieux
d8352677c8
Merge branch 'master' into 1237-improve_docker_top-feature
...
Upstream-commit: 0b57e4483a13a3c4ddf0c74d531d714f199e191d
Component: engine
2013-07-30 11:51:16 +00:00
Guillaume J. Charmes
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
Victor Vieux
211bbde153
Add tests for the api
...
Upstream-commit: ed7a4236b32f3f711c183dff8b70fbef17bae2d7
Component: engine
2013-07-23 15:42:34 +00:00
Victor Vieux
37e3d486fa
add ps args to docker top
...
Upstream-commit: cfec1c3e1b88ceeca73144198df7a210ed3dc421
Component: engine
2013-07-19 10:06:32 +00:00
Solomon Hykes
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
Victor Vieux
ac70e7d7db
fix tests regarding the new test image
...
Upstream-commit: a8a6848ce0c3c54d00cfcd85727546e54a4dcf7e
Component: engine
2013-07-12 11:54:53 +00:00
Victor Vieux
c22c23bfc2
Merge branch 'master' into list_container_processes-feature
...
Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c
Component: engine
2013-07-12 11:47:27 +00:00
Solomon Hykes
6c9e32ae32
Simplify unit tests code with mkRuntime()
...
Upstream-commit: 6bdb6f226b13d5fdd47f3665c9fb753207bf473b
Component: engine
2013-07-11 17:59:25 -07:00
Solomon Hykes
b91cb2c854
Don't leave broken, commented out tests lying around.
...
Upstream-commit: 2ac11419806ce39c57d5caf6b41a66e5ddf45bc8
Component: engine
2013-07-11 17:58:45 -07:00
Guillaume J. Charmes
32424f76bf
Remove all network dependencies from the test suite
...
Upstream-commit: e43ef364cb99585d3285f51f7ab308f8a77fe09e
Component: engine
2013-07-08 15:23:04 -07:00
Victor Vieux
5824d26e27
Fix error in rmi when conflict
...
Upstream-commit: dea29e7c999b7ef76a816867a2cb75c2da658fa2
Component: engine
2013-07-05 16:58:39 +00:00
Caleb Spare
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
Caleb Spare
03f2d7e4a6
Typo correction: Excepted -> Expected'
...
Upstream-commit: dd1b9e38e95dc719a7aeadbdee67a5f3a4873dec
Component: engine
2013-07-03 14:35:18 -07:00
Louis Opter
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
Louis Opter
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
Guillaume J. Charmes
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
Victor Vieux
ab729772a8
change to top
...
Upstream-commit: 11e28842ac74ad0b706d24ec639952f78e9a147c
Component: engine
2013-07-01 15:19:42 +00:00
Victor Vieux
074020ccdd
Add test
...
Upstream-commit: 648c4f198b7215a35f31deb9cdf4d370049ef4b2
Component: engine
2013-06-28 16:27:00 +00:00
Victor Vieux
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
Andrews Medina
e593de79dc
following the 'go vet' suggestions.
...
Upstream-commit: 3d5633a0a0eb98bbd833e760279720a15ced8b58
Component: engine
2013-06-27 01:33:55 -03:00
Gabriel Monroy
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
Victor Vieux
63220aff61
use strconv.ParseBool in getBoolParam
...
Upstream-commit: da199846d2813467ab8bae629336f3989f285ce9
Component: engine
2013-06-20 14:34:58 +00:00
Victor Vieux
4147a474f5
rebase master
...
Upstream-commit: c46382ba29c82eedab2b1601da5a81a047f078c2
Component: engine
2013-06-13 17:58:06 +00:00
Solomon Hykes
9efccead8d
Merge branch '610-improve_rmi-feature'
...
* Runtime: improved image removal to garbage-collect unreferenced parents
- Runtime: fixed image removal to cleanly remove tags and repositories
Upstream-commit: 5ecfe13be9f8f47e27e5134e60d14d195a1baeaa
Component: engine
2013-06-12 20:30:07 -07:00
Victor Vieux
0a236e493a
bump to master
...
Upstream-commit: f2383151cbcc727450f87cb80a392e2858d4b0ca
Component: engine
2013-06-12 17:39:32 +00:00
Victor Vieux
604adb2ef8
* Remote Api: Add flag to enable cross domain requests
...
Upstream-commit: 20bf0e00e81fdff34c821fd880a92e822fb5ba15
Component: engine
2013-06-11 10:12:36 +00:00
Michael Crosby
2d226181f9
Add explicit status response to OPTIONS handler
...
Write the http.StatusOK header in the OPTIONS
handler and update the unit tests to refer to the
response code using the const from the http package.
Upstream-commit: ac599d652846f6456366b8028b2c38da0565d8b1
Component: engine
2013-06-10 14:44:10 -09:00
Michael Crosby
c612f1e4ee
Add Cors and OPTIONS route unit tests
...
Move creating the router and populating the
routes to a separate function outside of
ListenAndServe to allow unit tests to make
assertions on the configured routes and handler
funcs.
Upstream-commit: 0a28628c02d486512dc7e62eb54ccfd27eaa0a27
Component: engine
2013-06-10 13:02:40 -09:00
Victor Vieux
2bcee3140c
rebump
...
Upstream-commit: 66d9a733622ba9a8f9671bac7d33776981672940
Component: engine
2013-06-10 21:05:54 +00:00
Victor Vieux
83d9b24a84
bump to master
...
Upstream-commit: c906239220c7ba06b8615f001fab2f42fb063aeb
Component: engine
2013-06-05 10:23:45 +00:00
Victor Vieux
4747c5b99f
linted names
...
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
Michael Crosby
19f2b9dadf
Add flag to enable cross domain requests in Api
...
Add the -api-enable-cors flag when running docker
in daemon mode to allow CORS requests to be made to
the Remote Api. The default value is false for this
flag to not allow cross origin request to be made.
Also added a handler for OPTIONS requests the standard
for cross domain requests is to initially make an
OPTIONS request to the api.
Upstream-commit: 6d5bdff3942ce5e030b2cbd1510f418de25a1a53
Component: engine
2013-06-03 21:39:00 -04:00
Victor Vieux
db19220e91
removed auth in pull
...
Upstream-commit: 7e59b83053bceb683a198786290bc61da81581be
Component: engine
2013-06-03 17:51:52 +00:00
Guillaume J. Charmes
7c20a7a163
Update test to reflect new ApiInfo struct
...
Upstream-commit: 8243f2510e0ff0af8df18bf0febab819529106d4
Component: engine
2013-06-03 06:44:00 -07:00
Victor Vieux
a5e3ae8f4a
bump master
...
Upstream-commit: ca902b6be4cb04f3f885af750609f74effd75d3d
Component: engine
2013-06-03 12:37:51 +00:00
Victor Vieux
799ca20158
added proper returns type, move the auto-prune in v1.1 api
...
Upstream-commit: 9060b5c2f52d29dec1920eb89ee0d48341540e3b
Component: engine
2013-05-31 14:37:02 +00:00
Victor Vieux
e8420b7464
move auth to the client WIP
...
Upstream-commit: 49e656839fb3d846dc65fec544f2984a9c72a2cf
Component: engine
2013-05-30 15:39:43 +00:00
Victor Vieux
694903e92c
removed the -f
...
Upstream-commit: 2eb4e2a0b86f8d244f0b6cbeb0422f8499d834f8
Component: engine
2013-05-29 16:31:47 +00:00