Victor Vieux
|
f948820d03
|
Merge pull request #3743 from pmorie/typo
Fix typo in comment in container.go
|
2014-01-23 15:15:18 -08:00 |
Paul Morie
|
2f57eb0410
|
Fix typo in container.go
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com> (github: pmorie)
|
2014-01-23 18:10:33 -05:00 |
Victor Vieux
|
1896934616
|
Merge pull request #3742 from vieux/update_todo
no more TODO
|
2014-01-23 12:57:00 -08:00 |
Victor Vieux
|
5d71ad8b19
|
no more TODO
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-23 12:55:58 -08:00 |
Victor Vieux
|
4e08bb5629
|
Merge pull request #3740 from tianon/fix-mflag-dyntest
Fix mflag test issue with "ResetForTesting"
|
2014-01-23 12:09:08 -08:00 |
Tianon Gravi
|
f60eee4894
|
Fix mflag test issue with "ResetForTesting" (which only showed up under dyntest for some odd reason)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
|
2014-01-23 13:03:17 -07:00 |
Victor Vieux
|
7687b3cec1
|
Merge pull request #3738 from vieux/update_todo
update REMOTE_TODO.md
|
2014-01-23 10:51:38 -08:00 |
Victor Vieux
|
4d4339c6de
|
update REMOTE_TODO.md
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-23 10:50:11 -08:00 |
Tianon Gravi
|
210db8e846
|
Merge pull request #3720 from therealprologic/master
Add script for building CRUX base images
|
2014-01-22 21:28:51 -08:00 |
James Mills
|
d247b7d426
|
Added script for building Base Docker CRUX images
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au> (github: therealprologic)
|
2014-01-23 13:53:19 +10:00 |
Andy Rothfusz
|
700db10c85
|
Merge pull request #3716 from johngmyers/patch-1
Grammar fixes and wording improvements
|
2014-01-22 12:01:13 -08:00 |
Andy Rothfusz
|
9a2e673f4f
|
Merge pull request #3713 from SvenDowideit/document-bind-mount-file
bind mounts work for files - give an example, as its very very useful.
|
2014-01-22 11:54:41 -08:00 |
Michael Crosby
|
2a6e93a6fb
|
Merge pull request #3558 from tianon/buildfile-run-json
Add support for RUN [""] in Dockerfiles
|
2014-01-22 11:51:34 -08:00 |
Guillaume J. Charmes
|
f61a91f50a
|
Merge pull request #3073 from alexlarsson/refcount-driver-mounts
Refcount driver mounts
|
2014-01-22 11:42:17 -08:00 |
Guillaume J. Charmes
|
44a0bab304
|
Merge pull request #3712 from plietar/kill-signal
Add a -s option to the kill command to specify a signal.
|
2014-01-22 11:38:16 -08:00 |
Michael Crosby
|
639d2ecd4f
|
Merge pull request #3682 from alexlarsson/implement-tar
Implement tar in Go
|
2014-01-22 11:23:47 -08:00 |
Guillaume J. Charmes
|
4ccf423f42
|
Merge pull request #3695 from chazomaticus/3628-ignore-kernel-flavor
ignore non-numeric characters when parsing kernel version
|
2014-01-22 11:19:05 -08:00 |
Charles Lindsay
|
dea3c2655d
|
Add comment about ignoring Sscanf error
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
|
2014-01-22 09:32:50 -08:00 |
Sven Dowideit
|
0f5ad430c4
|
change the documentation only - It looks like we have a number of cmdline params to completely update from the code version
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
|
2014-01-22 21:29:05 +10:00 |
John Gardiner Myers
|
1c06a91964
|
Wording improvements
Docker-DCO-1.1-Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com> (github: johngmyers)
|
2014-01-21 22:40:33 -08:00 |
John Gardiner Myers
|
f3cb808e9d
|
Grammar and punctuation fixes
Docker-DCO-1.1-Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com> (github: johngmyers)
|
2014-01-21 22:40:06 -08:00 |
Paul Lietar
|
1f75a0bf43
|
Add a --signal option to the kill command to specify a signal.
Docker-DCO-1.1-Signed-off-by: Paul Lietar <paul@lietar.net> (github: plietar)
|
2014-01-22 06:10:52 +00:00 |
Michael Crosby
|
3cb5bc5ae5
|
Merge pull request #3708 from creack/fix_run_exit_code
Fix issue with exit code in non-tty mode.
|
2014-01-21 18:15:01 -08:00 |
Guillaume J. Charmes
|
fd38de2818
|
Fix issue with exit code in non-tty mode.
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
|
2014-01-21 18:05:03 -08:00 |
Victor Vieux
|
4c1879f919
|
Merge branch 'add_missing_attributes' of https://github.com/rogaha/docker into rogaha-add_missing_attributes
Conflicts:
api.go
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-21 18:01:19 -08:00 |
Tianon Gravi
|
572002a715
|
Merge pull request #3707 from bkcsoft/fix-bash-hashbangs
Update bash shebangs to use "/usr/bin/env bash" for increased portability
|
2014-01-21 17:30:52 -08:00 |
Kim BKC Carlbacker
|
b1953baba2
|
This should make all bash-scripts run on pretty much any posix-system (with bash installed ofc...)
Docker-DCO-1.1-Signed-off-by: Kim BKC Carlbacker <kim.carlbacker@gmail.com> (github: bkcsoft)
|
2014-01-22 02:21:56 +01:00 |
Guillaume J. Charmes
|
cb33f739a1
|
Merge pull request #3705 from crosbymichael/fix-die-event
Fix die command when monitor returns
|
2014-01-21 17:13:29 -08:00 |
Michael Crosby
|
0b789ca844
|
Merge pull request #3706 from creack/fix_wait_stopped
Fix wait on stopped container (after docker restart) + add Unit test for that case
|
2014-01-21 17:03:35 -08:00 |
Guillaume J. Charmes
|
0376a69cb1
|
Fix wait on stopped container (after docker restart) + add Unit test for that case
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
|
2014-01-21 16:49:24 -08:00 |
Michael Crosby
|
980000071d
|
Merge pull request #2655 from mpetazzoni/create-local-bind-dirs
Automatically create non-existent bind-mounted host directories
|
2014-01-21 16:27:20 -08:00 |
Michael Crosby
|
80f128a6ea
|
Fix die command when monitor returns
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
|
2014-01-21 16:18:57 -08:00 |
Maxime Petazzoni
|
47d1413d7a
|
Documentation about automatic bind-mount dir creation
Docker-DCO-1.1-Signed-off-by: Maxime Petazzoni <max@signalfuse.com> (github: mpetazzoni)
|
2014-01-21 16:05:30 -08:00 |
Maxime Petazzoni
|
3e96f46b30
|
Automatically create non-existent bind-mounted directories on the host
Fixes #1279.
Docker-DCO-1.1-Signed-off-by: Maxime Petazzoni <max@signalfuse.com> (github: mpetazzoni)
|
2014-01-21 16:05:29 -08:00 |
Michael Crosby
|
b417f79c00
|
Merge pull request #3704 from vieux/json_api_return_valid
Switch back to the valid json format
|
2014-01-21 15:35:06 -08:00 |
Victor Vieux
|
be6aeda1e4
|
Merge pull request #3640 from proppy/networkgetroutes-add-default
netlink: add default Route to NetworkGetRoutes
|
2014-01-21 15:20:16 -08:00 |
Victor Vieux
|
e3461bc8d6
|
switch back to the valid json format
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-21 15:06:23 -08:00 |
Andy Rothfusz
|
62c4563987
|
Merge pull request #3688 from shykes/docs-simplify-basic-usage
Simplify basic usage docs
|
2014-01-21 11:41:32 -08:00 |
Guillaume J. Charmes
|
e56562c35e
|
Merge pull request #3566 from tianon/fix-volume-symlinks
Fix symlink mounting issues
|
2014-01-21 11:37:05 -08:00 |
Victor Vieux
|
9164ba6516
|
Merge pull request #3686 from vieux/load_job
Load job
|
2014-01-21 11:29:15 -08:00 |
Victor Vieux
|
f2f44b91a8
|
move load to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-21 11:28:45 -08:00 |
Andy Rothfusz
|
ba4ae40445
|
Merge pull request #3690 from shykes/cleanup-maintainers
Cleanup maintainers
|
2014-01-21 11:18:23 -08:00 |
Michael Crosby
|
f98a596be9
|
Merge pull request #3698 from alexlarsson/fix-shared-root
Fix handling of shared roots
|
2014-01-21 11:09:36 -08:00 |
Andy Rothfusz
|
fb919137be
|
Merge pull request #3687 from shykes/docs-intro
docs: harmonize intro paragraph with website
|
2014-01-21 11:02:55 -08:00 |
Andy Rothfusz
|
31274ffccb
|
Merge pull request #3700 from jamtur01/fixedtoc
Fixed commandline/index warning in TOC
|
2014-01-21 10:52:13 -08:00 |
Tianon Gravi
|
678d76fa9c
|
Merge pull request #3671 from tianon/completion-ignore-stderr
Update bash completion to ignore stderr output of docker binary
|
2014-01-21 10:40:23 -08:00 |
Charles Lindsay
|
cce099aa34
|
Re-add kernel Flavor tests
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
|
2014-01-21 09:56:53 -08:00 |
Tianon Gravi
|
b23e6e99b3
|
Merge pull request #3459 from Barthalion/master
Fix mkimage-arch.sh to generate cleaner Arch Linux images and do so with cleaner code
|
2014-01-21 07:11:57 -08:00 |
Bartłomiej Piotrowski
|
4137a0ea32
|
mkimage-arch: provide and use own pacman.conf
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
|
2014-01-21 14:22:56 +01:00 |
James Turnbull
|
fabf96b8ff
|
Fixed commandline/index warning in TOC
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
|
2014-01-21 08:22:51 -05:00 |