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
639d2ecd4f
Merge pull request #3682 from alexlarsson/implement-tar
...
Implement tar in Go
2014-01-22 11:23:47 -08:00
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
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
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
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
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
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
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
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
cb33f739a1
Merge pull request #3705 from crosbymichael/fix-die-event
...
Fix die command when monitor returns
2014-01-21 17:13:29 -08:00
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
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
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
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
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
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
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
be6aeda1e4
Merge pull request #3640 from proppy/networkgetroutes-add-default
...
netlink: add default Route to NetworkGetRoutes
2014-01-21 15:20:16 -08:00
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
62c4563987
Merge pull request #3688 from shykes/docs-simplify-basic-usage
...
Simplify basic usage docs
2014-01-21 11:41:32 -08:00
e56562c35e
Merge pull request #3566 from tianon/fix-volume-symlinks
...
Fix symlink mounting issues
2014-01-21 11:37:05 -08:00
9164ba6516
Merge pull request #3686 from vieux/load_job
...
Load job
2014-01-21 11:29:15 -08:00
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
ba4ae40445
Merge pull request #3690 from shykes/cleanup-maintainers
...
Cleanup maintainers
2014-01-21 11:18:23 -08:00
f98a596be9
Merge pull request #3698 from alexlarsson/fix-shared-root
...
Fix handling of shared roots
2014-01-21 11:09:36 -08:00
fb919137be
Merge pull request #3687 from shykes/docs-intro
...
docs: harmonize intro paragraph with website
2014-01-21 11:02:55 -08:00
31274ffccb
Merge pull request #3700 from jamtur01/fixedtoc
...
Fixed commandline/index warning in TOC
2014-01-21 10:52:13 -08:00
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
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
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
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
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
787ff55283
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)
2014-01-21 14:22:47 +01:00
da4ba80733
mkimage-arch: don't generate ISO-8859-1 locale
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:22:39 +01:00
c6535d272c
mkimage-arch: unify usage of brackets around variables
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:22:33 +01:00
a4e6e9bd41
mkimage-arch: remove $DEV instead of renaming it
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:22:26 +01:00
c138c335a5
mkimage-arch: use mktemp to create ROOTFS directory
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:21:43 +01:00
f918fca3bf
archive: Always end directory filenames in tars with /
...
This matches what tar does, and without it the tarsum created
by the registry will not match the docker one.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-21 12:52:05 +01:00
bde2d3aef7
integration: Fix TestGetContainersExport
...
The tar changes made the name of the file in the tar archive
change from "./test" to "test", update the test to the new name.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-21 10:41:08 +01:00
08ab554195
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)
2014-01-21 10:22:13 +01:00
fdf43f5de1
docs: harmonize intro paragraph with website
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 07:33:26 +00:00
ae2af201f3
Docs: fix capitalization of "Docker"
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 07:27:55 +00:00
b78ae3b652
Re-add Flavor to KernelVersionInfo
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-20 21:26:23 -08:00
5b97e00438
Use Sscanf instead of regexp
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-20 21:02:37 -08:00
d16691e3ad
- Ajusted server.go with gofmt
...
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com > (github: rogaha)
2014-01-21 04:11:40 +00:00
2cfd696b9b
Added missing attributes to api search calls:
...
- Added an argument to the call() method in order to control the auth sharing
- Enabled it only for search. Pulls and pushes were enabled already.
- Grouped a few variable declarations
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com > (github: rogaha)
2014-01-21 04:06:19 +00:00
14b2b2b7c2
Fix apparent typo
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-20 19:49:40 -08:00
d2c9c1036b
Remove Flavor from KernelVersionInfo
...
Also change to parsing it with regexp to keep things simple.
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-20 19:49:39 -08:00
fc30346086
Add failing test for odd kernel version
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-20 19:49:39 -08:00
Guillaume J. Charmes