Fred Lifton
563aeae59f
New screenshots and a few small edits.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: c92e13f6789ceda5b5fa78c691173e5c0bd840c4
Component: engine
2014-07-17 16:41:50 -07:00
unclejack
e55262927d
integcli: fix map randomization failures
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 68bb56a4a5a5905a7f5eb0781782e1db5cfc7a89
Component: engine
2014-07-17 23:11:45 +03:00
unclejack
e695b55f9e
integcli: add JSON utils for testing
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: e5e8669c7289959a2634bd3f66f89eef1bd4ef01
Component: engine
2014-07-17 23:11:40 +03:00
Brandon Philips
554507d5b7
contrib/init/systemd: add philips as MAINTAINER
...
As requested after #7021 add me as a maintainer alongside the sword
toting @lsm5.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
Upstream-commit: 81307680142d5ddd8e80c70c5da8afc799318556
Component: engine
2014-07-17 11:57:16 -07:00
Tibor Vass
0d14ff1a94
Merge pull request #7072 from SvenDowideit/remove-infrastructure-dir
...
this info is out of date and forgotten
Upstream-commit: ae37f2b88f7d53b783974c28fef9cf9a478ef36c
Component: engine
2014-07-17 14:39:14 -04:00
Fred Lifton
073fd95835
Merge pull request #7027 from SvenDowideit/use-a-hello-world-micro-image
...
Tianon made a micro-image (sub one meg?) that we can use as a very fast ...
Upstream-commit: ca015b8885fb8f7ded215d7d7e55f9f7501498c7
Component: engine
2014-07-17 11:31:54 -07:00
Tianon Gravi
edd103efc9
Merge pull request #7088 from vincentbernat/fix/zsh-completion-update
...
Update zsh completion for docker command with upstream (felixr/docker-zsh-completion) latest
Upstream-commit: ee7313472caa31b44f6ea7cfa05b729b884f6686
Component: engine
2014-07-17 12:05:23 -06:00
Vincent Bernat
fb15d12a83
zsh: update zsh completion for docker command
...
zsh completion is updated with the content of
felixr/docker-zsh-completion.
Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im > (github: vincentbernat)
Upstream-commit: 67e3f7482f792ced05b6fb659d0d4cb8c9899a32
Component: engine
2014-07-17 19:50:50 +02:00
Matthew Heon
e650e69f7d
Bugfix: only use io.Copy in hijack if attaching both stdout and stderr
...
Add regression tests to ensure issue is fixed.
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com > (github: mheon)
Upstream-commit: 1476f295aca20e1c35383c133219d54a5373183f
Component: engine
2014-07-17 13:47:33 -04:00
unclejack
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
bdevloed
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
Kohei Tsuruta
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
James Turnbull
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
unclejack
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
Tianon Gravi
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
Tianon Gravi
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
SvenDowideit
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
Sven Dowideit
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
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
Fred Lifton
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
Victor Vieux
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
Victor Vieux
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
s-ko
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
Tianon Gravi
71706ce7f3
Merge pull request #7064 from tianon/debootstrap-gzipindexes
...
Add "Acquire::GzipIndexes" to contrib/mkimage/debootstrap
Upstream-commit: f84bcc6bd05e44de379b2faaf08b96e3ea843ea8
Component: engine
2014-07-16 15:50:54 -06:00
s-ko
03e13dfc55
Added :neckbeard: RMS the founder of 🐃 GNU and 🆓 as in :free: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
unclejack
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
Tianon Gravi
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
Michael Crosby
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
Victor Vieux
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
Michael Crosby
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
Michael Crosby
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
Victor Vieux
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
Michael Crosby
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
Michael Crosby
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
Gabor Nagy
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
Harald Albers
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
Sven Dowideit
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
Sven Dowideit
d656a58a5f
Merge pull request #7046 from SvenDowideit/pr_out_update_debian_md
...
Update debian.md
Upstream-commit: 8175c666a3be2957445f29d8ea30b94bfedb7f11
Component: engine
2014-07-16 01:47:25 +00:00
SvenDowideit
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
Sven Dowideit
f7725fd62c
Merge pull request #7044 from proppy/patch-7
...
docs/google: bump container-vm image version
Upstream-commit: 4eaacb6b88a2cf0ebeb8b4eebe4659e1451d1cec
Component: engine
2014-07-16 01:07:23 +00:00
SvenDowideit
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
Johan Euphrosine
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
William Henry
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
SvenDowideit
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
Brian Goff
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
Sven Dowideit
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
Victor Vieux
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