clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,105 Commits 9 Branches 112 Tags
eab56ac007b263708b5526609c8be2bc19881467
Commit Graph
7105 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby 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
unclejack 5b9c8607d9 Merge pull request #4759 from crosbymichael/comments-in-buildfile 
Strip comments before parsing line continuations
 2014-03-28 11:16:32 +02:00
unclejack 10b7ae39b9 Merge pull request #4880 from tianon/ignore-down-interfaces 
Adjust TestOnlyLoopbackExistsWhenUsingDisableNetworkOption to ignore "DOWN" interfaces
 2014-03-28 10:54:11 +02:00
unclejack 0fb8146afa Merge pull request #4889 from crosbymichael/fix-commit-validation 
Fix commit and import when no repository is specified
 2014-03-28 10:25:21 +02:00
Victor Vieux d2327006d6 Merge pull request #4442 from ibuildthecloud/hairpin-nat 
Support hairpin NAT without going through docker server
 2014-03-27 18:09:42 -07:00
unclejack 69ba31e17e Merge pull request #4450 from alexlarsson/cgroups-systemd 
Add systemd implementation of cgroups
 2014-03-28 03:05:02 +02:00
Guillaume J. Charmes 45b43d85ec Merge pull request #4873 from crosbymichael/add-internal-symlinks 
Follow symlinks inside container root for build's ADD
 2014-03-27 15:46:48 -07:00
Guillaume J. Charmes d848e2d113 Merge pull request #4871 from crosbymichael/bip-exists 
Return error when existing bridge does not match ip
 2014-03-27 14:51:21 -07:00
Alexander Larsson 6c7835050e cgroups: Add systemd implementation of cgroups 
This implements cgroup.Apply() using the systemd apis.
We create a transient unit called "docker-$id.scope" that contains
the container processes. We also have a way to set unit specific
properties, currently only defining the Slice to put the
scope in.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-27 22:44:31 +01:00
Alexander Larsson 1296d5ce9a Add systemd.SdBooted() 
This is a conversion of sd_booted() from libsystemd to go and checks
if the system was booted with systemd.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-27 22:44:31 +01:00
Alexander Larsson cb43fd0071 pkg/systemd: Drop our copy-pasted version of go-systemd/activation 
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-27 22:44:31 +01:00
Alexander Larsson d4725801b3 Vendor github.com/godbus/dbus and github.com/coreos/go-systemd 
We need this to do systemd API calls.

We also add the static_build tag to make godbus not use
os/user which is problematic for static builds.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-27 22:44:26 +01:00
Alexander Larsson 9294d7f2af cgroups: Join groups by writing to cgroups.procs, not tasks 
cgroups.procs moves all the threads of the process, and "tasks" just
the one thread. I believe there is a risk that we move the main thread,
but then we accidentally fork off one of the other threads if the go
scheduler randomly switched to another thread. So, it seems safer (and
more correct) to use cgroups.procs.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-27 21:47:47 +01:00
Alexander Larsson 7f7d8419a7 cgroups: Splity out Apply/Cleanup to separate file/interface 
This leaves only the generic cgroup helper functions in cgroups.go and
will allow easy implementations of other cgroup managers.

This also wires up the call to Cleanup the cgroup which was missing
before.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-27 21:47:47 +01:00
Alexander Larsson 7a3070a600 Add --opt arguments for drivers 
In order to handle special configuration for different drivers we
make the Config field a map to string array. This lets
us use it for lxc, by using the "lxc" key for those, and we can
later extend it easily for other backend-specific options.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-27 21:47:47 +01:00
Tianon Gravi be5c65c2a2 Merge pull request #4613 from tianon/add-cgroupfs-mention-to-packagers 
Add mention of mounting cgroupfs properly to PACKAGERS.md
 2014-03-27 13:26:31 -06:00
Tianon Gravi 94538fe022 Merge pull request #4865 from creack/fix_fish_completion 
Fix fish completion when having alias on awk or grep
 2014-03-27 13:07:11 -06:00
Michael Crosby ba9f9b3c92 Merge pull request #4818 from viirya/fix_working_dir_not_dir 
fix the problem when setting existing file as working dir
 2014-03-27 11:41:18 -07:00
Tianon Gravi db20cb0e1a Merge pull request #4879 from gorsuch/exec-upstart 
Use "exec" in the upstart script to let upstart manage the docker process instead of a shell
 2014-03-27 12:15:30 -06:00
unclejack 303a954151 Merge pull request #4838 from crosbymichael/btrfs-ftw 
Promote btrfs
 2014-03-27 19:55:25 +02:00
Michael Gorsuch 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
Tianon Gravi 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
Tianon Gravi 79e8ef28e4 Merge pull request #4211 from rhatdan/master 
Add SELinux support
 2014-03-27 10:26:05 -06:00
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Dan Walsh 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
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Michael Crosby 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
unclejack 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
unclejack 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
Victor Vieux 5506e4b62d Merge pull request #4840 from vbatts/vbatts-load_from_input 
docker load: add --input flag
 2014-03-25 14:37:27 -07:00
Victor Vieux abef5cb0fc Merge pull request #4628 from kippandrew/port-allocator 
Fix port collision with dynamically allocated ports
 2014-03-25 14:30:10 -07:00
Victor Vieux 6643cc20fe Merge pull request #4794 from alexlarsson/dm-better-shutdown 
devicemapper: Better/faster shutdown
 2014-03-25 14:03:00 -07:00
Tianon Gravi e99297e4eb Merge pull request #4842 from pda/installer-devicemapper-comment 
Update AUFS comment in install.sh
 2014-03-25 14:29:46 -06:00
Paul Annesley 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]: https://github.com/crosbymichael/docker/blob/267ca39921c35826ccbdb84fbbc0690bfef385d7/runtime/graphdriver/driver.go#L40-L46

Docker-DCO-1.1-Signed-off-by: Paul Annesley <paul@annesley.cc> (github: pda)
 2014-03-25 11:33:16 -07:00
Vincent Batts 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
Sven Dowideit 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
noducks 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
Sven Dowideit 30d25a3d27 Merge pull request #4814 from noducks/master 
Reminder for OSX users not to use SUDO
 2014-03-25 20:15:39 +10:00
viirya 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
noducks 69087f2d23 Reminder for OSX users not to use SUDO 
Useful for those who haven't made it to the examples page yet. https://github.com/chadoh/docker/commit/dad4a998dc716e506c874ce0e792989b9df28748

Docker-DCO-1.1-Signed-off-by: No Ducks <onemannoducks@gmail.com> (github: noducks)
 2014-03-25 09:42:59 +00:00
Vincent Batts 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
Sven Dowideit 267ca39921 Merge pull request #4839 from bflad/chef-docker-docs 
Add Chef usage documentation
 2014-03-25 12:38:45 +10:00
Brian Flad 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
Vincent Batts 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
Brian Flad 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
Sven Dowideit 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
Michael Crosby 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