Commit Graph

265 Commits

Author SHA1 Message Date
3412149ffe Do not format at each write but use a Writer instead (build)
Upstream-commit: de4429f70d51056c3ec32072f3f18898e36171b3
Component: engine
2013-12-02 11:43:41 -08:00
fe4ba516d1 Bump api version and update docs
Upstream-commit: e4cb83c50e554bfd8ae3e0a1f2be4f0fb661861d
Component: engine
2013-12-02 19:27:28 +01:00
85e4b81e0c Make docker build return exit code of build step
If a command during build fails, `docker build` now returns with
the exit code of that command.

This makes it necessary to change the build api endpoint to
return a json object stream.
Upstream-commit: b04c6466cdc89a107879af7a22b0917006b38730
Component: engine
2013-12-02 17:52:37 +01:00
b0f24a88da Engine: integer job status, improved stream API
* Jobs return an integer status instead of a string
* Status convention mimics unix process execution: 0=success, 1=generic error, 127="no such command"
* Stdout and Stderr support multiple thread-safe data receivers and ring buffer filtering
Upstream-commit: a4f8a2494b0fb755db52c68cf61ddc8ff52d2965
Component: engine
2013-11-30 00:25:46 +00:00
798ad27de8 Wire in pprof handlers.
Based on http://stackoverflow.com/questions/19591065/profiling-go-web-application-built-with-gorillas-mux-with-net-http-pprof
Upstream-commit: 9f46779d42c9b90a70c3c434d03a4502070e1b6d
Component: engine
2013-11-28 13:46:58 -05:00
f0926e8de2 Fix data race in TestLogEvent
Found with -race. Improve locking on Server.
Upstream-commit: abfdaca3f86d7951693697fbd849078d6b406478
Component: engine
2013-11-25 14:17:58 -05:00
10c7f84432 Allow images to be saved and loaded by id and repository
Upstream-commit: fd7ab143bf1ecfbf20df90edd876f73dc28c264d
Component: engine
2013-11-20 17:28:19 -08:00
afc3ae3564 Merge pull request #2723 from SvenDowideit/doc-build-image
Use the work Path for docker cp CONTAINER:PATH
Upstream-commit: 2bc35287a080cd9a9805e343595055dcbfb0db01
Component: engine
2013-11-20 11:10:13 -08:00
b7d4ec1f01 Adding content type to images/(name)/get
Upstream-commit: 1211065c8d81fcc480ddea5d377982cab871d472
Component: engine
2013-11-20 03:52:33 +00:00
390195822f Offline Image Transfers #1155
Upstream-commit: 7eaa59f626fa9e9b3bf61d3d7eff0fb70b3d011a
Component: engine
2013-11-20 03:52:33 +00:00
00e4f0c411 don't import emport empty hostconfig
Upstream-commit: 0169cf15dd272f0403909a9be64fd1b575396ffc
Component: engine
2013-11-19 18:28:50 -08:00
6e0c243c2e Lintify code with confidence=1
Upstream-commit: 5e941f1ca035bb1ec014c18d277aecaa41deba85
Component: engine
2013-11-18 16:24:11 -08:00
bc3e877db3 expunge the word 'Resource' in reference to a file/dir in a CONTAINER - that way users don't wonder how its different from a Path
Upstream-commit: 27159ce6bac4308b5fba311258fab8e852667787
Component: engine
2013-11-16 20:15:04 +10:00
b91918adb1 Merge pull request #2694 from shykes/separate-integration-tests
Separate integration tests
Upstream-commit: 51576069ad7470d308402536306c35f47cf89edb
Component: engine
2013-11-15 18:21:34 -08:00
d641b4b09e Fix the brittle errorstring-to-httperror recognition code which in turn is required by autopull (the client issues a pull if container creation returns 404)
Upstream-commit: 693ff4d2ae5f0d723469340f67bb55f7aa3e824b
Component: engine
2013-11-14 23:54:28 +00:00
6c1679864e Move integration tests to integration/, expose missing public methods in the core
Upstream-commit: 359a6f49b9ec704686d0cb0df7cb0d7c8d5f55a7
Component: engine
2013-11-14 10:50:00 -08:00
a48718c85a Merge branch 'job-create-start-clean' into engine-patch-2
Conflicts:
	engine/engine.go
	engine/job.go
	server.go
	utils_test.go
