Commit Graph

290 Commits

Author SHA1 Message Date
70ceedcf64 Fix for #3345: Add Content-Type Header "application/json" to GET /version and /info responses in remote API
Docker-DCO-1.0-Signed-off-by: Manuel Woelker <github@manuel.woelker.org> (github: manuel-woelker)
Upstream-commit: 53a01aebd61e8db34c9106f5b2c5fdad6909caee
Component: engine
2014-01-08 09:17:20 +01:00
60759a8d1a Move utility package 'systemd' to pkg/systemd
Upstream-commit: 8e7db0432e21adb3a753188d5321ce1165fa8964
Component: engine
2013-12-23 23:07:01 +00:00
e18bf01fe0 Merge pull request #3099 from vieux/fix_pull_build
added authConfig to docker build
Upstream-commit: b3ad3307829dc4601cb996be3d6d8cfa37e71c79
Component: engine
2013-12-16 10:53:10 -08:00
77daf141f4 move docker info to the job api
Upstream-commit: 51e2c1794b50295607c6eddb29edf39d40816a88
Component: engine
2013-12-13 16:15:15 -08:00
f8c4f98d81 use args
Upstream-commit: 4b5ceb0f24285718620465bb4073269d6fb8097b
Component: engine
2013-12-13 14:29:27 -08:00
3eb9010924 move commit to job
Upstream-commit: 930ec9f52ceceabcb72589ac7f20e1e8bbccbed5
Component: engine
2013-12-13 14:19:56 -08:00
3c2d9ba7fe Merge pull request #3175 from vieux/engine-job-stop
Move stop to job
Upstream-commit: aaa1c48d243e693b29bc52e382e3c37637c8bc3c
Component: engine
2013-12-13 14:15:58 -08:00
9575d9c5e7 move resize to job
Upstream-commit: 73e8a39ff219833ebb28c12dc318466e3551b5bd
Component: engine
2013-12-13 13:15:39 -08:00
07befa45fc move tag to job
Upstream-commit: e43ff2f6f2630f971c9494aed285f1d410e42df9
Component: engine
2013-12-12 11:52:11 -08:00
c49a4958ea move t from arg to env
Upstream-commit: 6ba456ff87cfe2687db7df896e2983636ca9fe1e
Component: engine
2013-12-11 15:36:50 -08:00
342605f90e Engine: new command 'stop' gracefully stops a container.
Upstream-commit: dbe1915fee1beb034459fb875928c96e27ecbfce
Component: engine
2013-12-11 11:52:59 -08:00
5cde259caa Merge pull request #2735 from shykes/engine-job-kill
New engine command: 'kill'
Upstream-commit: 5fd3c8204de3a8188097add6a75ca70536e1375a
Component: engine
2013-12-11 10:35:57 -08:00
f1ea4ce449 Merge pull request #3113 from shykes/engine-export
Move 'docker export' to the engine API
Upstream-commit: 0025e9bd719b1cd8314543019ed8e6f6bc5c57cd
Component: engine
2013-12-10 13:28:24 -08:00
8644761a3b Merge pull request #3119 from shykes/engine-version
Port 'docker version' to the engine API
Upstream-commit: 09d2c2351c4b016d57f979990698838a94173ec4
Component: engine
2013-12-09 17:35:44 -08:00
47be100499 refactor and fix tests
Upstream-commit: 8291f00a0e656cf3bb52fb1dcdff7c266305f4d5
Component: engine
2013-12-09 16:25:19 -08:00
707fb0bfad Port 'docker version' to the engine API
Upstream-commit: de35b346d17ef86ef091e1736575c60c41fc3771
Component: engine
2013-12-08 07:41:53 +00:00
34b1795f6e Engine: 'export' returns a raw archive of a container's filesystem
Upstream-commit: 9656cdf0c248fda629fe9f13cf4ce4d3fabd35a4
Component: engine
2013-12-08 01:33:37 +00:00
d007e15eed New engine command: 'wait'
Upstream-commit: 3569d080afc721a1eb04ad4a65f1309b53da1238
Component: engine
2013-12-06 23:05:21 +00:00
18f68039b6 Engine: new command 'kill' sends a signal to a running container
Upstream-commit: fdb3de7b11e4b85ec86f76aad51290730c037668
Component: engine
2013-12-06 23:02:27 +00:00
e34a28d653 added authConfig to docker build
Upstream-commit: 228091c79ed043d1896afb04cd0573ee972c2607
Component: engine
2013-12-06 14:27:10 -08:00
9684769cb6 sd_notify ready status when accepting API requests
Upstream-commit: 97088ebef7c638f8175d7c61934642eeb2c054c4
Component: engine
2013-12-04 17:50:20 -08:00
991a112d99 Merge pull request #2967 from crosbymichael/return-host-config
Add hostconfig to container inspect
Upstream-commit: 944c1f10eadd98a8044cd869e81badd897f96f1f
Component: engine
2013-12-04 16:50:42 -08:00
8eac8d89db remove unused parameter in Download
Upstream-commit: 12180948be8040a4cdf99a0e660098cd33e32832
Component: engine
2013-12-04 11:54:11 -08:00
dadb586d63 Expose expvar endpoint during debugging.
Fixes #3017
Upstream-commit: 6a55169e2e0d039f7404b236b321fa7c76b99618
Component: engine
2013-12-03 13:04:18 -05:00
f8ae708f7f Add hostconfig to container inspect
Upstream-commit: c4c90e9cec1b3f3cc5aa652e4e9155f6a2e687aa
Component: engine
2013-12-02 18:06:04 -08:00
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