Solomon Hykes and Victor Vieux
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
Solomon Hykes
cea9cd6554
gofmt
...
Upstream-commit: b00d5f018541bf141dc4732ad6d71d23b8c28b43
Component: engine
2013-11-13 19:25:55 +00:00
Solomon Hykes
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
Victor Vieux
6ba500a617
Merge pull request #2614 from dotcloud/prevent_delete_image_running_container
...
Runtime: prevent deletion if image is used by a running container
Upstream-commit: 637850063c7c218db83857e5fd01c3a472094a8d
Component: engine
2013-11-12 11:01:51 -08:00
Victor Vieux
111d9154c1
Merge branch 'tests/insert' of https://github.com/mrallen1/docker into mrallen1-tests/insert
...
Conflicts:
server.go
Upstream-commit: b314f19db8f2180292691f20f28783042b80495e
Component: engine
2013-11-12 10:19:29 -08:00
Victor Vieux
abd8707658
Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid
...
Server: always return long id's
Upstream-commit: 87c8437a900e683547278fcdd92de71ed8a866e3
Component: engine
2013-11-11 13:06:19 -08:00
Victor Vieux
fac387b017
Merge branch 'master' of https://github.com/aanand/docker into aanand-master
...
Upstream-commit: da24945070e305e09d4d96d1f981614eaa18b01f
Component: engine
2013-11-11 12:34:16 -08:00
Mark Allen
29829cd5d2
Just return the id; nothing else.
...
Upstream-commit: 62f873aa1f918fe4d303f6168f66d057e6776b18
Component: engine
2013-11-11 13:26:24 -06:00
Mark Allen
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
Sven Dowideit and ¨Sven
d772cfe673
make all image ID and container ID API responses use the Long ID ( Closes #2098 )
...
Upstream-commit: b3974abe4f01d408850e245c9b52c77f3571e0b2
Component: engine
2013-11-09 12:16:49 +10:00
Victor Vieux
edd84b853d
prevent deletion if image is used by a running container
...
Upstream-commit: 45c2b5dc1a0d8f3658f012844f9d89fbb2290c42
Component: engine
2013-11-08 15:01:01 -08:00
David Sissitka and Mark Allen
5090a5bd4b
Make "docker insert" errors obvious
...
Closes #1130
See also #1942
Upstream-commit: 5957dd909134fc3c3dc3e165b83559feb89d9f5b
Component: engine
2013-11-08 00:15:19 -06:00
Nate Jones
736f474973
bring back /images/viz, but 404 for latest
...
Upstream-commit: 8f64759881b3d48e42927ed9bdf1c9162d3c8bb3
Component: engine
2013-11-06 03:58:15 +00:00
Nate Jones
cbbaa36a2b
move "images -viz" to client
...
Upstream-commit: 2a5998baf172f94a8d6866e46207a0d7d75e70e5
Component: engine
2013-11-06 03:58:15 +00:00
Nate Jones
08d9fe490e
fix "images -a"
...
Upstream-commit: dcf0279a50e7a2eca97b205725df474a516b8f79
Component: engine
2013-11-06 03:58:15 +00:00
Nate Jones
59c6d98498
rework images JSON
...
Upstream-commit: 15867ff4308c5c1330a400be56410d404336100f
Component: engine
2013-11-06 03:58:15 +00:00
Solomon Hykes
e83abd1b63
Remove debug messages
...
Upstream-commit: 8d6df3a7e2080d4fad9743beb159f12caa0ff6f7
Component: engine
2013-11-05 23:00:20 +00:00
Solomon Hykes
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
Solomon Hykes
c3fb3fd512
Better error reporting in engine logs and unit tests
...
Upstream-commit: d3f074494a9594bc268bf4c639a7aea0934ec7c0
Component: engine
2013-11-05 23:00:20 +00:00
unclejack
9f8cb6e156
validate bind mounts on the server side
...
This changes the server side code to make sure that:
1) the source of a bind mount isn't /
The bind mount "/:/foo" isn't allowed.
2) Check that the source exists
The source to be bind mounted must exist.
This fixes issue #2070 .
Upstream-commit: 4d2ba779e1a0596c51cc6ed2ddb7c2139830f15c
Component: engine
2013-11-05 22:54:24 +02:00
Solomon Hykes
5d5633048a
Engine: optional environment variable 'Logging' in 'serveapi'
...
Upstream-commit: 02ddaad5d985186eed94dea4105a57fa21ba24db
Component: engine
2013-11-05 18:39:59 +00:00
Solomon Hykes
02af0b7684
Engine: fix a bug which caused handlers to be shared between multiple engine instances
...
Upstream-commit: 847411a1ee6e5ee5d051fc4729425215dc0c8561
Component: engine
2013-11-05 18:39:59 +00:00
Solomon Hykes
6d10998928
httpapi: don't create a pidfile if it isn't set in the configuration
...
Upstream-commit: 7b17d555992c65c6b10da21c8aa48062a1aba0d9
Component: engine
2013-11-05 18:39:59 +00:00
Solomon Hykes
26507356b3
Engine: 'start' starts the specified container
...
Upstream-commit: 958b4a8757e83c3fada757b10dd1be4ab7bff5ee
Component: engine
2013-11-05 18:39:59 +00:00
Solomon Hykes
8a182f4aaf
Separate a) initialization of the http api and b) actually serving the api into 2 distinct jobs
...
Upstream-commit: 433c8e9c7da7cd3cd952c3dce3763db70fc450e5
Component: engine
2013-11-05 17:41:37 +00:00
Victor Vieux
956deb4fe0
Merge pull request #2502 from hamo/unlink_err_v4
...
rewrite protocol check with switch-case in Server.Daemon
Upstream-commit: c5d4459a02ee98f629e65402551a871c451fb6ac
Component: engine
2013-11-04 17:46:46 -08:00
Victor Vieux
22e1fc60ec
Merge pull request #2382 from dotcloud/reflect_future_changes_search_api
...
Update docker search to reflect future changes of the api
Upstream-commit: a482bfd715c6c33603ee5fbdc27693c942dbef93
Component: engine
2013-11-04 16:14:14 -08:00
Michael Crosby
626d3f3226
Ensure container name on register
...
Upstream-commit: a9ed238bb76774c142107b3f06e8c9e9a1e59e65
Component: engine
2013-11-04 09:28:40 -08:00
Victor Vieux
cbce82a91e
Merge pull request #2457 from dotcloud/2454_do_not_split_last_column
...
RemoteAPI: Do not split last column docker top
Upstream-commit: 8f27e23b4b28406e7cde47ea74d56232c935208c
Component: engine
2013-11-01 15:21:47 -07:00
Jérôme Petazzoni and Victor Vieux
5e4f415366
Refactor HostConfig and escape apparmor confinement
...
Upstream-commit: 31638ab2ad2a5380d447780f05f7aa078c9421f5
Component: engine
2013-11-01 13:55:19 -07:00
Victor Vieux and Victor Vieux
dfa410640a
update docker search to reflect future changes of the api
...
Upstream-commit: 02b52024328996e2028d7d953ef6a9c1e2e50744
Component: engine
2013-10-31 19:14:11 -07:00
Yang Bai
1f959994cb
rewrite protocol check with switch-case in Server.Daemon
...
Upstream-commit: 7848007c3ab41b3e1d733f9235a69ec59e04ead1
Component: engine
2013-11-01 09:42:44 +08:00
Michael Crosby
fb9771da9e
Move archive.go to sub package
...
Upstream-commit: 96d1e9bb5a269936afeb9748a894f6995b17e0a4
Component: engine
2013-10-31 16:57:45 -07:00
Victor Vieux
04226c60be
Merge pull request #2494 from shykes/engine-links
...
Engine: Minimal, unintrusive implementation of a cleaner Job API.
Upstream-commit: e3c49843d70ea2856592a7af5e5d83e655898a70
Component: engine
2013-10-31 16:32:49 -07:00
Travis Cline
67b88fd430
Add flags to history, add size flag
...
Upstream-commit: 1099d172a2f083c456c3564d403e666e965a9544
Component: engine
2013-10-30 19:41:20 -05:00
Victor Vieux
d6b078e758
fix typos
...
Upstream-commit: 1c7ca51f3246baca6be75705ed932d26e20589e2
Component: engine
2013-10-30 13:18:48 -07:00
Victor Vieux
72b9b76c5a
fix remove root name and fix error messages
...
Upstream-commit: 3362aaa4df4f1aaf4832514119f0ea25b11f1a57
Component: engine
2013-10-30 11:45:11 -07:00
Victor Vieux
1f8c72b79c
do not split last column docker top
...
Upstream-commit: fb4672c52c050ce08c7432d2d149e37b0056e8f6
Component: engine
2013-10-29 19:03:41 -07:00
Michael Crosby
e141889857
Make sure only links are removed and not names
...
Upstream-commit: 7e8b2c3836fffcd1e69edfbd8873c461bda419c7
Component: engine
2013-10-28 19:19:31 -07:00
Michael Crosby
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
Solomon Hykes
b744ea13a4
Close sqlite persistent connection on SIGINT, SITERM or SIGKILL
...
Upstream-commit: 464ded79fcd46dbdf8859811912a244006626e86
Component: engine
2013-10-26 14:28:53 -07:00
Solomon Hykes
ae44c03557
Setup daemon pidfile/cleanup in Server.Daemon() instead of main()
...
Upstream-commit: c1ae1a0e1cfae1aed681add5b1cb1c39e2c0e929
Component: engine
2013-10-26 14:26:07 -07:00
Solomon Hykes
8363dd13c7
Rename ConfigGetenv to ConfigFromJob
...
Upstream-commit: c542b2f873f181d7cb3127b4700a01bd62f43fbf
Component: engine
2013-10-26 14:24:25 -07:00
Solomon Hykes
b6319ac31a
Rename 'GraphPath' to the more logical 'Root'. This does not affect users except for a slight text change in the usage messge
...
Upstream-commit: 7e691e11b033f35fe823fbc6dcb40decd584696d
Component: engine
2013-10-26 14:24:13 -07:00
Solomon Hykes
ff1fcc1bf9
Engine: centralize checks for supported architectures and kernel versions
...
Upstream-commit: 1b8eef4efbdd308f0dff0ae063ea49c0f4142888
Component: engine
2013-10-26 14:21:04 -07:00
Solomon Hykes
2bbe323db0
Minimal, unintrusive implementation of a cleaner Job API.
...
* Implement a new package: engine. It exposes a useful but minimalist job API.
* Refactor main() to instanciate an Engine instead of a Server directly.
* Refactor server.go to register an engine job.
This is the smallest possible refactor which can include the new Engine design
into master. More gradual refactoring will follow.
Upstream-commit: 0d1a825137448e2f41e5aaa5ecae8094c8ab6817
Component: engine
2013-10-26 14:18:13 -07:00
Victor Vieux
22a371d221
prevent default name to be deleted and return an error on invalid link
...
Upstream-commit: 516cf548433ca17098533110fffc1998c7114e2e
Component: engine
2013-10-25 16:49:49 -07:00
Michael Crosby and Victor Vieux
3f2eaa1c43
Use persistent connection for links database
...
Add close method to Runtime and Server to make sure
that any underlying connections are cleaned up
Upstream-commit: 7c08aeeba4ab94f77e221bfc01741cce0866d224
Component: engine
2013-10-25 15:13:25 -07:00
Victor Vieux
1ea9ba1de7
fix merge issue and gofmt
...
Upstream-commit: 89fb51f6063467124c8883399fc293faae8d8ef5
Component: engine
2013-10-25 15:13:25 -07:00
Michael Crosby and Victor Vieux
952ac8a789
Add links for container relationships and introspection
...
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00