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
10,562 Commits 9 Branches 112 Tags
ad65930d0bda1026a02efd18e9f6c70dfdae4fb6
Commit Graph
10562 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianon Gravi 651f521e17 Merge pull request #7632 from erikh/fix_check_config 
fix check-config.sh to check for CGROUP_PERF
 2014-08-22 11:42:08 -05:00
Victor Vieux 094cd7040b Merge pull request #7638 from vivekdasgupta/minor-fixes 
Fix data space reporting from Kb/Mb to KB/MB
 2014-08-22 11:40:49 -05:00
Victor Vieux bd7c7febb9 Merge pull request #7668 from docker/merge_release_v1.2.0 
Merge release v1.2.0
 2014-08-22 11:18:48 -05:00
Erik Hollensbe 01094c1568 Fix multiple attach test. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-22 03:58:05 -07:00
Victor Vieux 61b309f0d2 Change version to 1.2.0-dev 2014-08-21 15:55:00 -04:00
Victor Vieux 380aef2dc1 Merge remote-tracking branch 'origin/release' 2014-08-21 15:54:02 -04:00
Dan Walsh 61b129d818 --help option and help command should print to stdout not stderr 
--help and help are successful commands so output should not go to error.

QE teams have requested this change, also users doing docker help | less
or docker run --help | less would expect this to work.

Usage statement should only be printed when the user asks for it.
Errors should print error message and then suggest the docker COMMAND --help
command to see usage information.

The current behaviour causes the user to have to search for the error message
and sometimes scrolls right off the screen.  For example a error on a
"docker run" command is very difficult to diagnose.

Finally erros should always exit with a non 0 exit code, if the user
makes a CLI error.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2014-08-21 15:35:20 -04:00
Victor Vieux 7649264eb8 Merge pull request #7644 from vieux/bump_v1.2.0 
Bump v1.2.0
 2014-08-21 14:32:00 -05:00
Hollie Teal c87d9a1de6 Clean up typos in hub_registry_spec.md 
Couple of instances of incorrect articles (e.g. "an Docker Hub").
 2014-08-21 11:04:25 -07:00
Vivek Dasgupta a327d9b91e Fix data space reporting from Kb/Mb to KB/MB 
Docker-DCO-1.1-Signed-off-by: Vivek Dasgupta <vdasgupt@redhat.com> (github: vivekdasgupta)
 2014-08-21 21:03:44 +05:30
limsy 239e932485 daemon: rename from "delete" job to "rm" 
This commit fixes following FIXMEs:

// FIXME: rename "delete" to "rm" for consistency with the CLI command
// FIXME: rename ContainerDestroy to ContainerRm for consistency with the CLI command

Signed-off-by: lim seong yeol <seongyeol37@gmail.com>
 2014-08-21 19:58:26 +09:00
dragon788 27f44b9bb1 Add link to Ubuntu notes about LTSEnablementStack 
When running Ubuntu with a graphical environment, the kernel version MUST match the Xorg version. Only installing the suggested packages above breaks Unity for anything other than 2D mode (in VMware and probably native).
Signed-off-by: Ethan Spoelstra <ewspoelstra@computerphreaks.com>
 2014-08-20 22:23:34 -05:00
Victor Vieux fa7b24f2c3 Bump version to v1.2.0 
Signed-off-by: Victor Vieux <vieux@docker.com>
v1.2.0 		2014-08-20 21:11:18 +00:00
Victor Vieux 380129d0d7 Merge remote-tracking branch 'origin/master' into bump_v1.2.0 
Conflicts:
	VERSION
	daemon/container.go
	daemon/daemon.go

Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-08-20 20:19:03 +00:00
Tianon Gravi 78c6882567 Optionalize the "hg clone" of Go, since it takes forever (now, to update our Go version too, we need to explicitly "./hack/vendor.sh --go") 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-08-20 14:17:11 -06:00
Victor Vieux b1d20c483a Merge pull request #7648 from crosbymichael/update-libcontainer-aug5 
Update libcontainer to db65c35051d05f3fb218a0e84a1
 2014-08-20 15:15:23 -05:00
James Turnbull 997336fd95 Merge pull request #7634 from krrg/patch-1 
Update openSUSE installation instructions
 2014-08-20 14:46:41 -04:00
Michael Crosby 624b944896 Update libcontainer to db65c35051d05f3fb218a0e84a1 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-20 11:19:55 -07:00
Eric Windisch cd71f92a7f Add Eric Windisch to MAINTAINER for tarsum 
This code is vital to the security of the project and it is important
we assure it is well-maintained and guarded.

I am vested in assuring this code maintains security and
provides as much compatibility as possible between releases.

Signed-off-by: Eric Windisch <eric@windisch.us>
 2014-08-20 11:19:46 -07:00
Joffrey F 2eb26991f4 Merge pull request #7495 from sontags/enable_search_on_private_reg 
Enable `docker search` on private docker registry.
 2014-08-20 18:10:29 +02:00
Alexandr Morozov f04ef96e07 Test for following logs for stopped container 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-20 20:02:56 +04:00
Victor Vieux 94fbcea7a3 Merge pull request #5129 from vieux/host_resolv 
allow /etc/hosts /etc/resolv.conf and /etc/hostname to be changed
 2014-08-20 11:02:36 -05:00
