beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
7066 commits 14 branches 412 tags 338 MiB
Commit graph

7066 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
79e8ef28e4 Merge pull request #4211 from rhatdan/master 
Add SELinux support
 2014-03-27 10:26:05 -06: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
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]: 267ca39921/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. dad4a998dc

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
Tianon Gravi
e1035535ec Merge pull request #4837 from crosbymichael/remove-ci 
Remove docker-ci code from the repo
 2014-03-24 18:01:26 -06:00
Michael Crosby
a258d048a2 Merge pull request #4778 from vbatts/vbatts-save_to_output 
`docker save --output` flags
 2014-03-24 16:52:08 -07:00
Guillaume J. Charmes
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
Michael Crosby
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
LK4D4
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
d503714285 Revert "Disable automatic killing of containers when docker stop fails" 
This reverts commit 8b5cf51d60.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-24 12:03:56 +00:00
Michael Crosby
f1bd79ec97 Revert "fix failing test to use kill instead of stop" 
This reverts commit 4434dcee89.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-24 12:03:41 +00:00
Michael Crosby
5294bf7e67 Merge pull request #4775 from LK4D4/remove_duplicate_dns_#4714 
Remove duplication of Dns in config merging.
 2014-03-21 17:08:06 -07:00
Victor Vieux
97e5295f43 Merge pull request #4800 from vieux/rename_network_driver 
rename lxc to bridge
 2014-03-21 16:52:40 -07:00
Michael Crosby
de450b23be Merge pull request #4761 from ichik1/fix-display-of-since-time-exit 
Fix since time exit display when s.FinishedAt is zero
 2014-03-21 16:48:30 -07:00
Tianon Gravi
708ecd7da2 Add mention of mounting cgroupfs properly to PACKAGERS.md 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-03-21 14:17:09 -06:00
Ken ICHIKAWA
4002eac8b8 Fix since time exit display when s.FinishedAt is zero 
When s.FinishedAt is zero, the since time exit in docker ps doesn't display correct time.
For example
```
Exited (0) 292.471209 years ago
```
This patch fixes the since time exit to display nothing if s.FinishedAt is zero.

Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
 2014-03-21 15:28:02 +09:00
Victor Vieux
69db806542 Merge pull request #4518 from tianon/sync-DCO-with-developercertificate.org 
Resync the DCO text with upstream at http://developercertificate.org/
 2014-03-20 23:07:08 -07:00
Sven Dowideit
14502f0f1c Merge pull request #4803 from alambike/patch-1 
Added Eixo::Docker to the list of libraries
 2014-03-21 12:49:51 +10:00
alambike
79c11b19ec Added Eixo::Docker to the list of libraries 
Docker-DCO-1.1-Signed-off-by: Javier Gómez <alambike@gmail.com> (github: alambike)
 2014-03-21 03:13:06 +01:00
Sven Dowideit
8329cd55e1 Merge pull request #4796 from cpuguy83/fix_single_dash_args_in_dcs 
Fix double single dash arg issues in docs
 2014-03-21 11:18:21 +10:00
Djibril Koné
43c3ee3ba1 Harmonize / across all name-related commands/Validate images names 
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com> (github: enokd)
 2014-03-21 00:40:58 +01:00
Victor Vieux
8944fb2e9b rename lxc to bridge 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-20 21:51:28 +00:00