clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 00:50:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,185 Commits 9 Branches 112 Tags
b0edced87f2a9bd2e85b0a59f6a6c83aff36e445
Commit Graph
10185 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
SvenDowideit b0edced87f Fix the other API docs to use an array of key/values 
as per #7706

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-08-26 11:36:25 +10:00
getvictor 216ab880f9 Updating LxcConf to match Docker command line 
I've changed LxcConf on a previous API document. Not sure why it keeps getting changed back. I'm seeing Docker 1.2.0 command-line calls are still using the array of key/values.

Docker-DCO-1.1-Signed-off-by: getvictor <victor@victoreda.com> (github: SvenDowideit)
 2014-08-26 11:36:25 +10:00
Sven Dowideit a05d8d4f4f Merge pull request #7733 from Djelibeybi/oraclelinux-docs 
Oracle Linux docs
 2014-08-25 18:14:36 -07:00
Avi Miller fcad8ee83a Add Oracle Linux specific documentation for installation of Docker from Oracle Linux repositories on Oracle Linux 6 and 7. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2014-08-26 11:10:09 +10:00
Sven Dowideit 849086d3d9 Merge pull request #7732 from SvenDowideit/ubuntu-backported-kernel 
Ubuntu backported kernel
 2014-08-25 17:16:34 -07:00
SvenDowideit 93d574298d small word change 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-08-26 10:15:12 +10:00
Sven Dowideit 97c7b0115b Merge pull request #7603 from kuon/centos7 
Added manual installation instruction for Centos7 and note about firewalld.
 2014-08-25 16:49:09 -07:00
Michael Crosby b0abd6de63 Merge pull request #7574 from crosbymichael/update-restart-docs 
Update flag usages and docs for max restart count
 2014-08-25 16:26:06 -07:00
Michael Crosby 2bdfbab23d Merge pull request #7622 from rajdeepd/master 
Added Test case for Engine shutdown
 2014-08-25 15:57:11 -07:00
Michael Crosby 228eda4fd5 Merge pull request #7629 from LK4D4/fix_follow_hang_on_stop 
Fix logs -f hanging on stopped containers
 2014-08-25 15:24:20 -07:00
Michael Crosby 7556a42453 Merge pull request #7716 from coolljt0725/master 
Fix the bug of docker import command when import a image with a tag use format 'URL|- [REPOSITORY[:TAG]]'
 2014-08-25 15:11:50 -07:00
Lei Jitang 7e72ed70f9 add docker import test with a tag. Fixes #7714 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2014-08-26 15:51:22 +08:00
Lei Jitang 79cf839527 Fix the bug of docker import command when import a image with a tag use format 'URL|- [REPOSITORY[:TAG]]'.Fixes #7714 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2014-08-26 15:51:22 +08:00
Tibor Vass 34438efffe Merge pull request #7659 from somaopensource/soma 
daemon: rename from "delete" job to "rm"
 2014-08-25 15:54:14 -04:00
Michael Crosby 321df7fd61 Merge pull request #7649 from tianon/vendor-optional-go 
Optionalize the "hg clone" of Go, since it takes forever
 2014-08-25 12:00:23 -07:00
Victor Vieux d1544a0930 Merge pull request #7683 from LK4D4/fix_build_hang_pipe_#7680 
Skip permissions check on named pipes
 2014-08-25 12:00:11 -07:00
Alexandr Morozov 07f2e79486 Skip permissions check on named pipes 
Fixes #7680

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-25 22:59:53 +04:00
Victor Vieux e1defe71c3 Merge pull request #7691 from carmstrong/patch-1 
Fix typo for --restart deprecation
 2014-08-25 11:13:27 -07:00
Michael Crosby 2c9789bbf7 Merge pull request #7725 from erikh/fix_registry_test 
fix return values in registry mock service
 2014-08-25 10:56:00 -07:00
Erik Hollensbe e81b686924 fix return values in registry mock service 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-25 10:29:38 -07:00
James Turnbull bef33cf88a Merge pull request #7700 from jamtur01/relnotes 
Removed deprecated release notes
 2014-08-25 07:13:11 -07:00
Nicolas Goy d4a53a7bce Added manual installation instruction for Centos7. 
Added a note about firewalld.

Signed-off-by: Nicolas Goy <kuon@goyman.com>
 2014-08-25 04:00:11 +02:00
James Turnbull df38eb4d43 Removed deprecated release notes 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-08-23 20:01:41 -04:00
Chris Armstrong ef9a5926e9 Fix typo for --restart deprecation 
Signed-off-by: Chris Armstrong <chris@opdemand.com>
 2014-08-22 12:56:43 -07:00
James Turnbull 6bc773b2c1 Merge pull request #7684 from averagehuman/patch-1 
Update usingdocker.md
 2014-08-22 13:16:33 -04:00
averagehuman fe845c4da8 Update usingdocker.md 
Minor rewording and removal of unnecessary apostrophe.
 2014-08-22 17:48:26 +01:00
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
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
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
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