2104fb8fd4
Merge pull request #7055 from coheyxyz/break-loop
...
Break loop correctly
Upstream-commit: dca52c47a4aaa41fc21883ab60c9303a8e9f3dfa
Component: engine
2014-07-17 18:20:12 +03:00
5a160c1d84
Update usingdocker.md
...
Change --help example command to match output in docs
Upstream-commit: f9b3147e2c3463207392d0f7a8ce533b42632815
Component: engine
2014-07-17 14:44:18 +02:00
d2349e06da
Change switch to if so that the break statements correctly breaks loop
...
Docker-DCO-1.1-Signed-off-by: Kohei Tsuruta <coheyxyz@gmail.com > (github: coheyxyz)
Upstream-commit: ffe885ec0e8a06c1614949bf383f6d1532f02c1d
Component: engine
2014-07-17 20:27:29 +09:00
3555c6d1c2
Merge pull request #7049 from albers/default-option
...
removed default --rm option from example build command
Upstream-commit: 4ae27be2cd1cbedea9cba0f796bc9f040dde7007
Component: engine
2014-07-17 04:52:16 -04:00
21ff4631f1
archive/tar: update to fix writing of PAX headers
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: f565862abcceaf74c2266ba40f34c1b24c6f40c3
Component: engine
2014-07-17 08:54:26 +03:00
777bf1081f
Fix hack/make/ubuntu to install both docker.service and docker.socket
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: ff08357c9be7fce37b4be2f08d85e801d07af2f0
Component: engine
2014-07-16 23:03:32 -06:00
5d0d56f865
Merge pull request #7021 from lsm5/systemd-maintainer
...
Add systemd MAINTAINERS file and update docker.service to always use socket activation
Upstream-commit: 07f9d486964f797b46edcbe3c6991e2d0eddc3c1
Component: engine
2014-07-16 23:01:37 -06:00
17983a728d
this info is out of date and forgotten
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: ade6d780d6222681e16b04ff1439240afc880a4f
Component: engine
2014-07-17 12:04:52 +10:00
35e71a0cd0
Tianon made a micro-image (sub one meg?) that we can use as a very fast to download 'yes, your docker can download and run an image' test
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 6ae07e24104af6eb245339dae3a878fb983d112e
Component: engine
2014-07-17 11:54:35 +10:00
f48be61b0a
Fix cross compile non cgo and linux systems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 7a8ea91392e0cc97caf2a6edc3b262b33a5b446d
Component: engine
2014-07-16 16:57:49 -07:00
d18a40b4ac
Make tty term exec driver specific
...
lxc is special in that we cannot create the master outside of the
container without opening the slave because we have nothing to provide to the
cmd. We have to open both then do the crazy setup on command right now instead of
passing the console path to lxc and telling it to open up that console. we save a couple of
openfiles in the native driver because we can do this.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 0d67b420b59c953cf331f735e49e7acad742a41f
Component: engine
2014-07-16 16:57:49 -07:00
81d8d08389
Don't create pty slave in the daemon for native driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 1501c342d815e3a128dac393b69e23f6ec39c2d7
Component: engine
2014-07-16 16:57:19 -07:00
2dd031c537
Update libcontainer to be85764f109c3f0f62cd2a5c8be
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 9fc6058aa110d5b59c5068a289b6e3a30fc86f72
Component: engine
2014-07-16 16:57:19 -07:00
19a14797ac
Added info re: image[:tag] to make docs consistent. Fixed a markdown issue.
...
Closes issue #6833
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 41d6ab6318cc2c8905a174ed28a78dfcad06cef5
Component: engine
2014-07-16 16:39:44 -07:00
3fa9feb32d
Merge pull request #7066 from unclejack/disallow_links_with_nethost
...
don't allow links to be used with --net=host
Upstream-commit: 6cd1061a5b5accf989e6633714f3a0f1f4dc21ac
Component: engine
2014-07-16 16:21:13 -07:00
4514b541fc
Merge pull request #6797 from zhgwenming/master
...
make /.dockerinit bind mount driver specific
Upstream-commit: 6d238c6fba4cef7d50a36bced46923d54140bd2e
Component: engine
2014-07-16 16:01:43 -07:00
9b124873a6
Removed :neckbeard: RMS test case
...
Docker-DCO-1.1-Signed-off-by: Aleksandrs Fadins <aleks@s-ko.net > (github: muchweb)
Upstream-commit: b0e9d370c28ebe6d783f0008c3c0d513c8c030e8
Component: engine
2014-07-16 23:22:21 +01:00
03e13dfc55
Added :neckbeard: RMS the founder of 🐃 GNU and 🆓 as in 🆓 dom software
...
Docker-DCO-1.1-Signed-off-by: Aleksandrs Fadins <aleks@s-ko.net > (github: muchweb)
Upstream-commit: 352909dd54e864186d6050f4601d2fb78d889810
Component: engine
2014-07-16 22:45:08 +01:00
697ca2953b
don't allow links to be used with --net=host
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: be8cea98560f4e63ff367a632539bf9f6bf929a4
Component: engine
2014-07-17 00:32:24 +03:00
e8b7012cbc
Add "Acquire::GzipIndexes" to contrib/mkimage/debootstrap
...
This results in a dramatic improvement in the size of individual "apt-get update" layers (on a clean wheezy base, from "29.88 MB" down to "8.273 MB").
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 2e61e8267ea6a668d728fe72406619075330a26a
Component: engine
2014-07-16 14:58:02 -06:00
96ec084181
Use : to split caps in sysinit flags
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 50b580cfecc8e438223250f058fb7b61c7477a59
Component: engine
2014-07-16 13:40:10 -07:00
2efed02012
Merge pull request #7060 from crosbymichael/case-insensitive-caps
...
Allow case insensitive caps for add and drop
Upstream-commit: dae6af1d1c6692d983151674fb6778006ef0a87a
Component: engine
2014-07-16 12:34:59 -07:00
bf242e249b
Fix cap drop issues with lxc
...
This uses "," instead of spaces so that the flags are parsed correctly
and also does not do a strings.Split on an empty string because
strings.Split will return a slice with one element, and empty string
causing parsing to fail when it validates that the cap exists.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 47917135daa38b40a1a3ee11f31153b031ea7963
Component: engine
2014-07-16 12:14:26 -07:00
5a03c34f92
Allow case insensitive caps for add and drop
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 7c19499c635358719c5a9c9fb1cb66a5fcf12718
Component: engine
2014-07-16 11:47:55 -07:00
7ba096c75a
Merge pull request #7045 from SvenDowideit/pr_out_re_write_to_put_the_emphasis_on_the_format
...
re-write to put the emphasis on the format
Upstream-commit: 905ae7bb281cb8dbcc3ca6284103e0a3544db1f7
Component: engine
2014-07-16 11:47:05 -07:00
cd609dc421
Merge pull request #6954 from LK4D4/fix_container_run_after_restart_#4766
...
Set state running before dumping to disk
Upstream-commit: 5702029a0f12cd382845e0ae1a31c61450851ee0
Component: engine
2014-07-16 11:35:14 -07:00
41c1e3bafe
Merge pull request #6991 from bobrik/empty-dockerignore
...
Skipping empty lines in .dockerignore
Upstream-commit: 1583e7af416d5c1ff4b99c59f92a953d1ed0ac25
Component: engine
2014-07-16 10:46:38 -07:00
077977e932
Add Content-Type header in PushImageLayerRegistry
...
Docker-DCO-1.1-Signed-off-by: Gabor Nagy <mail@aigeruth.hu > (github: Aigeruth)
Upstream-commit: f861bfd9ff57e87805252d27da3a9cb18f60974b
Component: engine
2014-07-16 12:23:25 +02:00
013dc5d8c5
removed default --rm option from example build command
...
this line gave the false impression that containers are not removed
unless you specify the --rm argument.
Upstream-commit: c5f55a233de09f8aa4ce7f061e8da2d435017fef
Component: engine
2014-07-16 11:18:08 +02:00
bcb367a385
Merge pull request #6601 from SvenDowideit/6510-docker-pause-docs
...
6510 docker pause docs
Upstream-commit: 3b3f0fa085c9a5208587c1ac2e69c2e9f8d727ed
Component: engine
2014-07-16 03:30:49 +00:00
781eab6c3f
the package now adds the bash_completion too
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: fa5bce2859e0b0fc3eeade3a97777d371fceca3a
Component: engine
2014-07-16 11:46:18 +10:00
3db76fe5b3
re-write to put the emphasis on the format
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: ed8b017ee085c26dadd6a976a89d63322a02738b
Component: engine
2014-07-16 11:02:44 +10:00
69f799334b
docs/google: bump container-vm image version
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: c6197058a87e18ba7c7568fbc7d3fb29db79766d
Component: engine
2014-07-15 17:41:59 -07:00
60e4a1f5df
Change HTTP code: 404 to a more user friendly Image Not found msg
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Upstream-commit: b45e8fa945f9c8ba1fa5ef5ae15a9c2e51a3c926
Component: engine
2014-07-15 18:17:41 -06:00
5dba8f7a96
re-jig the info into all the places
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 58955a30ffffb8e9dafb8593f4513d6dae53abfd
Component: engine
2014-07-16 09:42:46 +10:00
5d75903f2b
Add cgroups freezer info
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: SvenDowideit)
Upstream-commit: 3957d72f9cd613fa8a0eeb03517e4f78f9cc58f1
Component: engine
2014-07-16 09:42:46 +10:00
cadd66b6cf
Add cli.md documentation for docker-pause and docker-unpause
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 5b8a6eb05f8c69670814e400f7f85ae221c8bae4
Component: engine
2014-07-16 09:42:46 +10:00
842f5a9ee6
missing doc for 6896
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 01d16150019c9ffb12779d88bdfe3bc146d44408
Component: engine
2014-07-15 23:32:12 +00:00
6397b0f7fb
Merge pull request #7039 from jamtur01/apidoc
...
Removed legacy api.md file
Upstream-commit: d736754a47311025994e748b0fe1ec6c92d59973
Component: engine
2014-07-15 23:12:22 +00:00
4e42254381
Closes 6937. Allows setting of docker config dir.
...
Can now dynamically set the docker config directory through an
environment variable.
export DOCKER_CONFIG=/path/to/docker_config/
Default behavior remains the same, e.g. ~/.docker
Documentation for change added to the https.md docs.
Docker-DCO-1.1-Signed-off-by: James A. Kyle <james@jameskyle.org > (github: jameskyle)
Upstream-commit: c0471ee35aa58a99b423ad914301194e8f3663c1
Component: engine
2014-07-15 15:47:00 -07:00
dbb0dbb0d2
Merge pull request #6892 from mpapo/docs-docker-aufs-limitation
...
Add small note about AUFS layer limitation
Upstream-commit: 9c8b59c1b02dd2d2138fd48aaa27a62b0d09b371
Component: engine
2014-07-15 15:03:46 -07:00
46c8ba0722
Merge pull request #7037 from henning/patch-3
...
Adjust Link description to match target
Upstream-commit: 5bdf2cf45905f24c5b1e5732bde53b70f833d24b
Component: engine
2014-07-15 21:55:06 +00:00
f54b06dceb
Merge pull request #6855 from SvenDowideit/update-osx-installer-image-to-show-final-page
...
The installer completed page now contains information on next steps, so ...
Upstream-commit: b6e1cfc07537cfb6ea403d3b9163b693276a6c5d
Component: engine
2014-07-15 21:17:29 +00:00
8d23a98c51
Removed legacy api.md file
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 4fc8edd0df742a559fe6a4961223a644ab088fa7
Component: engine
2014-07-15 16:40:43 -04:00
19c5a08bfa
Adjust Link description to match target
...
The target document headline is "Managing data in containers" and so should the link be named.
Upstream-commit: fb51a330bb1bfb442f2e220a39a991ea0c69c69b
Component: engine
2014-07-15 22:24:08 +02:00
6c75ad07a9
Update small note about layer limitation
...
Docker-DCO-1.1-Signed-off-by: Michaël Pailloncy <mpapo.dev@gmail.com > (github: mpapo)
Upstream-commit: 2a230729dae91a54cfe617843b1dd7141ad51948
Component: engine
2014-07-15 21:58:01 +02:00
9e62037a6b
Add small note about AUFS layer limitation
...
Docker-DCO-1.1-Signed-off-by: Michaël Pailloncy <mpapo.dev@gmail.com > (github: mpapo)
Upstream-commit: d91d381856b7c91fa992c3cd1943f27c269219f2
Component: engine
2014-07-15 21:58:01 +02:00
ceb0c3835c
no need to create a link to the docker binary
...
Upstream-commit: 88c601764415416e291d492b137f09e9fa175106
Component: engine
2014-07-15 14:18:28 +02:00
6786e758ae
since moved the ./dockerinit mount into lxc driver, fix the lxc testcase accordingly
...
Docker-DCO-1.1-Signed-off-by: Albert Zhang <zhgwenming@gmail.com > (github: zhgwenming)
Upstream-commit: b3b6e05f261cadc2ac4a6eb12090920c32043915
Component: engine
2014-07-15 07:56:19 -04:00
2ff183b13e
Merge pull request #6755 from tianon/bash-completion-for-link-and-bind
...
Update bash completion for "docker run --link" and "docker run -v" to complete on running containers and the local filesystem respectively
Upstream-commit: 47de2e32698e7adbc3b1292186ce9dcddc15cf41
Component: engine
2014-07-15 00:15:13 -06:00
