Sven Dowideit
48e1766527
add an example of docker ps, and also of link aliases
2013-12-03 17:57:51 +10:00
Michael Crosby
3ed0ff85f5
Merge pull request #2821 from jpellerin/2820-fix-daemon-dns
...
Fixes #2820
2013-12-02 18:19:31 -08:00
Tianon Gravi
650d4cc644
Merge pull request #3005 from gurjeet/zfs_driver_owner
...
Typo fix
2013-12-02 15:06:05 -08:00
Gurjeet Singh
d9b742419c
Typo fix
2013-12-02 18:03:54 -05:00
JP
5a9cf7e754
Add unit test for ValidateIp4Address
2013-12-02 17:33:33 -05:00
JP
3cd9b2aadf
Fixes #2820
2013-12-02 16:22:39 -05:00
Victor Vieux
8afb0abbee
Merge pull request #2998 from creack/fix_json_display
...
Fix json display
2013-12-02 12:58:58 -08:00
Guillaume J. Charmes
98ed1dc433
Fix unit test with new buildfile prototype
2013-12-02 12:51:37 -08:00
Victor Vieux
7aec93c370
Merge pull request #2959 from crosbymichael/fix-auth-split
...
Split auth on first colon
2013-12-02 12:21:04 -08:00
Victor Vieux
62f0e5aef9
Merge pull request #2965 from crosbymichael/no-private-port
...
Only return published ports for docker port
2013-12-02 12:18:47 -08:00
Victor Vieux
59a85798fa
Merge pull request #2982 from tianon/dockerfile-best-practice
...
Update Dockerfile with all-caps INSTRUCTIONS
2013-12-02 12:14:04 -08:00
Victor Vieux
67c03552f6
Merge pull request #2957 from creack/handle_sigquit
...
Catch SIGQUIT for cleanup
2013-12-02 12:13:07 -08:00
Victor Vieux
4fdc117ad2
Merge pull request #2921 from dustin/inspect-format
...
Add -format to 'docker inspect'
2013-12-02 12:08:15 -08:00
Guillaume J. Charmes
5cd09dc115
small reformatting jsonmessage
2013-12-02 11:49:11 -08:00
Guillaume J. Charmes
6ea3b9651b
Fix displayJson behavior (dont add newline)
2013-12-02 11:47:13 -08:00
Guillaume J. Charmes
de4429f70d
Do not format at each write but use a Writer instead (build)
2013-12-02 11:43:41 -08:00
Michael Crosby
8cc524996a
Merge pull request #2924 from tianon/strict-fhs-compatibility
...
Add proper dockerinit path support for distros that use FHS 2.3
2013-12-02 11:35:36 -08:00
Tianon Gravi
d9fbdd7b3f
Merge pull request #2995 from gurjeet/zfs_driver_owner
...
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
2013-12-02 11:10:16 -08:00
Dustin Sallings
4ad3dfb05f
CLI docs and examples of format
2013-12-02 11:07:41 -08:00
Dustin Sallings
1d503be466
Use inspect format to get IP address for psql example
2013-12-02 11:07:41 -08:00
Dustin Sallings
9837ad8e9b
Add -format to 'docker inspect'
...
This makes it a lot easier to script with docker instances as one can
ask for details about running instances more easily without having to
have additional JSON processing tools installed.
dotcloud/docker#734
2013-12-02 11:07:41 -08:00
Gurjeet Singh
70b586702c
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
2013-12-02 14:03:16 -05:00
Victor Vieux
4b35c1b6a6
Merge pull request #2728 from SvenDowideit/docker-import-doc
...
re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
2013-12-02 10:59:15 -08:00
Michael Crosby
fe571dd293
Merge pull request #2829 from dotcloud/refactor_opts
...
Refactor opts
2013-12-02 10:41:30 -08:00
Michael Crosby
e1414a4c39
Merge pull request #2945 from dotcloud/refactor_stream
...
Refactor stream
2013-12-02 10:31:09 -08:00
Victor Vieux
d4ebba703c
Merge pull request #2994 from discordianfish/1150-build-return-exit-code
...
Bump api version and update docs
2013-12-02 10:30:46 -08:00
Johannes 'fish' Ziemke
e4cb83c50e
Bump api version and update docs
2013-12-02 19:27:28 +01:00
Michael Crosby
d7dd19d22e
Merge pull request #2981 from tianon/less-verbose-testing
...
Remove "-v" from "go test" (since it's easy to add back manually via TESTFLAGS)
2013-12-02 10:14:25 -08:00
Guillaume J. Charmes
5f2313aad3
Merge pull request #2984 from SvenDowideit/2319-build-check-for-dockerfile
...
check on the client side that there is a Dockerfile
2013-12-02 09:35:31 -08:00
Guillaume J. Charmes
d6cdbca6c1
Merge pull request #2775 from daniel-garcia/2671-bindmount_files
...
fixes #2671 , add support for bind mounting individual files in to contai...
2013-12-02 09:30:08 -08:00
Guillaume J. Charmes
751250015b
Merge pull request #2206 from discordianfish/1150-build-return-exit-code
...
Make docker build return exit code of build step
2013-12-02 09:01:11 -08:00
Johannes 'fish' Ziemke
b04c6466cd
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.
2013-12-02 17:52:37 +01:00
Solomon Hykes
c4548506c5
Merge pull request #2693 from fkautz/makefile
...
Adding a makefile
2013-12-01 23:25:24 -08:00
Sven Dowideit
26cf8b9aff
check on the client side that there is a Dockerfile, so we don't upload a huge stack of files, only to realise we can't do anything
2013-12-02 15:55:08 +10:00
Tianon Gravi
7f1a91121c
Update Dockerfile with all-caps INSTRUCTIONS (as explained in docs as being "convention": http://docs.docker.io/en/latest/use/builder/#format )
2013-12-01 21:31:28 -07:00
Tianon Gravi
c30e2dc28c
Remove "-v" from "go test" (since it's easy to add back via TESTFLAGS)
2013-12-01 21:20:35 -07:00
Guillaume J. Charmes
d9cdd45d2e
Merge pull request #2978 from tianon/go1.2
...
Update to Go 1.2 officially, now that it is released
2013-12-01 16:46:38 -08:00
Tianon Gravi
5c5f670901
Update to Go 1.2 officially, now that it is released
2013-12-01 15:11:10 -07:00
Frederick F. Kautz IV
56ab9cb0d5
Minor fixes based on discussions on #2693
...
* Volume exports ./bundles instead of root directory
* Documents build using docker-docs instead of docker:docs
* Bundles directory is created before running build or docs
2013-11-30 00:09:41 -08:00
Solomon Hykes
d8ee08ba7b
Merge pull request #2925 from tianon/update-systemd-service
...
Update systemd service file with suggestions from @seblu
2013-11-29 21:25:08 -08:00
Guillaume J. Charmes
4e030c78d2
Merge branch 'master' into handle_sigquit
...
Conflicts:
server.go
2013-11-29 18:51:32 -08:00
Guillaume J. Charmes
62b1faf28c
Merge pull request #2926 from crosbymichael/attach-wait
...
Return process exit code for attach
2013-11-29 18:49:24 -08:00
Guillaume J. Charmes
2dac7b5209
Merge pull request #2781 from shykes/engine-status-int
...
Engine: integer status, better streaming, lots of tests
2013-11-29 17:57:28 -08:00
Guillaume J. Charmes
1890301e67
Merge pull request #2964 from andrewsmedina/gofmt2
...
go fmt.
2013-11-29 17:19:28 -08:00
Michael Crosby
65db62619c
Only return published ports for docker port
2013-11-29 16:45:20 -08:00
Solomon Hykes
35d54c6655
Fix a bug in Output.Write, and improve testing coverage of error cases.
2013-11-30 00:25:46 +00:00
Solomon Hykes
3553a803e3
Engine: better testing of streams and of basic engine primitives. Coverage=81.2%
2013-11-30 00:25:46 +00:00
Solomon Hykes
a4f8a2494b
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
2013-11-30 00:25:46 +00:00
Andrews Medina
fe72f15e4a
go fmt.
...
result of `gofmt -w -s .` without vendors.
2013-11-29 22:20:59 -02:00
Michael Crosby
a37b155384
Split auth on first colon
2013-11-29 15:14:36 -08:00