Erik Hollensbe ce3c1f376c fix check-config.sh to check for CGROUP_PERF 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-20 13:37:39 +00:00
James Turnbull 494bea9fba Merge pull request #7633 from fredlf/root_builder_warning 
Added warning re: using root for dockerfile root. Fixes #7612
 2014-08-20 08:02:38 -04:00
James Turnbull 0d26b7cc6d Merge pull request #7635 from bfirsh/docs-https-newsletter-url 
Use HTTPS for newsletter signup form
 2014-08-20 08:01:27 -04:00
James Turnbull 9faf0254ef Merge pull request #7640 from xiaods/develop 
Cleanup: correct cli --volumes-from description
 2014-08-20 08:01:05 -04:00
Deshi Xiao 4d0b88c52f Cleanup: correct cli --volumes-from description 
issue #7580 volumes-from comma separated list mentioned this case.

Options like --volumes-from=[] indicate they can be specified multiple times:
docker run -it --rm --volumes-from TEST_DATA --volumes-from TEST_DATA2 ubuntu bash

Signed-off-by: Deshi Xiao <dxiao@redhat.com>
 2014-08-20 16:31:04 +08:00
Fred Lifton 98dd982586 Fixed a typo and added a bit based on Sven's feedback 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2014-08-19 17:22:11 -07:00
Ben Firshman 8c7915fcde Use HTTPS for newsletter signup form 
This is causing an insecure HTTPS error in Chrome 37.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-19 15:39:37 -07:00
krrg 05a09675c3 Update openSUSE installation instructions 
Out of box, the 'sudo' command on openSUSE does not work similarly to other distros.  In this case, the path to usermod should be explicitly given, since /usr/sbin, where usermod is located, is not on the sudoing user's PATH.  The other sudo commands here should be fine.
 2014-08-19 16:03:51 -06:00
Fred Lifton b63c10558e Added warning re: using root for dockerfile root. Fixes #7612 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2014-08-19 13:39:50 -07:00
Victor Vieux d4c2d0c57f Merge pull request #7608 from LK4D4/remove_internet_dep 
Remove internet dependency from TestBuildCacheADD
 2014-08-19 14:13:52 -05:00
Alexandr Morozov badf8247af Fix logs -f hanging on stopped containers 
Fixes #7020

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-19 22:23:02 +04:00
Vincent Batts 487af281bf Merge pull request #7602 from unclejack/tarsum_garbage_reduction 
pkg/tarsum: avoid buf2 allocation in Read
 2014-08-19 13:50:15 -04:00
Michael Crosby 7db55a1807 Merge pull request #7613 from VojtechVitek/godoc_travis 
Add GoDoc and Travis build link/images to README
 2014-08-19 12:21:05 -05:00
Fred Lifton abc1346777 Merge pull request #7604 from SvenDowideit/docs-update 
update the cli / man page docs based on what is in master right now
 2014-08-19 10:12:50 -07:00
Tibor Vass 39bcc3a3e5 Merge pull request #7628 from crosbymichael/fix-search-test 
Fix search test for busybox image
 2014-08-19 12:11:29 -05:00
Victor Vieux 26feb09fac add small doc 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-08-19 17:06:17 +00:00
Victor Vieux fc39f9c78d add tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-08-19 17:06:17 +00:00
Victor Vieux f3b2c93b9f allow /etc/hosts /etc/resolv.conf and /etc/hostname to be changed 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-08-19 17:06:17 +00:00
Michael Crosby dad2fcb199 Fix search test for busybox image 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-19 09:52:46 -07:00
Rajdeep Dua 0800f8cc19 Added Test case for Engine shutdown 
Docker-DCO-1.1-Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com> (github: rajdeepd)
 2014-08-19 04:59:13 -07:00
Sven Dowideit 366fe67946 Merge pull request #7610 from remram44/patch-1 
Fixes "note" blockquote too long [doc, minor]
 2014-08-19 09:11:15 +10:00
Vojtech Vitek (V-Teq) 7cb6871355 Add GoDoc and Travis build link/images to README 
Signed-off-by: Vojtech Vitek (V-Teq) <vvitek@redhat.com>
 2014-08-19 01:08:47 +02:00
Remi Rampin 99082de9ad Fixes "note" blockquote too long [doc, minor] 
A "note" block includes too much text, so if you skip over it the next paragraph makes zero sense.
 2014-08-18 15:31:37 -04:00
Michael Crosby 37db53bf7a Merge pull request #7597 from crosbymichael/update-libcontainer-aug4 
Update libcontainer to 29363e2d2d7b8f62a5f353be333
 2014-08-18 12:24:17 -05:00
Alexandr Morozov 075e1bc1c3 Remove internet dependency from TestBuildCacheADD 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-18 14:13:43 +04:00
SvenDowideit 018e75a6e4 update the cli / man page docs based on what is in master right now 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-08-18 09:31:58 +10:00
unclejack 55533693be pkg/tarsum: avoid buf2 allocation in Read 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-08-17 14:45:11 +03:00
Daniel Menet c1ee94a343 resolved merge conflict 
Signed-off-by: Daniel Menet <membership@sontags.ch>
 2014-08-16 14:29:15 +02:00