Upstream-commit: 6c4393ccbbec0fa66f9fc7e326b5a2809615c3a1
Component: engine
2013-11-13 00:36:20 +00:00
9fcdb45469 Edits after code review
Return long image ID
Return streamformatted error or "raw" error
Upstream-commit: 8cc19765b48d1a429b840b731ed5fd5b81fbda3c
Component: engine
2013-11-10 00:06:55 -06:00
5090a5bd4b Make "docker insert" errors obvious
Closes #1130
See also #1942
Upstream-commit: 5957dd909134fc3c3dc3e165b83559feb89d9f5b
Component: engine
2013-11-08 00:15:19 -06:00
736f474973 bring back /images/viz, but 404 for latest
Upstream-commit: 8f64759881b3d48e42927ed9bdf1c9162d3c8bb3
Component: engine
2013-11-06 03:58:15 +00:00
cbbaa36a2b move "images -viz" to client
Upstream-commit: 2a5998baf172f94a8d6866e46207a0d7d75e70e5
Component: engine
2013-11-06 03:58:15 +00:00
b5c0cbf917 bump api version and ensure backward compat
Upstream-commit: d7928b9a673e9b2aff36fa6961481312455c91f4
Component: engine
2013-11-06 03:58:15 +00:00
e6df3df72c Engine: 'create' creates a container and prints its ID on stdout
Upstream-commit: e5f8ab6160401fb541121da5b5cbc3af4fce28b7
Component: engine
2013-11-05 23:00:20 +00:00
53c37bc88e Engine: fix a bug when encoding a job environment to json
Upstream-commit: 434f06d03dc2825cb4f348a88ddc6d1aa17ea19c
Component: engine
2013-11-05 23:00:20 +00:00
26507356b3 Engine: 'start' starts the specified container
Upstream-commit: 958b4a8757e83c3fada757b10dd1be4ab7bff5ee
Component: engine
2013-11-05 18:39:59 +00:00
062afa9bce Merge pull request #2427 from thequux/send-headers-immediately
Make /events API send headers immediately
Upstream-commit: 2a0efb23243f2e72e61efa51ceaafa58353cf21b
Component: engine
2013-11-04 08:49:27 -08:00
ee347d7b68 Added explicit Flush method to utils.WriteFlusher
Upstream-commit: a963ff5d8df4e6d0e42dd669d3d60aafb8f880a7
Component: engine
2013-11-01 13:11:21 -04:00
fb9771da9e Move archive.go to sub package
Upstream-commit: 96d1e9bb5a269936afeb9748a894f6995b17e0a4
Component: engine
2013-10-31 16:57:45 -07:00
77b94a8b61 Make /events API send headers immediately
Go's net/http API does not send headers until the first call to
ResponseWriter.Write().  Ordinarily, this is fine, because in most
cases, responses are returned immediately.  However, for the events
API, nothing is written until some event is sent, which causes
timeouts and/or hangs in some HTTP client APIs, which wait for headers
before returning from the "make request" call.
Upstream-commit: dd9f4524d1a829a394f5d96da0c1e6338c476019
Component: engine
2013-10-28 21:39:21 -04: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
83a034fdc4 no more name encoding
Upstream-commit: 256b7537e332c68d0fa35b60e06726c40ed66312
Component: engine
2013-10-25 15:13:25 -07:00
3673acf131 replace == by HasPrefix for names and improve error message
Upstream-commit: c4923757f1f92c160a34d0a591f6e62d8d94dea3
Component: engine
2013-10-25 15:13:25 -07:00
dab2931cd1 Updated fixes post rebase from master
Removed test cases that are no longer
applicable with links and the port changes.
Remove test case where a test was hitting an
external ip.
Upstream-commit: 0e24db3a68cabed1ff8cf8dd10854c5de201329f
Component: engine
2013-10-25 15:13:24 -07:00
952ac8a789 Add links for container relationships and introspection
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -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
02bbabf14d Add -nostdin and -proxy to docker attach, allow arbirary signal to be sent via docker kill api endpoint
Allow attach from `docker start`
Add host integration script generation
Update doc with host integration
Upstream-commit: 4918769b1ac2d38f23087b766140e6a7f8979310
Component: engine
2013-10-18 16:16:29 -07:00
9ff0513e0d change an errorf to a debugf
Upstream-commit: 3acfc600285dedd2e10a3780e041af0cc39675a7
Component: engine
2013-10-16 19:45:10 +00:00
609dfc2138 remove false alarm error
Upstream-commit: 0e64a4d7e7d5dd7c68ecc1df9fe8234938f12026
Component: engine
2013-10-16 19:38:12 +00:00
bedabb5a87 Merge pull request #1943 from dotcloud/1940-prevent_crash_parseNat_build-fix
Abort build if mergeConfig returns an error and fix duplicate error message
Upstream-commit: 4196c704f052687e8b9010f0e407f66417c55d04
Component: engine
2013-10-15 17:40:48 -07:00
b2ba4dc1a1 Initial steps to fix Issue #936
Use utils.Errorf instead of utils.Debugf
Upstream-commit: ad723bbfe7cda7839b3c7f82e63699bf2b9c4911
Component: engine
2013-10-11 08:04:40 -05: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
721615e4c7 abord build if mergeConfig returns an error and fix duplicate error message
Upstream-commit: 5bd0437eedf8036b9648dd095b22d0772fa47e4d
Component: engine
2013-09-20 12:46:24 +00:00
ea104a3973 Merge pull request #1894 from dotcloud/1891-remove_useless_warnings
Don't show network related warnings when networking is disabled
Upstream-commit: 8d481193407e8aa4b91c68a525839bb3556b06d0
Component: engine
2013-09-16 13:48:17 -07:00
6deb994c66 Merge pull request #1849 from dotcloud/better_handle_hostConfig
Improved hostConfig reload
Upstream-commit: 45b50730e39ed5badad0a320e2163924117bdd71
Component: engine
2013-09-16 10:48:53 -07:00
613224b496 Don't show network related warnings when networking is disabled
Upstream-commit: 40eaa82fc617a474b1325ac22bd1299d3c0e3d48
Component: engine
2013-09-16 15:58:44 +00:00
efc88e6663 Add rm option to docker build to remove intermediate containers
Upstream-commit: b7a3fc687ec55b68ee0cadf78d7f1eff3e531fbd
Component: engine
2013-09-12 16:55:36 +00:00
a21e18e65f Add documentation
Upstream-commit: 082d142024e69a817ed96772ee3057bbdeaa8d7d
Component: engine
2013-09-11 15:41:44 -07:00
eac5eb816d Make StdCopy works with huge amount of data
Upstream-commit: e854b7b2e6666d8b47f2c9714ac3bef2320fc40b
Component: engine
2013-09-11 14:49:33 -07:00
2d267aa7ec Fixed a bug I created when rebasing.
Upstream-commit: 71d46eaf029fcc49edade5e7a967909d57e5c723
Component: engine
2013-09-11 01:39:55 -07:00
da3c9e0ef2 Replaced leading spaces with tabs. Again.
Upstream-commit: f4ba0d42675a4085dfe96543a9265d9caf6b5e85
Component: engine
2013-09-11 01:28:20 -07:00