Commit Graph

7111 Commits

Author SHA1 Message Date
Tianon Gravi ded2fb883d Merge pull request #4420 from unclejack/bump_to_go_1.2.1
Bump Go to 1.2.1 in the Dockerfile
2014-03-03 07:56:31 -07:00
Alexander Larsson 9e28c3e3f8 aufs: Skip tests if aufs not supported
This makes it possible to pass the rest of the testsuite without aufs in the kernel.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-03-03 15:11:49 +01:00
Alexander Larsson e8af7fcf6d runtime: Fix unique constraint error checks
The sqlite3 version in fedora (3.8) returns a different error string in the unique constraints
failure case than the one in hack/ (3.7). This updates the check to detect both, fixing
one integration check failure on Fedora.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-03-03 15:10:52 +01:00
unclejack 4a688d6864 bump go to 1.2.1 in the Dockerfile
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-03-03 15:09:54 +02:00
James Turnbull 37893c3db0 Merge pull request #4406 from funkymonkeymonk/voldocs
adding note that host-volumes must be defined using absolute paths
2014-03-02 23:19:09 -05:00
James Turnbull 881cdd2a02 Merge pull request #4410 from 1uptalent/fix_typo_in_build_command_doc
DOC: Fix switch name for tagging images in build command
2014-03-02 23:17:51 -05:00
James Turnbull 8f57f77160 Merge pull request #4176 from SvenDowideit/how-to-backup-volumes
add some info wrt backup and restore of volumes
2014-03-02 17:41:39 -05:00
Ian Truslove 3de1d25c11 Fix minor typo 2014-03-02 13:32:48 -07:00
James Turnbull b187d7ae41 Added documentation (and some cleanup) around small patch exemptions
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-03-02 11:43:18 -05:00
Tianon Gravi 10137a561c Merge pull request #4399 from barnybug/fish-completions
Add fish shell completions from github.com/barnybug/docker-fish-completion
2014-03-02 08:45:09 -07:00
Tianon Gravi a61096ec70 Merge pull request #4411 from lewispeckover/fix_mkimage-yum_mknod
Add "mkdir /dev" before doing mknod in mkimage-yum
2014-03-02 08:44:54 -07:00
Lewis Peckover 6d55a9d7ce mkdir /dev before doing mknod
Docker-DCO-1.1-Signed-off-by: Lewis Peckover <lew@lew.io> (github: lewispeckover)
2014-03-02 14:50:16 +00:00
German DZ 62b88cd619 DOC: Fix switch name for tagging images in build command
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar> (github: GermanDZ)
2014-03-02 13:50:34 +01:00
FunkyMonkeyMonk 3ddfbf6880 adding note that host-volumes must be defined using absolute paths
Docker-DCO-1.1-Signed-off-by: Will Weaver <monkey@buildingbananas.com> (github: funkymonkeymonk)
2014-03-01 20:43:53 -05:00
Brandon Philips 8d2226b7e5 fix(api): serve until the "acceptconnections" job
This fixes a bug that I encountered when using socket activation with
docker 0.8.1. When running the first `docker run` it would return:
"create: command not found".

The root cause was the socket activation code path was starting to
listen before the "initserver" job had finished. This meant that the
"create" handler hand't been registered yet leading to the command not
found error.

In log format it looks like this:

```
[/var/lib/docker|9d2e78e9] +job initserver()
2014/03/01 04:05:35 Listening for HTTP on fd ()
[/var/lib/docker|0d71c177] +job create()
create: command not found
[/var/lib/docker|0d71c177] -job create()
[/var/lib/docker|0d71c177] +job acceptconnections()
[/var/lib/docker|0d71c177] -job initserver() = OK (0)
```

To fix the issue select on the activationLock and block until the
"acceptconnections" job has ran.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
2014-03-01 10:55:36 -08:00
Barnaby Gray bf6adf952b Add fish shell completions from https://github.com/barnybug/docker-fish-completion.
Docker-DCO-1.1-Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk> (github: barnybug)
2014-03-01 17:33:54 +00:00
Michael Crosby f83482c918 Merge pull request #4395 from creack/remove_goroutine_leak_test
Make the chan for utils.Go buffered in order to avoid goroutine leak
2014-03-01 10:41:36 -05:00
Michael Crosby b02b933c62 Don't always just append env vars, replace defaults with ones from config
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-01 03:46:45 -08:00
ILYA Khlopotov e07920f680 Support json output in --format flag of docker inspect
Docker-DCO-1.1-Signed-off-by: ILYA Khlopotov <ilya.khlopotov@gmail.com> (github: khia)
2014-02-28 17:34:31 -08:00
Guillaume J. Charmes d3a6ee1e55
Make the chan for utils.Go buffered in order to avoid goroutine leak
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-02-28 16:35:43 -08:00
Victor Vieux 6d6ec5e005 Merge pull request #4394 from creack/fix_tty_ghost
Check if the command exists before dereference
2014-02-28 15:53:27 -08:00
Guillaume J. Charmes 5ec6819705
Check if the command exists before dereference
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-02-28 15:39:24 -08:00
Sven Dowideit 5fde31ba9c add some info wrt backup and restore of volumes
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-03-01 08:44:01 +10:00
Wes Morgan 3b969aad4a merge existing config when committing
Fixes #1141

