Paul Nasrat
bdfe8ed403
Remove incorrect SIGKILL handler.
...
As per POSIX signal handling SIGKILL does not work.
Fixes #2928
2013-11-28 10:42:06 -05:00
Danny Yates
d1a631cedb
Only tag the top-most layer, not all interim layers
2013-11-27 22:00:58 +00:00
Paul Nasrat
4e826e99b2
Performance of deleteImageAndChildren.
...
Don't walk the file system for parents each time we recurse.
Fixes #2852
2013-11-27 12:55:15 -05:00
Danny Yates
788feab3a7
Handle the case where poolAdd() gives an error for an unknown pool type
2013-11-27 16:53:36 +00:00
Danny Yates
ae474e05f5
Allow multiple clients to pull the same tag simultaneously
...
If two clients simultaneously try to pull the same tag, there was a race
whereby one would succeed and the second would generate an error. Now,
the second simply waits for the first to complete.
2013-11-27 12:18:01 +00:00
Guillaume J. Charmes
19df6c32c0
Merge branch 'master' into use_utc_time
...
Conflicts:
image.go
2013-11-25 19:01:13 -08:00
Solomon Hykes
1d903da6fd
Merge pull request #2609 from shykes/0.6.5-dm-plugin
...
Move aufs to a storage driver, add devicemapper and dummy drivers
2013-11-25 18:58:26 -08:00
Paul Nasrat
abfdaca3f8
Fix data race in TestLogEvent
...
Found with -race. Improve locking on Server.
2013-11-25 14:17:58 -05:00
Michael Crosby
e69bbd239e
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-22 14:06:59 -08:00
Michael Crosby
d4c8fb9ee2
Merge pull request #2769 from vbatts/none_bridge
...
Do not setup bridge ip if 'none' bridge is provided
2013-11-22 11:48:33 -08:00
Michael Crosby
0cecc2a78c
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
image.go
2013-11-21 17:18:41 -08:00
Guillaume J. Charmes
806abe90ba
Use UTC for time
2013-11-21 16:43:36 -08:00
Michael Crosby
25e443a3c7
Merge pull request #2798 from dotcloud/fix_state_race
...
Refactor State to be 100% thread safe
2013-11-21 16:39:50 -08:00
Guillaume J. Charmes
33e70864a2
Refactor State to be 100% thread safe
2013-11-21 16:34:58 -08:00
Michael Crosby
d6e6214d37
Merge pull request #2678 from cxmcc/minor
...
Minor code simplification for Containers api
2013-11-21 16:27:15 -08:00
Michael Crosby
70f1bd3104
Merge pull request #2488 from viirya/fix_container_volumes_delete
...
Skip the volumes mounted when deleting the volumes of container.
2013-11-21 16:20:22 -08:00
Guillaume J. Charmes
42c23b0f04
Merge pull request #2763 from dotcloud/use_full_id_delete
...
Do ont truncate ID on docker rmi
2013-11-21 14:39:38 -08:00
Paul Morie
3f17844b6e
Fix typo in pullImage
2013-11-21 17:29:03 -05:00
Michael Crosby
253214f07d
Update ImageExport after merge fail
2013-11-21 10:26:21 -08:00
Michael Crosby
a2c9d2da93
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-21 10:21:30 -08:00
Michael Crosby
fd7ab143bf
Allow images to be saved and loaded by id and repository
2013-11-20 17:28:19 -08:00
Victor Vieux
8a756f417e
wait on pull already in progress
2013-11-20 14:04:19 -08:00
Michael Crosby
2382a0f920
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
server.go
2013-11-20 11:07:42 -08:00
Guillaume J. Charmes
b4f7078a02
Merge pull request #2773 from dotcloud/speed_up_docker_ps
...
speedup docker ps
2013-11-20 10:40:03 -08:00
Vincent Batts
60cb5f1a34
do not setup bridge ip if bridgeNetwork is nil. This is the case when
...
-b='none' bridge is provided.
issue #2768
https://bugzilla.redhat.com/show_bug.cgi?id=1032094
2013-11-20 09:36:38 -05:00
Michael Crosby
9de4590498
Add typo in remove all. Ensure tmpDir is removed
2013-11-20 03:52:33 +00:00
Michael Crosby
0ef6fed5c7
Fix error checks for offline transfer and remove unneeded debug output
2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
844c13bce6
Fixing build
2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
6014db4a7e
Setting offline package version to 1.0
2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
61a8020e51
Adding version info, switching to defer for cleanup
2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
7eaa59f626
Offline Image Transfers #1155
2013-11-20 03:52:33 +00:00
Guillaume J. Charmes
28d4cbbc59
Merge branch 'master' into creack-merge-master
...
Conflicts:
api_params.go
graph.go
graph_test.go
image.go
integration/api_test.go
integration/container_test.go
integration/runtime_test.go
runtime.go
2013-11-19 14:58:12 -08:00
Victor Vieux
145c2008ae
speedup docker ps
2013-11-19 11:02:10 -08:00
Victor Vieux
2fe4467d73
Do ont truncate ID on docker rmi
2013-11-18 18:39:02 -08:00
Guillaume J. Charmes
5e941f1ca0
Lintify code with confidence=1
2013-11-18 16:24:11 -08:00
Victor Vieux
f946a486ea
Merge pull request #2718 from dotcloud/fix_tmp_dir_never_cleanup
...
Fix tmp dir never cleanup
2013-11-18 12:20:23 -08:00
Victor Vieux
9261690593
Fix tmp dir never cleanup
2013-11-15 16:23:55 -08:00
Guillaume J. Charmes
cbd1281ec9
rename gograph in graphdb
2013-11-15 15:55:45 -08:00
Alexander Larsson
243843c078
Print devicemapper status details in docker info
...
This adds a generic Status call in the Driver api and
implements if for the devicemapper backend.
The status is an array of key/value strings rather than a map so that
we can guarantee some static order of the docker info output.
2013-11-15 11:04:02 +01:00
Alexander Larsson
062810caed
Show active driver in docker info output
2013-11-15 10:24:48 +01:00
Guillaume J. Charmes
7cf60da388
Merge branch 'master' into shykes-0.6.5-dm-plugin
...
Conflicts:
utils.go
utils_test.go
2013-11-14 14:02:44 -08:00
Solomon Hykes
359a6f49b9
Move integration tests to integration/, expose missing public methods in the core
2013-11-14 10:50:00 -08:00
Solomon Hykes
b00d5f0185
gofmt
2013-11-13 19:25:55 +00:00
Xiuming Chen
0013aa7d9f
Minor code simplification for Containers api
2013-11-13 01:29:00 -08:00
Liang-Chi Hsieh
1d7f22c0d4
use Binds key in hostConfig to detect volumes mounted from external.
2013-11-13 15:08:46 +08:00
Liang-Chi Hsieh
6a693176d6
skip the volumes mounted when deleting the volumes of container.
2013-11-13 14:58:24 +08:00
Solomon Hykes
6c4393ccbb
Merge branch 'job-create-start-clean' into engine-patch-2
...
Conflicts:
engine/engine.go
engine/job.go
server.go
utils_test.go
2013-11-13 00:36:20 +00:00
Michael Crosby
7301fbe035
Pull parent layers first before children
2013-11-12 11:48:35 -08:00
Victor Vieux
637850063c
Merge pull request #2614 from dotcloud/prevent_delete_image_running_container
...
Runtime: prevent deletion if image is used by a running container
2013-11-12 11:01:51 -08:00
Victor Vieux
b314f19db8
Merge branch 'tests/insert' of https://github.com/mrallen1/docker into mrallen1-tests/insert
...
Conflicts:
server.go
2013-11-12 10:19:29 -08:00
Victor Vieux
87c8437a90
Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid
...
Server: always return long id's
2013-11-11 13:06:19 -08:00
Victor Vieux
da24945070
Merge branch 'master' of https://github.com/aanand/docker into aanand-master
2013-11-11 12:34:16 -08:00
Mark Allen
62f873aa1f
Just return the id; nothing else.
2013-11-11 13:26:24 -06:00
Mark Allen
8cc19765b4
Edits after code review
...
Return long image ID
Return streamformatted error or "raw" error
2013-11-10 00:06:55 -06:00
Sven Dowideit
b3974abe4f
make all image ID and container ID API responses use the Long ID ( Closes #2098 )
2013-11-09 12:16:49 +10:00
Victor Vieux
45c2b5dc1a
prevent deletion if image is used by a running container
2013-11-08 15:01:01 -08:00
David Sissitka
5957dd9091
Make "docker insert" errors obvious
...
Closes #1130
See also #1942
2013-11-08 00:15:19 -06:00
Solomon Hykes
9ae4bcaaf8
Move Change to the archive package, and fix a leftover merge in
...
Container.Inject()
2013-11-08 00:45:07 +00:00
Solomon Hykes
f1127b9308
gofmt
2013-11-07 23:58:03 +00:00
Solomon Hykes
165d1bdbc0
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
runtime.go
2013-11-07 23:26:52 +00:00
Solomon Hykes
f2bab1557c
Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface
2013-11-07 22:38:50 +00:00
Nate Jones
8f64759881
bring back /images/viz, but 404 for latest
2013-11-06 03:58:15 +00:00
Nate Jones
2a5998baf1
move "images -viz" to client
2013-11-06 03:58:15 +00:00
Nate Jones
dcf0279a50
fix "images -a"
2013-11-06 03:58:15 +00:00
Nate Jones
15867ff430
rework images JSON
2013-11-06 03:58:15 +00:00
Solomon Hykes
8d6df3a7e2
Remove debug messages
2013-11-05 23:00:20 +00:00
Solomon Hykes
e5f8ab6160
Engine: 'create' creates a container and prints its ID on stdout
2013-11-05 23:00:20 +00:00
Solomon Hykes
d3f074494a
Better error reporting in engine logs and unit tests
2013-11-05 23:00:20 +00:00
unclejack
4d2ba779e1
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 .
2013-11-05 22:54:24 +02:00
Solomon Hykes
02ddaad5d9
Engine: optional environment variable 'Logging' in 'serveapi'
2013-11-05 18:39:59 +00:00
Solomon Hykes
847411a1ee
Engine: fix a bug which caused handlers to be shared between multiple engine instances
2013-11-05 18:39:59 +00:00
Solomon Hykes
7b17d55599
httpapi: don't create a pidfile if it isn't set in the configuration
2013-11-05 18:39:59 +00:00
Solomon Hykes
958b4a8757
Engine: 'start' starts the specified container
2013-11-05 18:39:59 +00:00
Solomon Hykes
433c8e9c7d
Separate a) initialization of the http api and b) actually serving the api into 2 distinct jobs
2013-11-05 17:41:37 +00:00
Victor Vieux
c5d4459a02
Merge pull request #2502 from hamo/unlink_err_v4
...
rewrite protocol check with switch-case in Server.Daemon
2013-11-04 17:46:46 -08:00
Victor Vieux
a482bfd715
Merge pull request #2382 from dotcloud/reflect_future_changes_search_api
...
Update docker search to reflect future changes of the api
2013-11-04 16:14:14 -08:00
Michael Crosby
a9ed238bb7
Ensure container name on register
2013-11-04 09:28:40 -08:00
Victor Vieux
8f27e23b4b
Merge pull request #2457 from dotcloud/2454_do_not_split_last_column
...
RemoteAPI: Do not split last column docker top
2013-11-01 15:21:47 -07:00
Jérôme Petazzoni
31638ab2ad
Refactor HostConfig and escape apparmor confinement
2013-11-01 13:55:19 -07:00
Victor Vieux
02b5202432
update docker search to reflect future changes of the api
2013-10-31 19:14:11 -07:00
Yang Bai
7848007c3a
rewrite protocol check with switch-case in Server.Daemon
2013-11-01 09:42:44 +08:00
Michael Crosby
96d1e9bb5a
Move archive.go to sub package
2013-10-31 16:57:45 -07:00
Victor Vieux
e3c49843d7
Merge pull request #2494 from shykes/engine-links
...
Engine: Minimal, unintrusive implementation of a cleaner Job API.
2013-10-31 16:32:49 -07:00
Travis Cline
1099d172a2
Add flags to history, add size flag
2013-10-30 19:41:20 -05:00
Victor Vieux
1c7ca51f32
fix typos
2013-10-30 13:18:48 -07:00
Victor Vieux
3362aaa4df
fix remove root name and fix error messages
2013-10-30 11:45:11 -07:00
Victor Vieux
fb4672c52c
do not split last column docker top
2013-10-29 19:03:41 -07:00
Michael Crosby
7e8b2c3836
Make sure only links are removed and not names
2013-10-28 19:19:31 -07:00
Michael Crosby
0d2924408b
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.
2013-10-28 18:09:08 -07:00
Solomon Hykes
464ded79fc
Close sqlite persistent connection on SIGINT, SITERM or SIGKILL
2013-10-26 14:28:53 -07:00
Solomon Hykes
c1ae1a0e1c
Setup daemon pidfile/cleanup in Server.Daemon() instead of main()
2013-10-26 14:26:07 -07:00
Solomon Hykes
c542b2f873
Rename ConfigGetenv to ConfigFromJob
2013-10-26 14:24:25 -07:00
Solomon Hykes
7e691e11b0
Rename 'GraphPath' to the more logical 'Root'. This does not affect users except for a slight text change in the usage messge
2013-10-26 14:24:13 -07:00
Solomon Hykes
1b8eef4efb
Engine: centralize checks for supported architectures and kernel versions
2013-10-26 14:21:04 -07:00
Solomon Hykes
0d1a825137
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.
2013-10-26 14:18:13 -07:00
Victor Vieux
516cf54843
prevent default name to be deleted and return an error on invalid link
2013-10-25 16:49:49 -07:00
Michael Crosby
7c08aeeba4
Use persistent connection for links database
...
Add close method to Runtime and Server to make sure
that any underlying connections are cleaned up
2013-10-25 15:13:25 -07:00
Victor Vieux
89fb51f606
fix merge issue and gofmt
2013-10-25 15:13:25 -07:00
Michael Crosby
1cbdaebaa1
Add links for container relationships and introspection
2013-10-25 15:13:24 -07:00
Victor Vieux
93810b289c
fix wrong untag while docker rmi
2013-10-21 17:03:32 -07:00