clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-21 13:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,957 Commits 9 Branches 112 Tags
88df052197fc16f578ed0551ad654dd67bb3a39a
Commit Graph

4957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guillaume J. Charmes 88df052197 Merge pull request #3098 from creack/bump_v0.7.1 
Bump v0.7.1
v0.7.1 		2013-12-06 14:42:14 -08:00
Victor Vieux f28445254f disable progressbar in non-terminal 2013-12-06 14:15:40 -08:00
Victor Vieux 0969be5ddb update doc 2013-12-06 14:15:40 -08:00
Victor Vieux 95c0ade04b fix jsonmessage in build 2013-12-06 14:15:40 -08:00
Tianon Gravi e01732f857 Revert "Add cgroup-bin dependency to our Ubuntu package" 
This reverts commit c81bb20f5b.

After re-reading the documentation: "The Recommends field should list packages that would be found together with this one in all but unusual installations."

Thus, "Recommends" is an acceptable place for this dep, and anyone disabling that gets to keep the pieces.

The main crux of why this needs to be reverted is because it breaks Debian completely because "lxc" and "cgroup-bin" can't be installed concurrently.
 2013-12-06 14:15:40 -08:00
Guillaume J. Charmes bc9b239d74 Merge pull request #3081 from creack/bump_0.7.1 
Bump to 0.7.1
 2013-12-05 17:19:06 -08:00
Guillaume J. Charmes e39d35deda Bump to 0.7.1 2013-12-05 16:49:39 -08:00
Guillaume J. Charmes de090116dd Merge branch 'master' into release 
Conflicts:
	commands.go
 2013-12-05 16:40:24 -08:00
Guillaume J. Charmes 4acd579226 Merge pull request #3078 from crosbymichael/remove-name-if-not-exist 
If container does not exist try to remove the name and continue
 2013-12-05 16:41:43 -08:00
Victor Vieux c764fb0c29 Merge pull request #3006 from tianon/ubuntu-cgroup-bin 
Add cgroup-bin dependency to our Ubuntu package
 2013-12-05 16:41:01 -08:00
Victor Vieux 7a87023587 Merge pull request #2955 from crosbymichael/search-name-first 
Search for repo first before image id
 2013-12-05 16:16:55 -08:00
Tianon Gravi 584164177e Merge pull request #2358 from tianon/mkimage-rinse 
Remove mkimage-centos.sh in favor of a new rinse-based script...
 2013-12-05 16:07:59 -08:00
Victor Vieux 35e80868ad Merge pull request #3004 from tianon/shebang-bash 
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
 2013-12-05 16:04:09 -08:00
Tianon Gravi 2acea6090f Merge pull request #2983 from tianon/udev 
Add udev rules files for hiding the docker loopback devices from udisks
 2013-12-05 16:01:04 -08:00
Andy Rothfusz 81b25fde79 Merge pull request #3065 from SvenDowideit/use-makefile-in-devenv-documentation 
use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes
 2013-12-05 15:27:36 -08:00
Andy Rothfusz 0189a99471 Merge pull request #3062 from SvenDowideit/cli-examples-dollar-sudo-docker 
Some examples didnt use $ sudo docker, so this makes it a little more consistent
 2013-12-05 15:25:09 -08:00
Michael Crosby 7bf3a07371 If container does not exist try to remove the name and continue 2013-12-05 15:22:21 -08:00
Andy Rothfusz 9320f4e2d1 Merge pull request #3061 from shykes/sven-doc-maintainers 
Add Sven Dowideit to docs maintainers
 2013-12-05 15:17:34 -08:00
Guillaume J. Charmes d1a4f83e5e Merge pull request #3075 from dotcloud/pull_layers 
Wait on pull from another client
 2013-12-05 14:47:39 -08:00
Victor Vieux fb810b54ff wait on pull from another client 2013-12-05 14:41:56 -08:00
Michael Crosby 06379d8bd9 Merge pull request #2992 from jpoimboe/bridge-create-ioctl 
Create the bridge device with ioctl
 2013-12-05 14:40:03 -08:00
Andy Rothfusz a96bf74397 include Red Hat Enterprise, should have part of #3011 
oops, forgot the index!
 2013-12-05 14:34:10 -08:00
Andy Rothfusz cc0466bb68 Merge pull request #3011 from goldmann/rhel_instructions 
Instructions on how to install Docker on Red Hat Enterprise Linux / CentOS
 2013-12-05 14:30:31 -08:00
Andy Rothfusz 0a7e0f0819 Merge pull request #3034 from rogaha/fix_doc_registry_index_spec 
- Updated the doc according to the current implementation status
 2013-12-05 14:24:13 -08:00
Guillaume J. Charmes ef157cee30 Merge pull request #3074 from crosbymichael/dm-history-calc 
Save layersize on pull
 2013-12-05 14:13:03 -08:00