Docker-DCO-1.1-Signed-off-by: Wes Morgan <cap10morgan@gmail.com> (github: cap10morgan)
2014-02-28 15:27:05 -07:00
Victor Vieux 5f5880edb8 Merge pull request #4388 from vieux/fix_eventlisteners_nb
fix EventsListeners in docker info
2014-02-28 13:53:15 -08:00
Andy Rothfusz ba2a042aea Merge pull request #4390 from SvenDowideit/spelling-1
one ponted out by lukaspustina, and one that I bet I added
2014-02-28 13:39:40 -08:00
Andy Rothfusz 70d2ca4ed3 Merge pull request #4319 from jlhawn/docs-docker-io-api
Added documentation for docker.io OAuth & Accounts
2014-02-28 13:35:33 -08:00
Sven Dowideit b16f466354 one ponted out by lukaspustina, and one that I bet I added
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-03-01 05:12:21 +10:00
Victor Vieux 0ca7df046b fix EventsListeners in docker info
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-02-28 19:06:36 +00:00
Victor Vieux 142213ade8 Merge pull request #4379 from vieux/remove_warnings_twice
remove WARNING writter twice
2014-02-28 10:31:25 -08:00
unclejack b4146fbe48 Merge pull request #4376 from vieux/fix_lxc_version
fix docker info with lxc 1.0.0
2014-02-28 20:04:11 +02:00
Brian Goff d78fcb32ff Add ability to force removal of running container via docker rm -f
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-02-27 23:31:36 -05:00
Victor Vieux f67e725e68 remove WARNING writter twice
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-02-28 02:40:15 +00:00
Victor Vieux 6104f9f949 fix fedora tty with apparmor
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-02-28 01:20:10 +00:00
Victor Vieux f30f823bf5 fix docker info with lxc 1.0.0
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-02-28 00:32:58 +00:00
Josh Hawn b6a5082bd1 Updated OAuth docs per arothfusz's comments
Added emphasis of https for OAuth interactions.
Updated example URIs to use HTTPS
Included redirect hostname on authorization page.

Docker-DCO-1.1-Signed-off-by: Josh hawn <josh.hawn@docker.com> (github: jlhawn)
2014-02-27 14:21:24 -08:00
Sven Dowideit cdec3297f7 add a little bit mentioning commandline option combinations
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-02-28 08:14:22 +10:00
Michael Crosby 44c3b71332 Ensure that ticker does not leak
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-02-27 11:40:25 -08:00
Victor Vieux 31e08fdc96 Merge pull request #4369 from tianon/better-archive-tar-vendor-import-path
Use a more defensive vendored archive/tar import path to make it clear this isn't upstream's released archive/tar
2014-02-27 10:37:38 -08:00
Andy Rothfusz ce8a735248 Merge pull request #4318 from robpc/patch-1
Fixed typo in Dockerfile example
2014-02-27 10:19:09 -08:00
Michael Crosby fdeea90fc8 Allow child process to live if daemon dies
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-02-27 09:33:36 -08:00
Tianon Gravi e6784be628 Merge pull request #4365 from maztaim/master
Use mknod instead of MAKEDEV in mkimage-yum.sh
2014-02-27 10:14:22 -07:00
Tianon Gravi 2ca4e0ea60 Use a more defensive vendored archive/tar import path to make it clear this isn't upstream's released archive/tar
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-27 09:43:44 -07:00
Michael Crosby a115ce797b Ensure that the container dir is remove on restore
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-02-27 08:28:55 -08:00
Tim Bosse 1d82091756 Some distributions no longer include MAKEDEV script. Stole this from mkimage-rinse.sh.
Docker-DCO-1.1-Signed-off-by: Tim Bosse <taim@bosboot.org> (github: maztaim)
2014-02-26 22:34:42 -05:00
Michael Crosby fb08b8b221 Code review updates
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-02-26 19:21:46 -08:00
Michael Crosby 01dc79b3ea Merge pull request #4276 from tianon/json-stream-newlines
Add newlines to the JSON stream functions
2014-02-26 21:25:42 -05:00
Victor Vieux 389eba4396 Merge pull request #4297 from dotcloud/add-simple-checksum
registry: Added simple checksums (sha256) for layers
2014-02-26 18:15:48 -08:00
Michael Crosby 7cd2245947 Ensure that loopback devices are mounted inside the conatiner
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-02-26 17:21:09 -08:00
robpc 1475dafd52 Fixed typo in Dockerfile example
Docker-DCO-1.1-Signed-off-by: Rob Cannon <rpcann@gmail.com> (github: robpc)

The 'true' command is located in /bin not /usr/bin in the busybox image.
2014-02-26 19:38:51 -05:00