df0756600a
Merge pull request #3707 from bkcsoft/fix-bash-hashbangs
...
Update bash shebangs to use "/usr/bin/env bash" for increased portability
Upstream-commit: 572002a71593009bd4dd3285ac429b70042b6ce6
Component: engine
2014-01-21 17:30:52 -08:00
923913cbf1
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)
Upstream-commit: b1953baba28362c928d962f0729325d3293c4753
Component: engine
2014-01-22 02:21:56 +01:00
fe22aca6b8
Merge pull request #3705 from crosbymichael/fix-die-event
...
Fix die command when monitor returns
Upstream-commit: cb33f739a19ca4382499aaa9f50bd4a031ba0cbe
Component: engine
2014-01-21 17:13:29 -08:00
5bf17309b9
Merge pull request #3706 from creack/fix_wait_stopped
...
Fix wait on stopped container (after docker restart) + add Unit test for that case
Upstream-commit: 0b789ca84480731ae275569282a8be2e68616196
Component: engine
2014-01-21 17:03:35 -08:00
f30d57c548
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)
Upstream-commit: 0376a69cb1cc839f7e1a147623b399147a5976c9
Component: engine
2014-01-21 16:49:24 -08:00
003b985961
Fix die command when monitor returns
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 80f128a6ea2b71e2ed6838c6a913086859ed50ff
Component: engine
2014-01-21 16:18:57 -08:00
054751d110
Documentation about automatic bind-mount dir creation
...
Docker-DCO-1.1-Signed-off-by: Maxime Petazzoni <max@signalfuse.com > (github: mpetazzoni)
Upstream-commit: 47d1413d7a0850edc64c62f1473b4c4a3f417d7c
Component: engine
2014-01-21 16:05:30 -08:00
dd5574687b
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)
Upstream-commit: 3e96f46b30340f8468a7bac8c159b610a2309821
Component: engine
2014-01-21 16:05:29 -08:00
45b4cb5fbb
Merge pull request #3704 from vieux/json_api_return_valid
...
Switch back to the valid json format
Upstream-commit: b417f79c0032e8453df92656589e21f445d73043
Component: engine
2014-01-21 15:35:06 -08:00
b2b5a8cb20
Merge pull request #3640 from proppy/networkgetroutes-add-default
...
netlink: add default Route to NetworkGetRoutes
Upstream-commit: be6aeda1e497fd06da410ba9d5459efdd7c19885
Component: engine
2014-01-21 15:20:16 -08:00
2a860faf85
switch back to the valid json format
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e3461bc8d694fa4b104a9cdd08e11de26a04d923
Component: engine
2014-01-21 15:06:23 -08:00
a633d7a05c
Merge pull request #3688 from shykes/docs-simplify-basic-usage
...
Simplify basic usage docs
Upstream-commit: 62c456398767b3e8155ec6d0df265cb5fb464438
Component: engine
2014-01-21 11:41:32 -08:00
0c36be10c2
Merge pull request #3566 from tianon/fix-volume-symlinks
...
Fix symlink mounting issues
Upstream-commit: e56562c35e0ef39a02c171f60fccd6588edb8846
Component: engine
2014-01-21 11:37:05 -08:00
3324f8180d
Merge pull request #3686 from vieux/load_job
...
Load job
Upstream-commit: 9164ba6516d3f91c397e90ee02af4afa17ca20fc
Component: engine
2014-01-21 11:29:15 -08:00
d782b526fa
move load to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: f2f44b91a8ebbcea9c62f0c1b63e5aabaa3110b4
Component: engine
2014-01-21 11:28:45 -08:00
1b8b44e502
Merge pull request #3690 from shykes/cleanup-maintainers
...
Cleanup maintainers
Upstream-commit: ba4ae40445d40545a83b5dc9040c1c4942bb51ce
Component: engine
2014-01-21 11:18:23 -08:00
7428886159
Merge pull request #3698 from alexlarsson/fix-shared-root
...
Fix handling of shared roots
Upstream-commit: f98a596be9eda121c6a9d5eef53d3d38849d9b56
Component: engine
2014-01-21 11:09:36 -08:00
8a428ead43
Merge pull request #3687 from shykes/docs-intro
...
docs: harmonize intro paragraph with website
Upstream-commit: fb919137bec47bb4922a2571a0f9410a5887c670
Component: engine
2014-01-21 11:02:55 -08:00
08877d190e
Merge pull request #3700 from jamtur01/fixedtoc
...
Fixed commandline/index warning in TOC
Upstream-commit: 31274ffccb954bde88c973719c949894cc02d314
Component: engine
2014-01-21 10:52:13 -08:00
a290d454f3
Merge pull request #3671 from tianon/completion-ignore-stderr
...
Update bash completion to ignore stderr output of docker binary
Upstream-commit: 678d76fa9cd11dc57af405653b26be9323139e7f
Component: engine
2014-01-21 10:40:23 -08:00
bbcbe4bcf1
Merge pull request #3459 from Barthalion/master
...
Fix mkimage-arch.sh to generate cleaner Arch Linux images and do so with cleaner code
Upstream-commit: b23e6e99b38edf8453dbbcc21302cda6ff1d0cdf
Component: engine
2014-01-21 07:11:57 -08:00
7f4f60d7bd
mkimage-arch: provide and use own pacman.conf
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
Upstream-commit: 4137a0ea327ea1775c1b57892fd684da2c738f3e
Component: engine
2014-01-21 14:22:56 +01:00
0d4fdafaa4
Fixed commandline/index warning in TOC
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: fabf96b8ff5560523d60269d0052b65037394dcc
Component: engine
2014-01-21 08:22:51 -05:00
94cf963f92
mkimage-arch: use hash to check if command is available
...
Apart from having more predictable return codes on various operating
systems, it additionally caches the path to application.
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
Upstream-commit: 787ff55283067ef3d8da3238e65ca204bc63b3f9
Component: engine
2014-01-21 14:22:47 +01:00
7ed82adb9b
mkimage-arch: don't generate ISO-8859-1 locale
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
Upstream-commit: da4ba80733ff4826ea17d253677a58fdedf4cc00
Component: engine
2014-01-21 14:22:39 +01:00
2034daa056
mkimage-arch: unify usage of brackets around variables
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
Upstream-commit: c6535d272c0d1a07ea51639be66e1959a0fc996f
Component: engine
2014-01-21 14:22:33 +01:00
5807b83360
mkimage-arch: remove $DEV instead of renaming it
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
Upstream-commit: a4e6e9bd41ee0f80e7e9bce05156ddd7d63554aa
Component: engine
2014-01-21 14:22:26 +01:00
80f16b65b6
mkimage-arch: use mktemp to create ROOTFS directory
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
Upstream-commit: c138c335a5d867d81231fdca6f418a9cc11ca244
Component: engine
2014-01-21 14:21:43 +01:00
62292fd956
Fix handling of shared roots
...
If rootIsShared() is detected we apply the shell stuff to early, before
the real command and arguments are added to the parameters. This
means they get passed on to unshare rather than docker-init, breaking
docker on e.g. fedora like:
goroutine 1 [running]:
runtime.panic(0x678340, 0x9b3fd7)
/usr/lib64/golang/src/pkg/runtime/panic.c:266 +0xb6
github.com/dotcloud/docker/execdriver/lxc.func·001(0xc21000a1b0, 0xc21001eab0, 0x7fff24715faf)
/home/alex/vcs/go/src/github.com/dotcloud/docker/execdriver/lxc/driver.go:41 +0x525
github.com/dotcloud/docker/sysinit.executeProgram(0xc21000a1b0, 0xc21000a1b0, 0xa)
/home/alex/vcs/go/src/github.com/dotcloud/docker/sysinit/sysinit.go:34 +0xca
github.com/dotcloud/docker/sysinit.SysInit()
/home/alex/vcs/go/src/github.com/dotcloud/docker/sysinit/sysinit.go:88 +0x791
main.main()
/home/alex/vcs/go/src/github.com/dotcloud/docker/dockerinit/dockerinit.go:14 +0x1a
The fix is to construct the full params array before escaping it.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 08ab55419549374742bc879261f1d55b19af7265
Component: engine
2014-01-21 10:22:13 +01:00
7cb035c53d
docs: harmonize intro paragraph with website
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: fdf43f5de14e1ddf9e806e78f51e98721b920b5d
Component: engine
2014-01-21 07:33:26 +00:00
f0d14c9de1
Docs: fix capitalization of "Docker"
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: ae2af201f340420f70ca05d54d150764bd88e680
Component: engine
2014-01-21 07:27:55 +00:00
8056a9e2e7
Merge pull request #3662 from tianon/add-udev-to-deb
...
Add udev rules file to our generated deb package
Upstream-commit: a37ffa4041cb8504741ab2805d16f8b268772793
Component: engine
2014-01-20 19:44:05 -08:00
3b8064670d
Docs: move advanced topic "create your own base image" out of basic user guide
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: c24d128bb545e292ffb0790d8ad3652f56d62b44
Component: engine
2014-01-21 03:43:16 +00:00
5aafcb2d29
docs: "first steps with docker" is a better title than "learn basic commands"
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 589e1a9bdce47d87870c64c5449002bca2b315a4
Component: engine
2014-01-21 03:43:16 +00:00
61cb59e7c7
docs: add standard 'check your docker install' paragraph to the 'hello world' examples.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 76eee50a67732ee18a678ebf54720b78370254df
Component: engine
2014-01-21 03:43:16 +00:00
f8b7a24843
docs: move a sysadmin-focused topic out of the basic usage manual and into installation docs (setting up a user group for non-root access)
...
docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: cf5504eed50f01797646079ab849260ec16cd5a2
Component: engine
2014-01-21 03:43:16 +00:00
3c8e9b6ca8
docs: simplify basic usage doc, step 1: check your docker install
...
docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: cf1781608326e9e3ce090383259bbc26d43c49d6
Component: engine
2014-01-21 03:43:16 +00:00
cbf7c3189e
Remove myself as sole maintainer of api reference docs.
...
Please still ping me before changing APIs :)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 1fe426641d30b5cde4adc826b3112468a4b10559
Component: engine
2014-01-20 18:49:13 -08:00
e4c7dc13cd
Remove Ken from docs maintainers (he's busy on other things)
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 230554695ad083048268cbf0fd1364cabdaddce8
Component: engine
2014-01-20 18:48:59 -08:00
1f774297a3
Reordering to make FAQ last
...
Upstream-commit: 90b52b7e0623271ec0351ffb6dc7a7586bbe6e4d
Component: engine
2014-01-20 17:11:03 -08:00
1665fbf899
Merge pull request #3618 from shykes/docs-cleanup-install
...
Docs cleanup install
Upstream-commit: acf43b4da7c7f81f5774f341828b8b862f204c04
Component: engine
2014-01-20 17:10:02 -08:00
59aa210c0d
Merge pull request #3600 from SvenDowideit/ghost-status-doc
...
Ghost status doc
Upstream-commit: b38d3154c85bf66db7c84df58ce5c24696a841b5
Component: engine
2014-01-20 16:51:47 -08:00
ddaed73849
update todo
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 497e7d651a21fb1fa0d78221c274871a757a1dc0
Component: engine
2014-01-20 16:09:07 -08:00
6ba2547fb5
Merge pull request #3442 from DevTable/master
...
Fix support for registry auth with Dockerfile build.
Upstream-commit: ffe78e82c3e1288285266d9aeae387935b528777
Component: engine
2014-01-20 15:50:14 -08:00
145ef0e1f4
Fix support for registry auth with Dockerfile build.
...
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com > (github: jakedt)
Upstream-commit: 6e6ff85362dfa823c392392cb9e70d620e308911
Component: engine
2014-01-20 18:35:14 -05:00
d34a852586
Merge pull request #3685 from pnasrat/3679-cgroups-outside-lxc
...
Move Resources into exec driver
Upstream-commit: 37c1c7cf7ae2148fc1b87c27f5bc6828787b299b
Component: engine
2014-01-20 15:35:06 -08:00
3f3b1f9fb2
Merge pull request #3684 from crosbymichael/push-multiple-tags
...
Push multiple tags for repository
Upstream-commit: c2501942cfb5a169d40fd6e445e336ac3bc8c303
Component: engine
2014-01-20 15:24:53 -08:00
28daf949e1
docs: reuse official dependencies list from packager's guide for custom binary install docs
...
Upstream-commit: 45e8d1f4c0366c5372229db20b95b70badc92119
Component: engine
2014-01-20 23:17:40 +00:00
aec4036475
docs: remove out-of-date kernel requirements document.
...
Requirements differ from platform to platform depending on the plugins used, and so should be documented separately for each target platform
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 4e54dd245a5e20b86f305ccb8f493d7f17317c50
Component: engine
2014-01-20 23:11:30 +00:00
d1c858864a
docs: instead of a top-level 'upgrading docker' doc, add an 'upgrades' paragraph to each installation target
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: dd786eefbbf286ca57b52374a6905c1ac8b8bd60
Component: engine
2014-01-20 23:11:30 +00:00
