Victor Vieux
009024ad64
fix -link parsing
2013-11-26 00:05:46 -08:00
Victor Vieux
0bb2c0b1d0
fix docker run on an unknown image
2013-11-25 23:20:36 -08: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
Solomon Hykes
43c7df946d
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-26 02:00:25 +00:00
Sven Dowideit
9696ec509a
add 'to STDOUT' to the help, and add a simple eg that mentions it too
2013-11-23 12:28:50 +10:00
Guillaume J. Charmes
c67f9b671d
Remove useless New*Opt functions, singleline Opt types
2013-11-22 14:42:30 -08:00
Guillaume J. Charmes
1c8ae47770
Make a validation on links name
2013-11-22 14:33:25 -08:00
Guillaume J. Charmes
d55998be81
Remove goroutine leak. Make sure termcap are reset each time.
2013-11-22 14:09:37 -08:00
Michael Crosby
e69bbd239e
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-22 14:06:59 -08:00
Guillaume J. Charmes
076c0eab70
Format CmdRun
2013-11-22 12:14:34 -08:00
Guillaume J. Charmes
1f9223a7c2
Use a constant for PortSpecTemplate + display the template in the CmdRun help
2013-11-22 12:00:34 -08:00
Guillaume J. Charmes
476559458d
Reformatting parseRun and partParse
2013-11-22 11:58:02 -08:00
Michael Crosby
ae8c589d35
Merge pull request #2823 from dotcloud/2817-run_rm-fix
...
Fix docker run -rm
2013-11-22 11:35:29 -08:00
Victor Vieux
1e7c04fcfe
fix -rm
2013-11-22 11:23:48 -08:00
Mark Allen
8b0cd60019
Pass terminal setting to display utils
2013-11-22 00:05:55 -06: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
Victor Vieux
8498b44eac
Merge pull request #2731 from SvenDowideit/docker-commit-doc
...
make the docker commit help more copy&pasteable
2013-11-21 15:33:05 -08:00
Victor Vieux
75a7f4d90c
Return status exit status 2 on usage, move parserun into commands.go, display usage on stderr
2013-11-21 11:43:07 -08:00
Michael Crosby
a2c9d2da93
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-21 10:21:30 -08:00
Victor Vieux
f20c738963
Merge pull request #2793 from crosbymichael/offline-ids
...
Allow images to be saved and loaded by id and repository
2013-11-21 02:44:00 -08:00
Michael Crosby
fd7ab143bf
Allow images to be saved and loaded by id and repository
2013-11-20 17:28:19 -08:00
Andy Rothfusz
82cdd21a34
Merge pull request #2727 from SvenDowideit/docker-images-doc
...
add some common examples for docker images, and tell the user what -a filters out
2013-11-20 16:30:48 -08:00
Michael Crosby
2bc35287a0
Merge pull request #2723 from SvenDowideit/doc-build-image
...
Use the work Path for docker cp CONTAINER:PATH
2013-11-20 11:10:13 -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
Josh Poimboeuf
171d681724
resize pty after starting
...
Since ptyMaster is created during container start (startPty), it should
resized after starting, not before.
2013-11-20 11:40:30 -06: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
Guillaume J. Charmes
5e941f1ca0
Lintify code with confidence=1
2013-11-18 16:24:11 -08:00
Josh Poimboeuf
440422a963
don't forward SIGCHLD to container
...
It makes no sense to forward SIGCHLD to the container.
2013-11-18 11:45:29 -06:00
Sven Dowideit
bc74f65068
make the docker commit help more copy&pasteable
2013-11-16 21:11:34 +10:00
Sven Dowideit
152459b727
add some common examples for docker images, and tell the user what -a filters out
2013-11-16 20:45:30 +10:00
Sven Dowideit
27159ce6ba
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
2013-11-16 20:15:04 +10: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
Victor Vieux
388057f11a
Merge pull request #2648 from dotcloud/docker_kill_exit_code
...
Make sure docker kill exit with failure in case of error
2013-11-12 14:40:17 -08:00
Guillaume J. Charmes
08623dc216
Fix ImageTree test
2013-11-12 12:25:35 -08:00
Victor Vieux
dcc9980550
Merge pull request #2657 from dotcloud/fix_docker_images_output
...
use utils.ParseRepositoryTag instead of strings.split in docker images
2013-11-12 11:01:29 -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
Michael Crosby
5d9723002b
Allow drivers to implement ApplyDiff in Differ interface
2013-11-11 19:09:57 -08:00
Victor Vieux
e2ac0e6b80
add wait, stop, start, restart, rm, rmi
2013-11-11 14:47:23 -08:00
Victor Vieux
84a3600ea8
use utils.ParseRepositoryTag instead of strings.split in docker images
2013-11-11 13:54:17 -08:00
Guillaume J. Charmes
8149439d95
Make sure docker kill exit with failure in case of error
2013-11-11 09:15:51 -08:00
David Sissitka
5957dd9091
Make "docker insert" errors obvious
...
Closes #1130
See also #1942
2013-11-08 00:15:19 -06:00
Guillaume J. Charmes
ef57752bce
Deprecate old tagging format
2013-11-07 17:30:51 -08:00