303a954151
Merge pull request #4838 from crosbymichael/btrfs-ftw
...
Promote btrfs
2014-03-27 19:55:25 +02:00
73ee4879af
upstart: use exec here so upstart can monitor the process and not just a shell
...
Docker-DCO-1.1-Signed-off-by: Michael Gorsuch <michael.gorsuch@gmail.com> (github: gorsuch)
2014-03-27 12:44:33 -05:00
ad3e71d5c7
Adjust TestOnlyLoopbackExistsWhenUsingDisableNetworkOption to ignore "DOWN" interfaces
...
This fixes the following, which I've been seeing on all my machines for as long as I can remember:
--- FAIL: TestOnlyLoopbackExistsWhenUsingDisableNetworkOption (0.36 seconds)
container_test.go:1597: Wrong interface count in test container: expected [*: lo], got [1: lo 2: sit0]
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-27 11:06:32 -06:00
79e8ef28e4
Merge pull request #4211 from rhatdan/master
...
Add SELinux support
2014-03-27 10:26:05 -06:00
6c9a47f01c
Update native driver to use labels from opts
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-27 09:04:54 +00:00
bfa2141765
Update lxc to use opts for selinux labels
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-27 08:57:01 +00:00
2d270c4f06
Fix compile and unit test errors after merge
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-27 08:25:01 +00:00
eab56ac007
Merge branch 'master' into pluginflag
...
Conflicts:
pkg/cgroups/cgroups.go
pkg/libcontainer/nsinit/exec.go
pkg/libcontainer/nsinit/init.go
pkg/libcontainer/nsinit/mount.go
runconfig/hostconfig.go
runconfig/parse.go
runtime/execdriver/driver.go
runtime/execdriver/lxc/lxc_template.go
runtime/execdriver/lxc/lxc_template_unit_test.go
runtime/execdriver/native/default_template.go
runtime/execdriver/native/driver.go
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-27 08:00:18 +00:00
097aef2ca9
Fix commit and import when no repository is specified
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-27 04:24:31 +00:00
67af7b3fb0
Strip comments before parsing line continuations
...
Fixes #3898
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-27 02:41:08 +00:00
0fb01fd8fe
Follow symlinks inside container root for build's ADD
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-27 02:07:35 +00:00
4c43566925
This patch adds SELinux labeling support.
...
docker will run the process(es) within the container with an SELinux label and will label
all of the content within the container with mount label. Any temporary file systems
created within the container need to be mounted with the same mount label.
The user can override the process label by specifying
-Z With a string of space separated options.
-Z "user=unconfined_u role=unconfined_r type=unconfined_t level=s0"
Would cause the process label to run with unconfined_u:unconfined_r:unconfined_t:s0"
By default the processes will run execute within the container as svirt_lxc_net_t.
All of the content in the container as svirt_sandbox_file_t.
The process mcs level is based of the PID of the docker process that is creating the container.
If you run the container in --priv mode, the labeling will be disabled.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2014-03-26 15:30:40 -04:00
ab00619c56
Merge pull request #4855 from unclejack/update_release_v0.9.1
...
Update master for release 0.9.1
2014-03-26 11:43:13 -07:00
e7f3234c1e
Fix fish completion when having alias on awk or grep
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-03-26 09:05:21 -07:00
4746c76156
Include contributed completions in ubuntu PPA
...
Docker-DCO-1.1-Signed-off-by: Paul Jimenez <pj@place.org> (github: pjz)
2014-03-26 11:23:26 -04:00
72dc19fd7d
authors update
2014-03-26 10:30:57 -04:00
61f7d967ed
typo fix
2014-03-26 10:24:16 -04:00
baba9cde95
Return error when existing bridge does not match ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-26 11:51:27 +00:00
b2721e05ce
Change version to 0.9.1-dev
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-03-26 00:18:45 +02:00
d36176652e
Bump to version v0.9.1
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Conflicts:
VERSION
2014-03-26 00:18:19 +02:00
5506e4b62d
Merge pull request #4840 from vbatts/vbatts-load_from_input
...
docker load: add --input flag
2014-03-25 14:37:27 -07:00
abef5cb0fc
Merge pull request #4628 from kippandrew/port-allocator
...
Fix port collision with dynamically allocated ports
2014-03-25 14:30:10 -07:00
6643cc20fe
Merge pull request #4794 from alexlarsson/dm-better-shutdown
...
devicemapper: Better/faster shutdown
2014-03-25 14:03:00 -07:00
e99297e4eb
Merge pull request #4842 from pda/installer-devicemapper-comment
...
Update AUFS comment in install.sh
2014-03-25 14:29:46 -06:00
576278102e
install.sh (get.docker.io) aufs comment updated.
...
devicemapper has landed, but the TODO hasn't been actioned presumably
because aufs is still preferred over devicemapper when available[1].
Comment updated accordingly.
Citation [1]: 267ca39921/runtime/graphdriver/driver.go (L40-L46)
2014-03-25 11:33:16 -07:00
2517370088
docker load: added example of a multiple tag image
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-03-25 08:30:59 -04:00
d9c1116303
Merge pull request #4845 from noducks/link_fix
...
Force flag to prevent file already exists error.
2014-03-25 21:03:04 +10:00
8e434c314e
Force flag to prevent file already exists error.
...
Docker-DCO-1.1-Signed-off-by: No Ducks <onemannoducks@gmail.com> (github: noducks)
2014-03-25 10:26:45 +00:00
30d25a3d27
Merge pull request #4814 from noducks/master
...
Reminder for OSX users not to use SUDO
2014-03-25 20:15:39 +10:00
293157b8b3
check if working dir is a directory and raise corresponding errors when making dir.
...
Docker-DCO-1.1-Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com> (github: viirya)
2014-03-25 17:47:08 +08:00
69087f2d23
Reminder for OSX users not to use SUDO
...
Useful for those who haven't made it to the examples page yet. dad4a998dc
2014-03-25 09:42:59 +00:00
a5ccb5b28d
Docker-DCO-1.1-Signed-off-by: Ryan Thomas <rthomas@atlassian.com> (github: rthomas)
2014-03-25 14:45:11 +11:00
c6c7c03cdd
docker load: doc clarification
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-03-24 23:36:07 -04:00
267ca39921
Merge pull request #4839 from bflad/chef-docker-docs
...
Add Chef usage documentation
2014-03-25 12:38:45 +10:00
c84ff187c6
Fix typo in Using Chef documentation description
...
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com> (github: bflad)
2014-03-24 22:29:54 -04:00
84e1fdf35d
docker load: add --input flag
...
for those that do not care to read from redirected stdin
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-03-24 21:43:26 -04:00
bb034c6b42
Add Chef usage documentation
...
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com> (github: bflad)
2014-03-24 21:39:15 -04:00
0b2b5a594b
Merge pull request #4786 from SvenDowideit/run--lxc-conf-is-lxc-driver-only-atm
...
add a note that --lxc-conf is lxc-driver only.
2014-03-25 11:21:06 +10:00
4585d2da3e
Merge pull request #4751 from enokd/master
...
Fixes #3369 Repeated slash-'/' characters; harmonize across all name-related commands
2014-03-24 17:43:02 -07:00
e1035535ec
Merge pull request #4837 from crosbymichael/remove-ci
...
Remove docker-ci code from the repo
2014-03-24 18:01:26 -06:00
a258d048a2
Merge pull request #4778 from vbatts/vbatts-save_to_output
...
`docker save --output` flags
2014-03-24 16:52:08 -07:00
c3ff1f41bb
Merge pull request #4835 from crosbymichael/reverst-stop-kill
...
Revert back to the default stop functionality of SIGKILL after timeout
2014-03-24 16:33:38 -07:00
dece260f3a
Merge pull request #4832 from LK4D4/fix_events_hanging_#4804
...
Workaround for hanging events. Fixes #4804
2014-03-24 16:26:50 -07:00
c7540b3e94
Workaround for hanging events. Fixes #4804
...
Docker-DCO-1.1-Signed-off-by: LK4D4 <lk4d4math@gmail.com> (github: LK4D4)
2014-03-24 22:31:32 +04:00
68dd722e3c
Promote btrfs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-24 14:15:04 +00:00
f41135bc11
As far as I know this code is not used or maintained
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-24 12:39:56 +00:00
d503714285
Revert "Disable automatic killing of containers when docker stop fails"
...
This reverts commit 8b5cf51d60
2014-03-24 12:03:56 +00:00
f1bd79ec97
Revert "fix failing test to use kill instead of stop"
...
This reverts commit 4434dcee89
2014-03-24 12:03:41 +00:00
10fdbc0467
Add unit test for lxc conf merge and native opts
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-24 07:16:40 +00:00
9a7be1b015
Add cpuset.cpus to cgroups and native driver options
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-24 05:33:11 +00:00
unclejack
Michael Gorsuch
Tianon Gravi
Michael Crosby
Dan Walsh
Guillaume J. Charmes
Guillaume J. Charmes
Paul Jimenez
Justin Simonelis
Justin Simonelis
unclejack
Victor Vieux
Paul Annesley
Vincent Batts
Sven Dowideit
noducks
viirya
Ryan Thomas
Brian Flad
Michael Crosby
LK4D4