Michael Crosby 697707e4af Save layersize on pull 
Do not display size and virtual size on the cli.
Only display virtual size on the cli
 2013-12-05 14:03:23 -08:00
Andy Rothfusz e3c3f3c324 Merge pull request #3010 from SvenDowideit/origin/docker-ps-linked-container-alias-example 
add an example of docker ps, and also of link aliases
 2013-12-05 14:00:53 -08:00
Guillaume J. Charmes 797bac2344 Merge pull request #3057 from crosbymichael/test-cpu-share 
Move test cpu shares out of test start
 2013-12-05 13:58:01 -08:00
Josh Poimboeuf 7a94cdf8ed create the bridge device with ioctl 
On RHEL 6, creation of a bridge device with netlink fails.  Use the more
backward-compatible ioctl instead.  This fixes networking on RHEL 6.
 2013-12-05 15:32:15 -06:00
Guillaume J. Charmes 1525f71b5a Merge pull request #3016 from pnasrat/3014-clarify-maintainer-process 
Add a proposal step for potential MAINTAINERS.
 2013-12-05 11:28:30 -08:00
Guillaume J. Charmes 4188cd6bcd Merge pull request #3024 from jamtur01/ubunturepo 
Added note about Ubuntu curl installation
 2013-12-05 11:27:46 -08:00
Andy Rothfusz e304e8936b Merge pull request #3038 from SvenDowideit/2485-ambassador-pattern-doc 
initial stab at writing a use/ambassador-pattern howto
 2013-12-05 11:01:27 -08:00
Guillaume J. Charmes 066b961a0c Merge pull request #3060 from dotcloud/sd_notify 
sd_notify ready status when accepting API requests
 2013-12-05 10:33:29 -08:00
Victor Vieux a8e99d9235 Merge pull request #2917 from codeaholics/2698-only-tag-top-layer 
Only tag the top-most layer when pushing to a registry
 2013-12-05 10:02:57 -08:00
Sven Dowideit e9bf971e69 use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes 2013-12-05 21:48:35 +10:00
Roberto Gandolfo Hashioka 909da5d524 - Added link to the source code repo on github 2013-12-04 21:08:44 -08:00
Sven Dowideit af020e2d67 I was reading the doc, and noticed that some examples didnt use $ sudo docker, so this makes it a little more consistent 2013-12-05 14:14:08 +10:00
Andy Rothfusz 94d46a8d3a Merge pull request #2991 from fortybillion/patch-1 
API documentation: added format of Volumes and Binds parameters to "create" and "start"
 2013-12-04 18:32:19 -08:00
Andy Rothfusz ec9f2f1d0f Merge branch '2971-cleanconflicts' 2013-12-04 18:26:45 -08:00
Andy Rothfusz 0bfa22124e Merge branch 'pgdoc' of github.com:jamtur01/docker into 2971-cleanconflicts 
Conflicts:
	docs/sources/examples/postgresql_service.rst
 2013-12-04 18:25:58 -08:00
Victor Vieux 79031c4f8c Merge pull request #2907 from goldmann/iptables-fix 
Make sure the firewall rules are created even if the bridge interface is already created
 2013-12-04 18:04:57 -08:00
Victor Vieux 5f55c1aee1 Merge pull request #2966 from andrewsmedina/govet2 
fixed some `go vet` issues.
 2013-12-04 17:57:10 -08:00
Solomon Hykes b4e21ad1da Add Sven Dowideit to docs maintainers 2013-12-04 17:50:33 -08:00
Victor Vieux 97088ebef7 sd_notify ready status when accepting API requests 2013-12-04 17:50:20 -08:00
Solomon Hykes c35cebaa06 Merge pull request #3031 from jamtur01/docsmaintain 
Add James Turnbull to docs maintainers
 2013-12-04 17:48:45 -08:00
Victor Vieux 41b5e87873 Merge pull request #2993 from jpoimboe/rhel6-version-check 
remove kernel version warning on rhel 6.5
 2013-12-04 17:46:20 -08:00
Andy Rothfusz 9dfc7bc36f Merge pull request #2834 from fj/topic/clarify-aws-instructions 
Fix installing-on-AWS workflow description
 2013-12-04 17:25:35 -08:00
Guillaume J. Charmes afbea3f13f Merge pull request #3058 from dotcloud/add_stderr_hijack 
fix docker run -a stderr
 2013-12-04 17:16:56 -08:00
Andy Rothfusz 5dab47a475 Merge pull request #2886 from jamtur01/fedora_community 
Updated Fedora docs
 2013-12-04 17:12:00 -08:00
Victor Vieux 3ba279a370 fix docker run -a stderr 2013-12-04 17:08:14 -08:00