34438efffe
Merge pull request #7659 from somaopensource/soma
...
daemon: rename from "delete" job to "rm"
2014-08-25 15:54:14 -04:00
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
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
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
e1defe71c3
Merge pull request #7691 from carmstrong/patch-1
...
Fix typo for --restart deprecation
2014-08-25 11:13:27 -07:00
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
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
bef33cf88a
Merge pull request #7700 from jamtur01/relnotes
...
Removed deprecated release notes
2014-08-25 07:13:11 -07:00
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
ef9a5926e9
Fix typo for --restart deprecation
...
Signed-off-by: Chris Armstrong <chris@opdemand.com >
2014-08-22 12:56:43 -07:00
6bc773b2c1
Merge pull request #7684 from averagehuman/patch-1
...
Update usingdocker.md
2014-08-22 13:16:33 -04:00
fe845c4da8
Update usingdocker.md
...
Minor rewording and removal of unnecessary apostrophe.
2014-08-22 17:48:26 +01:00
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
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
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
61b309f0d2
Change version to 1.2.0-dev
2014-08-21 15:55:00 -04:00
380aef2dc1
Merge remote-tracking branch 'origin/release'
2014-08-21 15:54:02 -04:00
7649264eb8
Merge pull request #7644 from vieux/bump_v1.2.0
...
Bump v1.2.0
2014-08-21 14:32:00 -05:00
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
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
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
fa7b24f2c3
Bump version to v1.2.0
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-20 21:11:18 +00:00
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
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
b1d20c483a
Merge pull request #7648 from crosbymichael/update-libcontainer-aug5
...
Update libcontainer to db65c35051d05f3fb218a0e84a1
2014-08-20 15:15:23 -05:00
997336fd95
Merge pull request #7634 from krrg/patch-1
...
Update openSUSE installation instructions
2014-08-20 14:46:41 -04:00
624b944896
Update libcontainer to db65c35051d05f3fb218a0e84a1
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-20 11:19:55 -07:00
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
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
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
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
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
9faf0254ef
Merge pull request #7640 from xiaods/develop
...
Cleanup: correct cli --volumes-from description
2014-08-20 08:01:05 -04:00
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
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
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
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
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
d4c2d0c57f
Merge pull request #7608 from LK4D4/remove_internet_dep
...
Remove internet dependency from TestBuildCacheADD
2014-08-19 14:13:52 -05:00
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
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
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
39bcc3a3e5
Merge pull request #7628 from crosbymichael/fix-search-test
...
Fix search test for busybox image
2014-08-19 12:11:29 -05:00
26feb09fac
add small doc
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-08-19 17:06:17 +00:00
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
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
dad2fcb199
Fix search test for busybox image
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-08-19 09:52:46 -07:00
366fe67946
Merge pull request #7610 from remram44/patch-1
...
Fixes "note" blockquote too long [doc, minor]
2014-08-19 09:11:15 +10:00
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
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
Tibor Vass